diff --git a/.tx/config b/.tx/config index c1541282aac..1654feb6d07 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com type = PO -[fixmystreet.v2-4] +[fixmystreet.v2-5] file_filter = locale/.UTF-8/LC_MESSAGES/FixMyStreet.po source_file = locale/FixMyStreet.po source_lang = en_GB diff --git a/CHANGELOG.md b/CHANGELOG.md index a2bb6104ee5..7a18bf40592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,12 @@ ## Releases * Unreleased - - New features: - - default_to_body permission to control default report as behaviour - - report_prefill permission to control report prefill behaviour + +* v2.5 (21st December 2018) - Front end improvements: - Simplify new report/update sign in flow. #642 - - Clearer relocation options while you’re reporting a problem #2238 - Simplify /auth sign in page. #2208 + - Clearer relocation options while you’re reporting a problem #2238 - Enforce maximum photo size server side, strip EXIF data. #2326 #2134 - Don't require two taps on reports list on touchscreens. #2294 - Allow moderation to work without JavaScript. #2339 @@ -16,7 +15,7 @@ - Admin improvements: - Allow moderation to potentially change category. #2320 - Add Mark/View private reports permission #2306 - - Store more original stuff on moderation. + - Store more original stuff on moderation. #2325 - Sort user updates in reverse date order. - Improve update display on admin report edit page. - Keep all moderation history, and show in report/update admin. #2329 @@ -28,7 +27,9 @@ - Fix bug in contact group handling. #2323 - Improve validation of fetched reports timestamps. #2327 - Development improvements: - - Add option to symlink full size photos. + - Add option to symlink full size photos. #2326 + - default_to_body/report_prefill permissions to control default + report as/prefill behaviour. #2316 * v2.4.2 (6th November 2018) - New features: diff --git a/README.md b/README.md index 19c43b1442c..0db31ded461 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ RSS alerts of problems in their area. It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting problems to UK councils and has been copied around the world. The FixMyStreet -Platform is now at version 2.4.2; see CHANGELOG.md for a version history. +Platform is now at version 2.5; see CHANGELOG.md for a version history. ## Installation diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 72bed2077a7..e3078ba564a 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:-v2.4.2} +VERSION=${VERSION_OVERRIDE:-v2.5} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/docs/_posts/2018-12-21-v2.5.md b/docs/_posts/2018-12-21-v2.5.md new file mode 100644 index 00000000000..de25b59d08e --- /dev/null +++ b/docs/_posts/2018-12-21-v2.5.md @@ -0,0 +1,47 @@ +--- +layout: post +title: Version 2.5 +author: matthew +--- + +
+White christmas!!! =D +
+ +Today we have released **version 2.5** of FixMyStreet; happy solstice! + +This release contains a number of front end improvements, especially to the +sign in flow. This was the result of a lot of work to simplify the whole +process, and we’ve written more about it on the +[mySociety blog](https://www.mysociety.org/2018/12/20/open-sesame-simpler-log-in-forms-on-fixmystreet/). + +Other front end improvements range from a more prominent display of "state" on +report page, making sure you don’t need two taps on a report list entry on a +touchscreen, and clearer relocation options while you’re reporting a problem. + +Moderation has had some work done – it can now potentially edit a report’s +category, should you wish it to do so; it stores more of a report’s original +data upon moderation, and also now stores all moderation history, making that +visible in the report/update admin interface. + +Bugfixes include one reported by FixaMinGata (back in early 2017!) about better +map zoom behaviour when clicking on pins and going back; not escaping HTML +entities in report titles pulled in by Ajax; and show missing reopening/fixed +questionnaire responses when tey lacked their own separate update. We also +fixed some issues with our Open311 contact group handling, and improved the +validation of fetched reports timestamps. + +We now strip Exif data on uploaded photos, and have added a new config +variable, `SYMLINK_FULL_SIZE`, that can be used to symlink your full size +photos out of the photo cache rather than copy them, if your static files are +being served by your web server. + +[Full changelog](https://github.com/mysociety/fixmystreet/releases/tag/v2.5) + +## Upgrading + +Due to the sign-in and banner changes, this release changes a number of the +base templates. If you have overridden any related templates in your cobrand +and not fed those changes upstream, you may need to make adjustments to match; +please use our `bin/cobrand-checks` script to help make comparisons between +your changes. diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 66a209114e1..ae661c1c17b 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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 perllib/FixMyStreet/DB/Result/Problem.pm:675 perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 perllib/FixMyStreet/DB/Result/Problem.pm:680 perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "" -#: templates/web/base/js/translation_strings.html:41 templates/web/base/report/new/category_extras.html:15 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/top_message_none.html:12 templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:12 templates/web/base/report/new/top_message_some.html:9 +#: templates/web/base/js/translation_strings.html:44 templates/web/base/report/new/category_extras.html:15 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/top_message_none.html:12 templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:12 templates/web/base/report/new/top_message_some.html:9 msgid " or " msgstr "" @@ -142,7 +142,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/report/new/form_user_loggedin.html:39 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "" @@ -159,7 +159,7 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 perllib/FixMyStreet/App/Controller/Report/New.pm:710 perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 perllib/FixMyStreet/App/Controller/Report/New.pm:711 perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "" @@ -187,7 +187,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -195,30 +195,22 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -227,10 +219,14 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" +#: templates/web/base/report/new/form_user.html:8 +msgid "About the problem" +msgstr "" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -282,7 +278,7 @@ msgstr "" msgid "Add phone number" msgstr "" -#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:138 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:31 +#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:143 templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -290,15 +286,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -306,7 +302,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -326,7 +322,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -382,27 +378,27 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/list_updates.html:33 templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:21 templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" -#: templates/web/base/admin/report_edit.html:130 templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/report_edit.html:130 templates/web/base/admin/report_edit.html:199 templates/web/base/admin/update_edit.html:23 templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:24 templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:85 templates/web/base/admin/template_edit.html:91 templates/web/base/js/translation_strings.html:87 templates/web/base/report/display_tools.html:6 +#: templates/web/base/admin/report_edit.html:85 templates/web/base/admin/template_edit.html:91 templates/web/base/js/translation_strings.html:90 templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -434,7 +430,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -466,6 +462,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -478,11 +478,11 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -494,7 +494,7 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Default.pm:740 perllib/FixMyStreet/Cobrand/KiitC.pm:166 perllib/FixMyStreet/Cobrand/KiitC.pm:281 perllib/FixMyStreet/Cobrand/Zurich.pm:408 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49 +#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Default.pm:743 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49 msgid "Bodies" msgstr "" @@ -522,7 +522,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/KiitC.pm:281 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 +#: perllib/FixMyStreet/Cobrand/Default.pm:655 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -538,7 +538,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:126 templates/web/base/dashboard/index.html:39 templates/web/zurich/admin/contact-form.html:8 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 +#: templates/web/base/admin/report_edit.html:126 templates/web/base/admin/report_edit.html:201 templates/web/base/dashboard/index.html:39 templates/web/zurich/admin/contact-form.html:8 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "" @@ -591,7 +591,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -619,11 +619,15 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:158 perllib/FixMyStreet/Cobrand/Zurich.pm:161 perllib/FixMyStreet/DB/ResultSet/State.pm:71 templates/web/base/admin/states/index.html:103 templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33 templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/stats/index.html:52 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -647,15 +651,15 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:24 templates/web/base/auth/2faform.html:18 templates/web/base/auth/smsform.html:24 +#: templates/web/base/admin/extra-metadata-form.html:24 templates/web/base/auth/2faform.html:17 templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/KiitC.pm:277 perllib/FixMyStreet/Cobrand/Zurich.pm:422 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Zurich.pm:424 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -667,7 +671,7 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -679,7 +683,7 @@ msgstr "" msgid "Confirmed" msgstr "" -#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/problem_row.html:36 templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/list_updates.html:40 templates/web/base/admin/problem_row.html:36 templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" msgstr "" @@ -688,14 +692,18 @@ msgstr "" 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/base/contact/index.html:4 templates/web/base/contact/index.html:5 templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -704,11 +712,11 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -740,6 +748,10 @@ msgstr "" msgid "Create a report" msgstr "" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +msgid "Create an account" +msgstr "" + #: templates/web/base/admin/contact-form.html:156 templates/web/zurich/admin/contact-form.html:49 msgid "Create category" msgstr "" @@ -748,15 +760,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -772,7 +784,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 templates/web/base/admin/report_edit.html:78 templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/report_edit.html:78 templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -792,7 +804,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 templates/web/zurich/admin/report_edit-sdm.html:105 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -816,6 +828,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -824,7 +840,7 @@ msgstr "" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 templates/web/base/admin/template_edit.html:91 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 templates/web/base/admin/template_edit.html:91 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -832,7 +848,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:115 templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -844,15 +860,15 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 templates/web/base/js/translation_strings.html:39 templates/web/zurich/report/new/fill_in_details_form.html:45 +#: templates/web/base/admin/user-alerts.html:12 templates/web/base/js/translation_strings.html:42 templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" -#: templates/web/base/admin/report_edit.html:119 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/report_edit.html:45 +#: templates/web/base/admin/report_edit.html:119 templates/web/base/admin/report_edit.html:197 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/report_edit.html:45 msgid "Details:" msgstr "" @@ -880,7 +896,7 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -889,7 +905,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 templates/web/base/report/new/form_user_loggedout.html:25 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:34 templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -901,7 +917,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -909,7 +925,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -941,30 +957,34 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 perllib/FixMyStreet/Cobrand/KiitC.pm:156 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +msgid "Edit report details" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 perllib/FixMyStreet/Cobrand/KiitC.pm:155 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +msgid "Edit your update" +msgstr "" + #: templates/web/base/admin/report_edit.html:0 templates/web/base/admin/report_edit.html:15 templates/web/base/admin/report_edit.html:6 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:6 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "" @@ -981,15 +1001,15 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/category_edit.html:28 templates/web/base/admin/flagged.html:38 templates/web/base/admin/user_import.html:24 templates/web/base/admin/user_import.html:47 templates/web/base/admin/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:44 +#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/category_edit.html:28 templates/web/base/admin/flagged.html:38 templates/web/base/admin/user_import.html:24 templates/web/base/admin/user_import.html:47 templates/web/base/admin/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 templates/web/base/alert/_list.html:74 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:38 templates/web/base/report/update/form_name.html:23 +#: templates/web/base/admin/contact-form.html:38 templates/web/base/alert/_list.html:74 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1001,6 +1021,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1069,10 +1097,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" msgstr "" @@ -1113,11 +1137,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1153,7 +1177,7 @@ msgstr "" msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/contact-form.html:159 templates/web/base/admin/report_edit.html:129 templates/web/base/admin/report_edit.html:202 templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1173,6 +1197,10 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" msgstr "" @@ -1241,15 +1269,19 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 templates/web/base/report/new/form_user_loggedout_password.html:20 templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +msgid "Forgot password" +msgstr "" + +#: templates/web/base/auth/general.html:91 templates/web/base/report/form/user_loggedout_password.html:24 templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1293,7 +1325,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1349,7 +1381,7 @@ msgstr "" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1369,11 +1401,11 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:63 +#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1397,7 +1429,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1445,7 +1477,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1551,7 +1583,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1571,7 +1603,7 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1583,10 +1615,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1623,7 +1651,7 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/report/_inspect.html:36 templates/web/base/report/_item.html:93 +#: templates/web/base/admin/report_edit.html:200 templates/web/base/report/_inspect.html:36 templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" msgstr "" @@ -1647,7 +1675,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1667,19 +1695,19 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/base/auth/general.html:24 templates/web/base/report/new/form_user_loggedout.html:6 templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 templates/web/base/report/new/form_user_loggedout.html:14 templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1691,7 +1719,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1699,7 +1727,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -1707,7 +1735,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -1719,11 +1747,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -1743,23 +1771,23 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 perllib/FixMyStreet/Cobrand/KiitC.pm:154 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 templates/web/base/report/_update_state.html:19 +#: templates/web/base/admin/report_edit.html:194 templates/web/base/admin/update_edit.html:92 templates/web/base/report/_main.html:79 templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -1767,6 +1795,10 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 templates/web/zurich/admin/stats/index.html:9 msgid "Month" msgstr "" @@ -1775,7 +1807,7 @@ msgstr "" msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:75 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/states/index.html:108 templates/web/base/admin/states/index.html:11 templates/web/base/admin/user_import.html:23 templates/web/base/admin/user_import.html:46 templates/web/base/admin/users.html:16 templates/web/base/report/new/form_user_name.html:1 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:50 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:75 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/states/index.html:108 templates/web/base/admin/states/index.html:11 templates/web/base/admin/user_import.html:23 templates/web/base/admin/user_import.html:46 templates/web/base/admin/users.html:16 templates/web/base/report/form/user_name.html:2 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:43 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -1783,6 +1815,10 @@ msgstr "" msgid "Name:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -1845,7 +1881,7 @@ msgstr "" msgid "New note to DM:" msgstr "" -#: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/change_password.html:47 templates/web/base/auth/create.html:49 templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -1925,10 +1961,18 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 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:133 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/user-alerts.html:21 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39 templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/form/user.html:5 +msgid "Next:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:133 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/user-alerts.html:21 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39 templates/web/base/report/_inspect.html:113 msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +msgid "No account?" +msgstr "" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -1937,7 +1981,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -1969,7 +2013,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2033,14 +2077,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 templates/web/base/report/update/form_user_loggedout.html:2 templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2049,15 +2085,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2101,6 +2137,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2109,7 +2153,7 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 perllib/FixMyStreet/App/Controller/Report/New.pm:711 perllib/FixMyStreet/App/Controller/Report/New.pm:712 perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/App/Controller/Report/New.pm:750 perllib/FixMyStreet/DB/Result/Problem.pm:600 perllib/FixMyStreet/DB/Result/Problem.pm:607 perllib/FixMyStreet/DB/Result/Problem.pm:622 perllib/FixMyStreet/DB/Result/Problem.pm:631 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 perllib/FixMyStreet/App/Controller/Report/New.pm:712 perllib/FixMyStreet/App/Controller/Report/New.pm:713 perllib/FixMyStreet/App/Controller/Report/New.pm:748 perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/DB/Result/Problem.pm:605 perllib/FixMyStreet/DB/Result/Problem.pm:612 perllib/FixMyStreet/DB/Result/Problem.pm:627 perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" msgstr "" @@ -2141,11 +2185,11 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 templates/web/base/report/new/form_user_loggedout_by_email.html:24 templates/web/base/report/update/form_user_loggedout_by_email.html:10 templates/web/zurich/auth/general.html:22 templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 templates/web/zurich/auth/general.html:20 templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2161,14 +2205,18 @@ msgstr "" msgid "Phone Reporter:" msgstr "" -#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:33 templates/web/zurich/report/new/fill_in_details_form.html:65 +#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:34 templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 templates/web/base/report/form/user_loggedout_by_email.html:37 templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2177,11 +2225,11 @@ msgstr "" msgid "Phone:" msgstr "" -#: templates/web/base/questionnaire/index.html:78 templates/web/base/questionnaire/index.html:93 templates/web/base/questionnaire/index.html:95 templates/web/base/report/new/form_report.html:28 templates/web/base/report/new/form_report.html:43 templates/web/base/report/new/form_report.html:45 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7 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/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38 +#: templates/web/base/admin/report_edit.html:198 templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:78 templates/web/base/questionnaire/index.html:93 templates/web/base/questionnaire/index.html:95 templates/web/base/report/new/form_report.html:29 templates/web/base/report/new/form_report.html:44 templates/web/base/report/new/form_report.html:46 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7 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/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2189,11 +2237,11 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" -#: templates/web/base/questionnaire/index.html:78 templates/web/base/report/new/form_report.html:28 templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20 +#: templates/web/base/questionnaire/index.html:78 templates/web/base/report/new/form_report.html:29 templates/web/base/report/update/form_update.html:7 templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" msgstr "" @@ -2209,7 +2257,7 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:36 +#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2225,15 +2273,15 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 perllib/FixMyStreet/DB/Result/User.pm:220 perllib/FixMyStreet/DB/Result/User.pm:221 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 perllib/FixMyStreet/DB/Result/User.pm:220 perllib/FixMyStreet/DB/Result/User.pm:221 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7 msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Report/New.pm:964 perllib/FixMyStreet/App/Controller/Report/New.pm:999 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Report/New.pm:1003 perllib/FixMyStreet/App/Controller/Report/New.pm:968 perllib/FixMyStreet/DB/Result/Problem.pm:388 templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2252,15 +2300,15 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 perllib/FixMyStreet/DB/Result/Comment.pm:148 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Admin.pm:316 perllib/FixMyStreet/DB/Result/Comment.pm:149 templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 perllib/FixMyStreet/DB/Result/User.pm:223 perllib/FixMyStreet/DB/Result/User.pm:224 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 perllib/FixMyStreet/DB/Result/User.pm:223 perllib/FixMyStreet/DB/Result/User.pm:224 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4 msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2268,15 +2316,15 @@ msgstr "" msgid "Please enter a name for this body" msgstr "" -#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29 templates/web/base/js/translation_strings.html:23 +#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29 templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:366 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/App/Controller/Contact.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 perllib/FixMyStreet/App/Controller/Admin.pm:1559 perllib/FixMyStreet/App/Controller/Admin.pm:329 perllib/FixMyStreet/DB/Result/User.pm:213 templates/web/base/js/translation_strings.html:16 templates/web/base/js/translation_strings.html:20 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 perllib/FixMyStreet/App/Controller/Admin.pm:1568 perllib/FixMyStreet/App/Controller/Admin.pm:329 perllib/FixMyStreet/DB/Result/User.pm:213 templates/web/base/js/translation_strings.html:19 templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "" @@ -2284,39 +2332,39 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 perllib/FixMyStreet/DB/Result/User.pm:211 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:15 templates/web/base/js/translation_strings.html:19 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 perllib/FixMyStreet/DB/Result/User.pm:211 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:18 templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 templates/web/base/js/translation_strings.html:11 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 templates/web/base/js/translation_strings.html:14 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:122 perllib/FixMyStreet/DB/Result/Comment.pm:145 perllib/FixMyStreet/DB/Result/Problem.pm:377 perllib/FixMyStreet/DB/Result/User.pm:206 templates/web/base/js/translation_strings.html:10 +#: perllib/FixMyStreet/App/Controller/Contact.pm:122 perllib/FixMyStreet/DB/Result/Comment.pm:146 perllib/FixMyStreet/DB/Result/Problem.pm:382 perllib/FixMyStreet/DB/Result/User.pm:206 templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" -#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:29 +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2340,7 +2388,7 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2352,7 +2400,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 templates/web/zurich/report/new/sidebar.html:5 +#: templates/web/base/report/new/fill_in_details_form.html:23 templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2364,11 +2412,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2400,11 +2448,11 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 perllib/FixMyStreet/App/Model/PhotoSet.pm:148 perllib/FixMyStreet/App/Model/PhotoSet.pm:150 templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 perllib/FixMyStreet/App/Model/PhotoSet.pm:154 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2412,7 +2460,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 templates/web/base/report/update/form_user_loggedout_by_email.html:21 templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2420,19 +2468,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2460,14 +2508,10 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:152 templates/web/base/report/_inspect.html:13 templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:152 templates/web/base/report/_inspect.html:13 templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2488,7 +2532,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2496,7 +2540,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 perllib/FixMyStreet/Cobrand/KiitC.pm:153 templates/web/base/admin/flagged.html:10 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2520,7 +2564,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 msgid "Problems within %s" msgstr "" @@ -2541,23 +2585,23 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:9 +#: templates/web/base/report/display.html:66 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -2613,7 +2657,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" msgstr "" @@ -2633,7 +2677,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -2674,7 +2718,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:27 +#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:141 templates/web/base/report/_main.html:23 templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -2702,11 +2746,11 @@ msgstr "" msgid "Report ID:" msgstr "" -#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:77 templates/web/base/main_nav_items.html:6 templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:80 templates/web/base/main_nav_items.html:6 templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 templates/web/base/main_nav_items.html:4 +#: templates/web/base/js/translation_strings.html:81 templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -2714,11 +2758,11 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40 +#: templates/web/base/js/translation_strings.html:82 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -2742,7 +2786,7 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -2750,7 +2794,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -2758,31 +2802,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2790,18 +2834,22 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3 templates/web/base/js/translation_strings.html:50 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:8 templates/web/zurich/report/new/fill_in_details_form.html:4 +#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3 templates/web/base/js/translation_strings.html:53 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:8 templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 perllib/FixMyStreet/Cobrand/Default.pm:674 perllib/FixMyStreet/Cobrand/KiitC.pm:286 perllib/FixMyStreet/Cobrand/Zurich.pm:400 templates/web/base/dashboard/index.html:107 templates/web/zurich/header.html:45 +#: perllib/FixMyStreet/Cobrand/Default.pm:660 perllib/FixMyStreet/Cobrand/Default.pm:674 perllib/FixMyStreet/Cobrand/Zurich.pm:402 templates/web/base/dashboard/index.html:107 templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -2822,7 +2870,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -2878,19 +2926,19 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -2902,11 +2950,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 perllib/FixMyStreet/App/Controller/Admin.pm:2152 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 perllib/FixMyStreet/App/Controller/Admin.pm:2161 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 templates/web/base/admin/report_edit.html:167 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 templates/web/base/admin/report_edit.html:167 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2914,7 +2962,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 templates/web/base/maps/google-ol.html:2 +#: templates/web/base/js/translation_strings.html:58 templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -2922,7 +2970,7 @@ msgstr "" msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:209 templates/web/base/report/_main.html:119 templates/web/base/report/update.html:53 templates/web/zurich/admin/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:209 templates/web/base/report/_main.html:123 templates/web/base/report/update.html:56 templates/web/zurich/admin/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -2935,7 +2983,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -2967,11 +3015,11 @@ msgstr "" msgid "Security" msgstr "" -#: templates/web/base/report/new/councils_text_private.html:7 templates/web/base/report/new/form_user.html:6 +#: templates/web/base/report/form/private_details.html:14 templates/web/base/report/new/councils_text_private.html:7 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -2999,7 +3047,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3015,11 +3063,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3047,7 +3095,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:138 templates/web/base/report/_main.html:22 templates/web/base/report/_main.html:30 +#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:143 templates/web/base/report/_main.html:26 templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3055,15 +3103,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:26 templates/web/base/reports/_list-filters.html:24 +#: templates/web/base/report/_main.html:141 templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:30 templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:146 +#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3075,7 +3123,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3087,15 +3135,15 @@ msgstr "" msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:62 +#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3103,15 +3151,15 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:87 templates/web/base/main_nav_items.html:14 templates/web/zurich/auth/general.html:25 templates/web/zurich/auth/general.html:8 +#: templates/web/base/auth/create.html:57 templates/web/base/auth/general.html:4 templates/web/base/auth/general.html:87 templates/web/base/main_nav_items.html:14 templates/web/zurich/auth/general.html:23 templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3119,6 +3167,10 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +msgid "Sign in with a password" +msgstr "" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3158,11 +3210,11 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 perllib/FixMyStreet/Geocode/OSM.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 templates/web/base/report/display.html:29 templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/auth/general.html:16 templates/web/base/report/display.html:29 templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3170,7 +3222,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3200,11 +3252,11 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:29 templates/web/base/admin/contact-form.html:53 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:53 templates/web/base/admin/templates.html:8 templates/web/base/admin/user-alerts.html:11 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:103 templates/web/base/report/_item.html:101 templates/web/base/report/update/form_update.html:39 templates/web/zurich/admin/contact-form.html:33 +#: templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:29 templates/web/base/admin/contact-form.html:53 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:53 templates/web/base/admin/templates.html:8 templates/web/base/admin/user-alerts.html:11 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:103 templates/web/base/report/_item.html:101 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3216,11 +3268,11 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 perllib/FixMyStreet/Cobrand/KiitC.pm:276 perllib/FixMyStreet/Cobrand/Zurich.pm:421 templates/web/base/admin/states/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:649 perllib/FixMyStreet/Cobrand/Zurich.pm:423 templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/Zurich.pm:403 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58 +#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/Zurich.pm:405 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58 msgid "Stats" msgstr "" @@ -3240,7 +3292,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3248,15 +3300,15 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" -#: templates/web/base/admin/report_edit.html:117 templates/web/zurich/admin/report_edit.html:41 +#: templates/web/base/admin/report_edit.html:117 templates/web/base/admin/report_edit.html:196 templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:68 templates/web/base/report/new/form_user_loggedout_by_email.html:34 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:73 +#: templates/web/base/auth/2faform.html:20 templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/form/user_loggedout_by_email.html:69 templates/web/base/report/form/user_loggedout_password.html:33 templates/web/base/report/new/form_user_loggedin.html:71 templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3292,7 +3344,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/KiitC.pm:270 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/bodies.html:29 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:12 templates/web/zurich/header.html:42 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/Zurich.pm:401 templates/web/base/admin/bodies.html:29 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:12 templates/web/zurich/header.html:42 msgid "Summary" msgstr "" @@ -3316,15 +3368,19 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:412 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 templates/web/zurich/admin/templates.html:9 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3332,7 +3388,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:33 templates/web/base/admin/update_edit.html:20 templates/web/zurich/admin/template_edit.html:24 templates/web/zurich/admin/update_edit.html:12 +#: templates/web/base/admin/template_edit.html:33 templates/web/base/admin/update_edit.html:20 templates/web/base/admin/update_edit.html:94 templates/web/zurich/admin/template_edit.html:24 templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3364,7 +3420,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -3376,7 +3432,7 @@ msgstr "" msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/KiitC.pm:114 perllib/FixMyStreet/Cobrand/UK.pm:73 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -3388,27 +3444,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -3536,7 +3592,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -3550,7 +3606,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -3566,11 +3622,15 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 perllib/FixMyStreet/App/Controller/Report/Update.pm:142 templates/web/base/auth/general.html:51 templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3578,10 +3638,18 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 templates/web/base/admin/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" @@ -3603,14 +3671,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -3640,7 +3700,7 @@ msgstr "" 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:1013 perllib/FixMyStreet/App/Controller/Report/New.pm:1074 perllib/FixMyStreet/App/Controller/Report/New.pm:1091 perllib/FixMyStreet/App/Controller/Report/New.pm:1137 perllib/FixMyStreet/Cobrand/UK.pm:45 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 perllib/FixMyStreet/App/Controller/Report/New.pm:1078 perllib/FixMyStreet/App/Controller/Report/New.pm:1095 perllib/FixMyStreet/App/Controller/Report/New.pm:1141 perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -3676,7 +3736,7 @@ msgstr "" msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:12 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3692,7 +3752,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -3704,7 +3764,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 perllib/FixMyStreet/Cobrand/KiitC.pm:271 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3776,7 +3836,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -3784,7 +3844,7 @@ msgstr "" msgid "Trusted:" msgstr "" -#: templates/web/base/auth/2faform.html:6 templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:35 +#: templates/web/base/auth/2faform.html:6 templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -3812,7 +3872,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -3820,11 +3880,11 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:46 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Develop.pm:159 perllib/FixMyStreet/App/Controller/Develop.pm:178 perllib/FixMyStreet/App/Controller/My.pm:200 perllib/FixMyStreet/App/Controller/Report.pm:113 perllib/FixMyStreet/App/Controller/Report.pm:119 perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Develop.pm:159 perllib/FixMyStreet/App/Controller/Develop.pm:178 perllib/FixMyStreet/App/Controller/My.pm:200 perllib/FixMyStreet/App/Controller/Report.pm:136 perllib/FixMyStreet/App/Controller/Report.pm:142 perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -3840,7 +3900,7 @@ msgstr "" msgid "Up one" msgstr "" -#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/user-alerts.html:58 templates/web/base/report/update/form_update.html:29 +#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/user-alerts.html:58 templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -3848,11 +3908,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -3888,15 +3948,15 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 perllib/FixMyStreet/App/Controller/Admin.pm:1490 perllib/FixMyStreet/App/Controller/Admin.pm:1699 perllib/FixMyStreet/App/Controller/Admin.pm:1968 perllib/FixMyStreet/App/Controller/Admin.pm:999 perllib/FixMyStreet/Cobrand/Zurich.pm:805 perllib/FixMyStreet/Cobrand/Zurich.pm:830 perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 perllib/FixMyStreet/App/Controller/Admin.pm:1498 perllib/FixMyStreet/App/Controller/Admin.pm:1708 perllib/FixMyStreet/App/Controller/Admin.pm:1977 perllib/FixMyStreet/App/Controller/Admin.pm:999 perllib/FixMyStreet/Cobrand/Zurich.pm:807 perllib/FixMyStreet/Cobrand/Zurich.pm:832 perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -3904,7 +3964,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3955,23 +4015,23 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -3991,7 +4051,7 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 perllib/FixMyStreet/Cobrand/Default.pm:734 perllib/FixMyStreet/Cobrand/KiitC.pm:162 perllib/FixMyStreet/Cobrand/KiitC.pm:292 perllib/FixMyStreet/Cobrand/Zurich.pm:415 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 +#: perllib/FixMyStreet/Cobrand/Default.pm:675 perllib/FixMyStreet/Cobrand/Default.pm:737 perllib/FixMyStreet/Cobrand/Zurich.pm:417 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4027,6 +4087,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:37 msgid "Viewing a location" msgstr "" @@ -4055,7 +4119,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 templates/web/base/report/display.html:35 templates/web/base/report/new/oauth_email_form.html:5 +#: templates/web/base/auth/general.html:13 templates/web/base/report/display.html:35 templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" @@ -4111,7 +4175,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4139,19 +4203,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 templates/web/base/admin/bodies.html:70 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:132 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/user-alerts.html:21 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:37 templates/web/base/report/_inspect.html:111 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/bodies.html:70 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:132 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/user-alerts.html:21 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:37 templates/web/base/report/_inspect.html:111 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4159,11 +4219,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4179,7 +4239,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -4198,11 +4258,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -4210,7 +4270,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 templates/web/zurich/report/new/fill_in_details_form.html:30 +#: templates/web/base/report/new/form_report.html:38 templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -4277,7 +4337,7 @@ msgstr "" msgid "Your account" msgstr "" -#: templates/web/base/alert/updates.html:19 templates/web/base/auth/general.html:44 templates/web/base/contact/index.html:80 templates/web/base/report/display_tools.html:46 templates/web/base/report/new/form_user_loggedout_email.html:6 templates/web/base/report/update/form_user_loggedout_email.html:6 templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/base/alert/updates.html:19 templates/web/base/auth/create.html:37 templates/web/base/auth/general.html:49 templates/web/base/contact/index.html:85 templates/web/base/report/display_tools.html:46 templates/web/base/report/form/user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -4285,7 +4345,7 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 templates/web/base/report/new/form_user_loggedout_email.html:2 templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 templates/web/base/auth/general.html:47 templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -4293,7 +4353,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 templates/web/base/contact/index.html:74 templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -4309,11 +4369,11 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:83 templates/web/base/report/new/form_user_loggedout_password.html:5 templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/auth/create.html:49 templates/web/base/auth/general.html:83 templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -4321,11 +4381,11 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:25 templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 templates/web/base/report/form/user_loggedout_by_email.html:61 templates/web/base/report/form/user_loggedout_by_email.html:63 templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" -#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:87 +#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -4345,7 +4405,11 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +msgid "Your update" +msgstr "" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -4357,7 +4421,7 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -4373,11 +4437,11 @@ msgstr "" msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 perllib/FixMyStreet/App/Controller/Moderate.pm:114 perllib/FixMyStreet/DB/Result/Comment.pm:236 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 perllib/FixMyStreet/App/Controller/Moderate.pm:119 perllib/FixMyStreet/DB/Result/Comment.pm:226 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 templates/web/base/admin/report_edit.html:194 templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -4401,7 +4465,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -4433,6 +4497,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" msgstr "" @@ -4457,11 +4529,11 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" -#: templates/web/base/report/_report_meta_info.html:5 templates/web/zurich/report/_main.html:5 +#: templates/web/base/report/_report_meta_info.html:5 templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -4477,11 +4549,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -4497,11 +4569,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 181cd7d7071..3bb365be337 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "و" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -164,7 +164,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة المسئولة)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(إختياري)" @@ -184,9 +184,9 @@ msgstr "(أرسل لكليهما)" msgid "(we also have RSS feeds for problems within %s)" msgstr "موجز RSS للمشكلات الموجودة ضمن حدود %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "--إختر تصنيف--" @@ -220,7 +220,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -229,34 +229,24 @@ msgstr "" msgid "%s live problems" msgstr "%s المشاكل الحالية" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "لا دعني أؤكّد بلاغي بالبريد" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "لا دعني أؤكّد بلاغي بالبريد" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "لا دعني أؤكّد تحديثي بالبريد" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "لا دعني أؤكّد تحديثي بالبريد" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "لا دعني أسجّل دخولي بالبريد" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "لا دعني أسجّل دخولي بالبريد" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "ملاحظة: تم ارسال هذا التقرير للتطبيق. لن يتم ارسال اي تغييرات اخرى عليه." @@ -265,12 +255,15 @@ msgstr "ملاحظة: تم ارسال هذا التقرير ل msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "ملاحظة: لم يتم ارسال هذا التقرير للتطبيق بعد. لن يتم ارسال اي تغييرات اخرى عليه." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "نعم لدي كلمة المرور" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "لخص المشكلة" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -336,9 +329,9 @@ msgstr "(بلا رقم هاتف)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "اضف للقائمة القصيرة" @@ -348,16 +341,15 @@ msgstr "اضف للقائمة القصيرة" msgid "Add user" msgstr "إضافة مستخدم" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "اضف / عدل اصناف المشاكل" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "اضف/عدل أولويات الاستجابة" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "اضف/عدل قوالب الاستجابة" @@ -365,7 +357,7 @@ msgstr "اضف/عدل قوالب الاستجابة" msgid "Added %s" msgstr "أُضيف %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "اضافة التقرير للقائمة القصيرة خاصتك سيحذفه من %s’s القائمة القصيرة." @@ -385,7 +377,8 @@ msgstr "تحذير %d أنشيء لـ %s، نوع %s، معاملات %s \\ %s" msgid "Alert %d disabled (created %s)" msgstr "التحذير %d ألغي تفعيله (أنشيء %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "نبهني بأحدث المستجدات" @@ -453,34 +446,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "تحديث أشار إلى أن هذه المشكلة تم حلها." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "مجهول" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "مجهول" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "مجهول:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "مستخدم اخر" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "هل أنت متأكد؟" @@ -517,7 +512,7 @@ msgstr "تعيين إلى هيئة خارجية:" msgid "Assign to subdivision:" msgstr "تعيين إلى قسم فرعي:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "تعيين المستخدمين للمناطق" @@ -551,6 +546,10 @@ msgstr "الإستجابة الآلية:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "التصنيفات المتاحة" @@ -563,12 +562,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "تفادى المعلومات الشخصية ولوحات السيارات" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "في إنتظار المشرفين" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "الخلف" @@ -582,10 +581,8 @@ msgid "Ban user" msgstr "مستخدم مشار إليه" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -622,7 +619,6 @@ msgid "Can't see the map? Skip this step" msgstr "لا يمكنك رؤية الخريطة؟ تجاوز هذه الخطوة" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -655,7 +651,7 @@ msgstr "تصنيف" msgid "Category and State" msgstr "تصنيف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’" @@ -665,6 +661,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -727,7 +724,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -756,6 +753,10 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري msgid "Click the link in that email to sign in." msgstr "انقر فوق الارتباط المرفق في رسالة البريد الإلكتروني للتوكيد من أجل تسجيل الدخول." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -768,7 +769,7 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "مغلق من الجهة المسئولة" @@ -798,18 +799,17 @@ msgid "Cobrand:" msgstr "علامة تجارية مشتركة:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" @@ -823,8 +823,7 @@ msgstr "تأكيد" msgid "Confirm account" msgstr "أكد الحساب" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "الرجاء الدخول عبر البريد الإلكتروني بدلا عن ذلك، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تحديث كلمة المرور." @@ -843,7 +842,7 @@ msgstr "تأكيد" msgid "Confirmed" msgstr "مؤكد" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -854,16 +853,20 @@ msgstr "مؤكد:" msgid "Contact %s" msgstr "اتصل بـ %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "إتصل بنا" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "اتصل بفريق العمل" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -873,12 +876,12 @@ msgstr "" msgid "Coordinates:" msgstr "الإحداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "لم يتمكن من إيجاد الموقع" @@ -914,6 +917,11 @@ msgstr "تم الإنشاء" msgid "Create a report" msgstr "انشئ بلاغ" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "سجل الدخول أو أنشئ حساب جديد" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -923,19 +931,16 @@ msgstr "انشء تصنيف" msgid "Create priority" msgstr "انشء أولوية" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "انشاء التبليغات/تحديثات كالمجلس" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم" @@ -953,7 +958,7 @@ msgstr "تم الإنشاء" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -979,7 +984,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "حاليا لايوجد جهات مسئولة تم إنشائها." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "لا يمكن الاتصال بالعميل" @@ -1008,6 +1013,11 @@ msgstr "" msgid "Default priority" msgstr "انشء أولوية" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "انشاء التبليغات/تحديثات كالمجلس" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1017,7 +1027,7 @@ msgstr "" msgid "Delete" msgstr "محذوف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1029,8 +1039,8 @@ msgstr "حذف القالب" msgid "Deleted" msgstr "محذوف" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1046,17 +1056,18 @@ msgstr "الوصف" msgid "Description:" msgstr "الوصف:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "التفاصيل" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1088,8 +1099,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1098,11 +1109,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "لا ترسل اشعارات البريد الالكتروني حول التعليقات المأخوذة لصانع المشكلة" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "هل لديك كلمة مرور %s؟" @@ -1114,7 +1121,7 @@ msgstr "" msgid "Don’t know" msgstr "لا أعلم" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "هل تحب النماذج؟" @@ -1122,7 +1129,7 @@ msgstr "هل تحب النماذج؟" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "اسحب الصور واسقطها هنا أو انقر للرفع" @@ -1166,33 +1173,36 @@ msgstr "تعديل" msgid "Edit body details" msgstr "تعديل تفاصيل الجهة المسئولة" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "عدل تفاصيل المستخدمين الآخرين" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "عدل صلاحيات المستخدمين الآخرين" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "عدل تصنيف التقرير" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "قم بالاشراف على تفاصيل التبليغ" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "عدل أولوية التقرير" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "عدل التقارير" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "التحديثات" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1225,20 +1235,20 @@ msgstr "المحرر" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "البريد الإلكتروني" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "البريد الإلكتروني" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "البريد الإلكتروني" @@ -1251,6 +1261,15 @@ msgstr "تم إنشاء الإخطار بالبريد" msgid "Email alert deleted" msgstr "تم حذف الإخطار بالبريد" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "انقر فوق الارتباط المرفق في رسالة البريد الإلكتروني للتوكيد من أجل تسجيل الدخول." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1340,11 +1359,6 @@ msgstr "أدخل اسم شارع في زيورخ" msgid "Enter a nearby UK postcode, or street name and area" msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1395,11 +1409,11 @@ msgstr "تصنيف موجود" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "وضح ما هي المشكلة" @@ -1444,6 +1458,8 @@ msgstr "تفاصيل إضافية" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "بيانات إضافية:" @@ -1466,6 +1482,11 @@ msgstr "فشل في إرسال الرسالة" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1543,17 +1564,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "للمزيد من المعلومات، راجع كيف أصلح شارعي يستخدم الخريطة." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "كلمة المرور" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "هل نسيت كلمة المرور؟" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "تمت إعادة التوجيه إلى هيئة خارجية" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية" @@ -1611,7 +1637,7 @@ msgstr "اذهب" msgid "Going to send questionnaire?" msgstr "هل تريد أن ترسل سؤال؟" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "إعطاء تصريح للأدمن" @@ -1679,7 +1705,7 @@ msgstr "مخفي" msgid "Hide all reports and updates" msgstr "بلاغات ومستخدمين مشار إليهم" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1702,11 +1728,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "أخفي المثبتة" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1731,7 +1757,7 @@ msgstr "البداية" msgid "How to report a problem" msgstr "كيف تبلغ عن مشكلة" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "كيف ترسل بلاغات ناجحة" @@ -1795,7 +1821,7 @@ msgstr "" "إذا كانت توجد هيئتان أو أكثر تخدمان نفس الموقع، فإن FixMyStreet يجمع الفئات المتطابقة في إدخال واحد في\n" " القائمة. تأكد من استخدام اسم الفئة نفسها في الهيئات إذا كنت تريد حدوث ذلك." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1919,7 +1945,7 @@ msgstr "" msgid "Inspection required" msgstr "يتطلب المعاينة" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "وجه المقاولون لإصلاح المشاكل" @@ -1939,8 +1965,8 @@ msgstr "قيمة agency_responsible غير صالحة %s" msgid "Invalid format %s specified." msgstr "التنسيق المحدد %s غير صالح." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "موقع غير صحيح. على الموقع الجديد ان يكون تحت نفس المجلس." @@ -1952,13 +1978,6 @@ msgstr "أسرع طريقة عادةً هي الاطلاع على msgid "It’s on its way to the council right now." msgstr "إنه في الطريق إلى المجلس حاليًا." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "احتفظ بتسجيل الدخول على هذا الكمبيوتر" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1998,6 +2017,7 @@ msgstr "آخر تحديث" msgid "Last update:" msgstr "آخر تحديث:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2024,7 +2044,7 @@ msgstr "عرض جميع المشكلات المبلّغ عنها" msgid "Loading reports…" msgstr "عدل التقارير" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "جارٍ التحميل..." @@ -2050,23 +2070,22 @@ msgstr "التنبيهات المحلية" msgid "Locate the problem on a map of the area" msgstr "تحديد موقع المشكلة على خريطة المنطقة" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2078,7 +2097,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "الخريطة" @@ -2086,7 +2105,7 @@ msgstr "الخريطة" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "ادارة القائمة القصيرة" @@ -2094,7 +2113,7 @@ msgstr "ادارة القائمة القصيرة" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "الخريطة" @@ -2106,11 +2125,11 @@ msgstr "اشر كمرسلة" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "تحديد المستخدمين الذين تريد وضع علامة على سلوكهم بأنه مشار إليه." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "حدد تفاصيل المشكلة." -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "الرسالة" @@ -2130,24 +2149,25 @@ msgstr "هيئات مفقودة:" msgid "Missing jurisdiction_id" msgstr " jurisdiction_id غير موجود" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "إشراف" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "قم بالاشراف على تفاصيل التبليغ" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "قم بالاشراف على التبليغ" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2156,6 +2176,12 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل واحد" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "قم بالاشراف على التبليغ" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2181,9 +2207,9 @@ msgstr "الأكثر تعليقا" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "الاسم" @@ -2196,6 +2222,12 @@ msgstr "الاسم" msgid "Name:" msgstr "الاسم:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "انتقل الى هذه المشكلة" @@ -2264,6 +2296,8 @@ msgid "New note to DM:" msgstr "ملاحظة جديدة لرئيس المنطقة:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "كلمة مرور جديدة:" @@ -2350,11 +2384,18 @@ msgstr "الأحدث" msgid "Next" msgstr "التالي" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "التالي" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2367,6 +2408,11 @@ msgstr "التالي" msgid "No" msgstr "لا" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "حسابك" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "لاتوجد منطقة" @@ -2375,7 +2421,7 @@ msgstr "لاتوجد منطقة" msgid "No body" msgstr "لا هيئة" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "لم يتم تحديد مجلس" @@ -2408,7 +2454,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "لم يتم إرجاع أي نتائج" @@ -2489,16 +2535,6 @@ msgstr "ملاحظات من رئيس المنطقة الفرعية لرئيس ا msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "الآن حان وقت تقديم التقرير…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "الآن حان وقت تقديم التحديث…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2507,15 +2543,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "موافق" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2568,6 +2604,14 @@ msgstr "مواصفة Open311" msgid "Options" msgstr "إختياري" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2576,15 +2620,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2621,15 +2665,13 @@ msgstr "العنصر الرئيسي" msgid "Partial" msgstr "جزئي" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "كلمة المرور (اختياري)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "الارتباط الثابت" @@ -2648,16 +2690,22 @@ msgid "Phone Reporter:" msgstr "تم الإبلاغ:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "رقم الهاتف" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "رقم الهاتف (اختياري)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "يقتصر طول التقارير على %s من الأحرف. الرجاء تقصير التقرير" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2669,12 +2717,14 @@ msgstr "تم الإبلاغ:" msgid "Phone:" msgstr "الهاتف:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2688,7 +2738,7 @@ msgstr "الهاتف:" msgid "Photo" msgstr "الصورة" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "الصورة مطلوبة." @@ -2696,12 +2746,12 @@ msgstr "الصورة مطلوبة." msgid "Photo required" msgstr "الصورة مطلوبة" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2722,7 +2772,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "وضع دبوس على الخريطة" @@ -2742,7 +2792,7 @@ msgstr "الرجاء التحقق من كلمات المرور وإعادة ال msgid "Please check your email address is correct" msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2752,15 +2802,15 @@ msgid "Please check your phone number is correct" msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "الرجاء اختيار فئة" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2785,12 +2835,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة استعمال المجلس يتسبب في تقليل قيمة الخدمة المقدمة لكل المستخدمين." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "الرجاء إدخال رسالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2799,8 +2849,8 @@ msgstr "الرجاء إدخال رسالة" msgid "Please enter a mobile number" msgstr "الرجاء إدخال رقم الهاتف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" @@ -2810,22 +2860,22 @@ msgstr "الرجاء ادخال اسم لهذه الهيئة." #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "الرجاء إدخال كلمة مرور" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "الرجاء إدخال بريد إلكتروني صالح" @@ -2834,14 +2884,14 @@ msgstr "الرجاء إدخال بريد إلكتروني صالح" msgid "Please enter a valid email address" msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "الرجاء إدخال رقم الهاتف" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "الرجاء إدخال بعض التفاصيل" @@ -2851,39 +2901,39 @@ msgstr "الرجاء إدخال بعض التفاصيل" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "الرجاء إدخال البريد الإلكتروني" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "الرجاء إدخال الاسم الأول" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "الرجاء إدخال اسمك" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "الرجاء إدخال رقم الهاتف" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "الرجاء إدخال الاسم الثاني" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "الرجاء إدخال اللقب" @@ -2910,8 +2960,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة في استبيان آخر أم لا" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2923,7 +2973,7 @@ msgstr "الرجاء ملاحظة أن التحديثات لا يتم إرسال msgid "Please note your report has not yet been sent." msgstr "يرجى ملاحظة أن تقريرك لم يتم إرساله بعد." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "الرجاء ملاحظة أن التقرير لم يتم إرساله. اختر فئة وأضف مزيدًا من المعلومات بالأسفل، ثم قدّم التقرير." @@ -2937,12 +2987,12 @@ msgstr "يرجى ملاحظة أن تحديثك لم يتم نشره ب msgid "Please note:" msgstr "الرجاء ملاحظة:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "الرجاء تقديم تحديث عام لهذا التقرير." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "الرجاء تقديم تحديث عام لهذا التقرير." @@ -2975,15 +3025,15 @@ msgstr "الرجاء تحديد نوع التنبيه الذي تريده" msgid "Please state whether or not the problem has been fixed" msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم حلها أم لا" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "الرجاء تحميل صورة فقط" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2991,9 +3041,7 @@ msgstr "" msgid "Please write a message" msgstr "الرجاء كتابة رسالة" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "نشر" @@ -3002,19 +3050,19 @@ msgstr "نشر" msgid "Postcode or street name and area" msgstr "أدخل أقرب صندوق بريد، أو اسم الشارع والحي" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "نشر بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "تم النشر بواسطة %s في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "تم النشر بواسطة %s (%s) في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "تم النشر بواسطة %s في %s" @@ -3049,14 +3097,10 @@ msgstr "الخصوصية وملفات تعريف الارتباط" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "خاص" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "مشكلة" @@ -3079,7 +3123,7 @@ msgstr "تم إرسال المشكلة %s إلى المجلس %s" msgid "Problem breakdown by state" msgstr "تصنيف المشكلة حسب الحالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "تم وضع علامة \"مفتوح\" على المشكلة." @@ -3088,7 +3132,6 @@ msgid "Problem state change based on survey results" msgstr "يتم تغيير حالة المشكلة حسب نتائج الاستطلاع" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "المشكلات" @@ -3115,7 +3158,7 @@ msgstr "المشكلات المبلّغ عنها مؤخرًا على FixMyStreet msgid "Problems within %.1fkm of %s" msgstr "المشكلات الموجودة ضمن %.1f كم من هذا الموقع" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3141,26 +3184,26 @@ msgstr "المشكلات ضمن حدود %s، %s" msgid "Property address:" msgstr "عنوان الملكية:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "قدّم تحديثًا" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "قدم التحديث كـ" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "تقديم كلمة المرور اختياري، ولكن فعل ذلك يتيح لك الإبلاغ عن المشكلات وإضافة التحديثات وإدارة التقارير بسهولة أكبر." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3229,7 +3272,7 @@ msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s" msgid "RSS feed of nearby problems" msgstr "موجز RSS للمشكلات القريبة" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3254,7 +3297,7 @@ msgstr "موجز RSS للتحديثات على هذه المشكلة" msgid "Receive email when updates are left on this problem." msgstr "استلام بريد إلكتروني عند ترك تحديثات لهذه المشكلة." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "استلمت من %s قبل لحظات" @@ -3301,9 +3344,9 @@ msgstr "إزالة الإشارة" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "حذف من القائمة القصيرة" @@ -3335,14 +3378,14 @@ msgid "Report ID:" msgstr "معرف البلاغ:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "الإبلاغ عن مشكلة" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3353,14 +3396,14 @@ msgstr "الإبلاغ عن مشكلة" msgid "Report abuse" msgstr "الإبلاغ عن إساءة" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "الإبلاغ عن مشكلة" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "بلغ كـ" @@ -3388,8 +3431,8 @@ msgstr "الإبلاغ عن المشكلات المحلية أو عرضها أو msgid "Report, view, or discuss local problems" msgstr "الإبلاغ عن المشكلات المحلية أو عرضها أو مناقشتها" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s" @@ -3398,8 +3441,8 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s" msgid "Reported before" msgstr "تم الإبلاغ عنها من قبل" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "تم الإبلاغ عنها بواسطة %s في %s" @@ -3408,31 +3451,31 @@ msgstr "تم الإبلاغ عنها بواسطة %s في %s" msgid "Reported by:" msgstr "تم الإبلاغ عنها بواسطة:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "تم الإبلاغ عنها في الفئة %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها في الفئة %s بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "تم البلاغ في التصنيف %s بواسطة %s في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "تم الإبلاغ عنها بواسطة %s بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "تم الإبلاغ عنها عبر %s بواسطة %s في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "تم الإبلاغ عنها عبر %s في الفئة %s بواسطة %s في %s" @@ -3443,7 +3486,7 @@ msgstr "تم الإبلاغ:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3452,17 +3495,23 @@ msgstr "الإبلاغ عن مشكلة" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "التقارير" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "يقتصر طول التقارير على %s من الأحرف. الرجاء تقصير التقرير" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "يقتصر طول التقارير على %s من الأحرف. الرجاء تقصير التقرير" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "التقارير في انتظار الاعتماد" @@ -3484,7 +3533,7 @@ msgstr "" msgid "Reports published" msgstr "تم نشر التقارير" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3547,20 +3596,20 @@ msgstr "قوالب الاستجابة" msgid "Response Templates for %s" msgstr "قوالب الاستجابة لـ %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "المكان صحيح؟" @@ -3572,15 +3621,15 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتق msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3591,7 +3640,7 @@ msgstr "تدوير لليمين" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغييرات غير المحفوظة في التقرير." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "القمر الصناعي" @@ -3605,8 +3654,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3621,7 +3670,7 @@ msgid "Save with a public update" msgstr "احفظ مع التحديث العام" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3661,13 +3710,12 @@ msgstr "لم يعثر البحث عن أي مستخدمين." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "انظر سياسة الخصوصية" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3698,7 +3746,7 @@ msgstr "" msgid "Select:" msgstr "تحديد:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3715,11 +3763,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "تمت إعادة إرسال التقرير" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "تم الإرسال إلى %s %s لاحقًا" @@ -3752,9 +3800,9 @@ msgid "Share" msgstr "مشاركة" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "قائمة قصيرة" @@ -3762,19 +3810,19 @@ msgstr "قائمة قصيرة" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "تم الاضافة الى القائمة القصيرة" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "تم الاضافة الى القائمة القصيرة في %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3786,7 +3834,7 @@ msgstr "" msgid "Show my name publicly" msgstr "إظهار اسمي للعامة" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3800,17 +3848,17 @@ msgstr "إظهار القديم" msgid "Show older reports" msgstr "البحث عن تقارير" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "إظهار الدبابيس" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3818,20 +3866,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "تسجيل الدخول" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "الرجاء الدخولعبر البريد الإلكتروني بدلا عن ذلك، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تحديث كلمة المرور." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 #, fuzzy msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "الرجاء الدخولعبر البريد الإلكتروني بدلا عن ذلك، كما يرجى تقديم كلمة مرور جديدة عند هذه النقطة. بعد التأكيد، سيتم تحديث كلمة المرور." @@ -3841,6 +3889,11 @@ msgstr "الرجاء الدخولعبر البريد الإلكتروني بدل msgid "Sign in or create an account" msgstr "سجل الدخول أو أنشئ حساب جديد" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "أدخل كلمة المرور:" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3886,15 +3939,15 @@ msgstr "عذرًا، لم يكن هذا الارتباط صالحًا" msgid "Sorry, there has been an error confirming your problem." msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "عذرًا، لم نستطع العثور على هذا الموقع." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ النموذج بالأسفل." @@ -3904,7 +3957,7 @@ msgstr "عذرا، لم نتمكن من تسجيل دخولك. يرجى ملئ msgid "Sorry, we could not parse that location. Please try again." msgstr "عذرًا، لم نستطع تحليل ذلك الموقع. الرجاء إعادة المحاولة." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "عذرًا، لم نستطع حفظ الصورة (الصور)، الرجاء إعادة المحاولة." @@ -3948,13 +4001,13 @@ msgstr "تاريخ البداية:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "الحالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3974,15 +4027,14 @@ msgid "State:" msgstr "الحالة:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "الحالة" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4012,7 +4064,7 @@ msgstr "عرض الشارع" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "الفئة الفرعية: %s" @@ -4021,21 +4073,22 @@ msgstr "الفئة الفرعية: %s" msgid "Subdivision/Body" msgstr "القسم الفرعي/الهيئة" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "الموضوع" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "الموضوع:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "تقديم" @@ -4087,8 +4140,7 @@ msgid "Summarise your changes" msgstr "لخص تغييراتك" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4123,18 +4175,22 @@ msgstr "المستخدم الخارق له ترخيص لتنفيذ strong>كل msgid "Survey Results" msgstr "نتائج التصفح" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "القالب «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "القوالب" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "النص" @@ -4145,6 +4201,7 @@ msgstr "إصدار نصي فقط" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4178,7 +4235,7 @@ msgstr "شكرًا لك على تحميل الصورة. نحن نحتاج الآ 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 "شكرًا لك، يسعدنا معرفة أن المشكلة قد حُلت! هل يمكنا أن نسألك عما إذا كنت قد أبلغت عن مشكلة للمجلس من قبل؟" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "يبدو أنه لم يتم تحميل هذه الصورة بصورة سليمة (%s)، الرجاء إعادة المحاولة." @@ -4192,7 +4249,6 @@ msgstr "لا يبدو أن هذا الموقع يقع في المملكة الم #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا." @@ -4205,28 +4261,28 @@ msgstr "تم وضع علامة على هذه المشكلة بأنها أُرس msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "لا يمكن عرض هذا التقرير على %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "تمت إزالة هذا التقرير من FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "تمت إزالة هذا التقرير من FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4376,7 +4432,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "تعذر على المستخدم تحديد موقع المشكلة على الخريطة، ولكن يجب البحث عن المنطقة حول الموقع الذي أدخله" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "تمت إزالة هذا التقرير من FixMyStreet." @@ -4396,7 +4452,7 @@ msgstr "" msgid "There are no reports to show." msgstr "لا توجد تقارير لعرضها." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4413,15 +4469,19 @@ msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء msgid "There was a problem with your email/password combination. Please try again." msgstr "حدثت مشكلة في توليفة البريد الإلكتروني/كلمة المرور. الرجاء إعادة المحاولة." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "حدثت مشكلة في توليفة البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، فالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ في النموذج." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى." @@ -4429,10 +4489,21 @@ msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة م msgid "There were problems with your report. Please see below." msgstr "حدثت مشكلات في التقرير. الرجاء الاطلاع على ما يلي." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "حدثت مشكلات في التحديث. الرجاء الاطلاع على ما يلي." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "سوف يتم ارسال هذه الى المجلس و لكن لن يتم اظهارها عند الاتصال بالانترنت ابدا" + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "لن يتم اظهار هذه عند الاتصال بالانترنت ابدا" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4463,15 +4534,6 @@ msgstr "سوف يتم نشر هذه و سيكون بمقدور الجميع رؤ msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr " سوف يتم ارسال هذه الى %sو سوف يتم نشرها و سيكون بمقدور الجميع رؤيتها وفقا لـ سياسة الخصوصية." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "سوف يتم ارسال هذه الى المجلس و لكن لن يتم اظهارها عند الاتصال بالانترنت ابدا" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "لن يتم اظهار هذه عند الاتصال بالانترنت ابدا" - #: 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 هذا هو عمل قيد التنفيذ ولم يستقر حتى الآن. وسيتغير بدون تحذيرات في المستقبل." @@ -4507,10 +4569,10 @@ msgstr "أُرسلت رسالة البريد الإلكتروني إلى كلا 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" @@ -4549,7 +4611,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "هذا التقرير في انتظار اعتماد الإشراف." @@ -4565,7 +4627,7 @@ msgstr "هذا التقرير عليه علامة \"تم الإصلاح\" حال msgid "This report is currently marked as open." msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا." @@ -4582,7 +4644,6 @@ msgid "Time spent (in minutes):" msgstr "الوقت المستغرق (بالدقائق):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "المخطط الزمني" @@ -4666,7 +4727,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "موثوق من الهيئات:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "موثوق به لأنشاء تبليغات بدون الحاجة الى تدقيقها" @@ -4676,7 +4737,7 @@ msgstr "موثوق:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "أعد المحاولة" @@ -4712,7 +4773,7 @@ msgstr "" msgid "Unconfirmed" msgstr "غير مؤكد" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "غير معروف" @@ -4720,18 +4781,18 @@ msgstr "غير معروف" msgid "Unknown alert type" msgstr "نوع تنبيه غير معروف" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "خطأ غير معروف" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "معرف المشكلة غير معروف" @@ -4750,7 +4811,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "تحديث" @@ -4758,11 +4819,11 @@ msgstr "تحديث" msgid "Update %s created for problem %d; by %s" msgstr "تم إنشاء تحديث %s للمشكلة %d؛ بواسطة %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "تمت إضافة التحديث التالي بدون تحديد الهوية في %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "تمت إضافة التحديث التالي بواسطة %s في %s" @@ -4802,24 +4863,24 @@ msgstr "حالات التحديث" msgid "Updated" msgstr "تم التحديث" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "تم النشر بواسطة %s (%s) في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "تم النشر بواسطة %s في %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "تم التحديث!" @@ -4830,7 +4891,7 @@ msgstr "تم التحديث!" msgid "Updates" msgstr "التحديثات" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "يقتصر طول التحديثات على %s من الأحرف. الرجاء تقصير نص التحديث" @@ -4885,28 +4946,28 @@ msgstr "التعليق المأخوذ ينتمي الى مستخدم معرف" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "البريد أضيف إلى لائحة المسيئين" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "البريد موجودا سابقا في لائحة المسيئين" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "تم وضع إشارة للمستخدم" @@ -4932,10 +4993,8 @@ msgid "User:" msgstr "المستخدمون" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "المستخدمون" @@ -4983,6 +5042,10 @@ msgstr "عرض التقارير حسب الدائرة" msgid "View wards" msgstr "مناطق أخرى:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5014,7 +5077,7 @@ msgstr "وجدنا اكثر من تطايق لمؤشرات المشكلة:" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5076,7 +5139,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "ثلاث صور تكفي." @@ -5104,17 +5167,15 @@ msgstr "هل تريد المشاركة في استبيان آخر خلال 4 أ 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 -msgid "Wrong location? Just click again on the map." -msgstr "موقع غير صحيح؟ انقر مرة أخرى على الخريطة." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5128,11 +5189,11 @@ msgstr "موقع غير صحيح؟ انقر مرة أخرى على الخريط msgid "Yes" msgstr "نعم" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشراف دون ضرورة لذلك:" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5140,11 +5201,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبل:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "أنت تبلغ عن التحديث التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبيل:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "يمكنك عرض المشكلة على هذا الموقع." @@ -5162,7 +5223,7 @@ msgstr "يمكنك إضافة البريد الإلكتروني الخاصة ب msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "يمكنك التواصل مع الدعم الفني عبر %s" @@ -5187,11 +5248,11 @@ msgstr "يمكنك مساعدتنا في العثور على عنوان بريد msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت لا تريدها نشطة على الموقع." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "لقد رفضت؛ الرجاء تعبئة المربع بالأعلى" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5199,7 +5260,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "لقد أجبت عن هذا الاستبيان بالفعل. إذا كان لديك سؤال، فالرجاء التواصل معنا، أو عرض المشكلة.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "لقد أرفقت صورًا بهذا التقرير من قبل. لاحظ أنه يمكنك إرفاق 3 صور كحد أقصى بهذا التقرير (إذا حاولت تحميل المزيد من الصور، فسيتم حذف الصور القديمة)." @@ -5284,11 +5345,11 @@ msgid "Your account" msgstr "حسابك" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "البريد الإلكتروني" @@ -5297,9 +5358,9 @@ msgstr "البريد الإلكتروني" msgid "Your email address" msgstr "عنوان البريد الإلكتروني" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "عنوان البريد الإلكتروني" @@ -5308,9 +5369,7 @@ msgstr "عنوان البريد الإلكتروني" msgid "Your information will only be used in accordance with our privacy policy" msgstr "لن يتم استخدام معلوماتك إلا وفقًا لسياسة الخصوصية الخاصة بنا" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "الاسم" @@ -5326,13 +5385,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "كلمة المرور" @@ -5341,15 +5400,15 @@ msgstr "كلمة المرور" msgid "Your password has been changed" msgstr "تم تغيير كلمة المرور" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "رقم الهاتف" @@ -5371,7 +5430,12 @@ msgstr "قائمتك القصيرة" msgid "Your token has been generated" msgstr "تم تغيير كلمة المرور" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "التحديثات" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5383,8 +5447,8 @@ msgstr "التحديثات" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "نفسك" @@ -5403,13 +5467,15 @@ msgid "all" msgstr "الكل" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5436,7 +5502,7 @@ msgstr "على سبيل المثال، ’%s‘ أو ’%s‘" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "حفرة بعمق 10 انشات على شارع مثال قرب صندوق البريد" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "مضى شهرين على وجود هذه الحفرة و...." @@ -5476,6 +5542,15 @@ msgstr "بلا" msgid "not the council's responsibility" msgstr "عليه علامة ليست مسؤولية المجلس" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "سجل الدخول أو أنشئ حساب جديد" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5512,12 +5587,12 @@ msgstr "تسجيل الخروج" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "المجلس المحلي" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يستخدم الخريطة" @@ -5534,11 +5609,11 @@ msgstr "هذا النوع من المشكلة المحلية" msgid "today" msgstr "اليوم" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5554,12 +5629,12 @@ msgstr "المستخدم من نفس المجلس مثل المشكلة - %d" msgid "user is problem owner" msgstr "المستخدم هو صاحب المشكلة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "البريد موجودا سابقا في لائحة المسيئين" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "حذف من القائمة القصيرة" @@ -5822,8 +5897,34 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#~ msgid "Enter a password" -#~ msgstr "أدخل كلمة المرور:" +#~ msgid "No let me sign in by email" +#~ msgstr "لا دعني أسجّل دخولي بالبريد" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "لا دعني أسجّل دخولي بالبريد" + +#~ msgid "Edit other users' details" +#~ msgstr "عدل تفاصيل المستخدمين الآخرين" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "احتفظ بتسجيل الدخول على هذا الكمبيوتر" + +#~ msgid "Now to submit your report…" +#~ msgstr "الآن حان وقت تقديم التقرير…" + +#~ msgid "Now to submit your update…" +#~ msgstr "الآن حان وقت تقديم التحديث…" + +#~ 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 "تقديم الاسم وكلمة المرور اختياري، ولكن فعل ذلك يتيح لك الإبلاغ عن المشكلات وإضافة التحديثات وإدارة التقارير بسهولة أكبر." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "موقع غير صحيح؟ انقر مرة أخرى على الخريطة." #, fuzzy #~ msgid "New" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index f0aefc22a09..640e42868b2 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "и" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(не е изпратен към общината)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(незадължително)" @@ -178,9 +178,9 @@ msgstr "(изпратен към двата района)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Изберете категория --" @@ -210,7 +210,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -219,34 +219,24 @@ msgstr "" msgid "%s live problems" msgstr "%s отворени сигнали" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Не Нека потвърдя сигнала чрез имейл" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Не Нека потвърдя сигнала чрез имейл" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Не Нека потвърдя актуализацията чрез имейл" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Не Нека потвърдя актуализацията чрез имейл" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Не Нека да вляза в системата чрез имейл" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Не Нека да вляза в системата чрез имейл" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -255,12 +245,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Да Имам парола" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Подайте сигнал" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -326,9 +319,9 @@ msgstr "Телефонен номер" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -338,16 +331,15 @@ msgstr "" msgid "Add user" msgstr "Добавете потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -355,7 +347,7 @@ msgstr "" msgid "Added %s" msgstr "Добавено %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -375,7 +367,8 @@ msgstr "Създадено известие %d за %s, тип %s, с парам msgid "Alert %d disabled (created %s)" msgstr "Известието %d е изключено (създадено на %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Известявай ме за бъдещи актуализиации" @@ -443,34 +436,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Този сигнал е маркиран като поправен." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Анонимен" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Анонимен" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Анонимен:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -507,7 +502,7 @@ msgstr "Прехвърляне към външна община:" msgid "Assign to subdivision:" msgstr "Прехвърляне към подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -541,6 +536,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -553,12 +552,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Очакващ преглед" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Назад" @@ -572,10 +571,8 @@ msgid "Ban user" msgstr "Означаване на потребител" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -612,7 +609,6 @@ msgid "Can't see the map? Skip this step" msgstr "Не виждате картата? Пропуснете тази стъпка" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -645,7 +641,7 @@ msgstr "Категория" msgid "Category and State" msgstr "Категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -655,6 +651,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -714,7 +711,7 @@ msgstr "Изберете име на категорията, msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -742,6 +739,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -754,7 +755,7 @@ msgstr "" msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Затворен от общината" @@ -784,18 +785,17 @@ msgid "Cobrand:" msgstr "Местна имплементция" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -809,8 +809,7 @@ msgstr "Потвърждаване" msgid "Confirm account" msgstr "Потвърждаване на акаунта" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -829,7 +828,7 @@ msgstr "Потвърждение" msgid "Confirmed" msgstr "Потвърдено" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -840,16 +839,20 @@ msgstr "Потвърдени:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Връзка с нас" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Връзка с тима" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -859,12 +862,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Потребителят не е намерен" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Местоположението не може да бъде намерено" @@ -900,6 +903,11 @@ msgstr "Създаден" msgid "Create a report" msgstr "Подай сигнал" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Влезте или създайте акаунт" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -909,18 +917,15 @@ msgstr "Създай категория" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -938,7 +943,7 @@ msgstr "Създаден" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -964,7 +969,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "В момента няма създадени Райони." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -992,6 +997,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1001,7 +1010,7 @@ msgstr "" msgid "Delete" msgstr "Изтрит" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1013,8 +1022,8 @@ msgstr "" msgid "Deleted" msgstr "Изтрит" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1030,17 +1039,18 @@ msgstr "Описание" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Информация" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1072,8 +1082,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1082,11 +1092,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1098,7 +1104,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знам" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Не обичате форми?" @@ -1106,7 +1112,7 @@ msgstr "Не обичате форми?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1151,34 +1157,36 @@ msgstr "Редактиране" msgid "Edit body details" msgstr "Редактиране на информацията за района" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Редактиране на информацията за района" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Редактиране на информацията за района" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Актуализации" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1211,20 +1219,20 @@ msgstr "Редактирано от" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Имейл" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Парола (незадължително)" @@ -1237,6 +1245,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1314,11 +1330,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Въведете пощенски код или име на улица в близост до вас" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1369,11 +1380,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1416,6 +1427,8 @@ msgstr "Допълнителни данни:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Допълнителни данни:" @@ -1438,6 +1451,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1515,17 +1533,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "За повече информацич вижте Как ПоправиСофия използва MapIt." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Парола" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Забравена парола?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1583,7 +1606,7 @@ msgstr "Търси" msgid "Going to send questionnaire?" msgstr "Ще изпратите ли анкетата?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1653,7 +1676,7 @@ msgstr "Скрити" msgid "Hide all reports and updates" msgstr "Означени сигнали и потребители" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1676,11 +1699,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Скрий кабърчетата" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1705,7 +1728,7 @@ msgstr "Начало" msgid "How to report a problem" msgstr "Как да сигнализирате за проблем" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Как да подавате сигнали успешно" @@ -1765,7 +1788,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1876,7 +1899,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1896,8 +1919,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1909,13 +1932,6 @@ msgstr "Моля проверете страницата с че msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Запомни ме" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1955,6 +1971,7 @@ msgstr "Последно обновено:" msgid "Last update:" msgstr "Последно обновено:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1981,7 +1998,7 @@ msgstr "Показване на всички сигнали" msgid "Loading reports…" msgstr "Вашите сигнали" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Зареждане..." @@ -2007,23 +2024,22 @@ msgstr "Известия" msgid "Locate the problem on a map of the area" msgstr "Локализирайте проблема на картата" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2035,7 +2051,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "Карта" @@ -2043,7 +2059,7 @@ msgstr "Карта" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2051,7 +2067,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2063,11 +2079,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Маркирайте потребители, които бихте искали да държите под око." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Съобщение" @@ -2087,24 +2103,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Липсващо jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2113,6 +2130,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2138,9 +2160,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Име" @@ -2153,6 +2175,11 @@ msgstr "Име" msgid "Name:" msgstr "Име:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2219,6 +2246,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2305,11 +2334,18 @@ msgstr "" msgid "Next" msgstr "Слеващ" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Слеващ" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2322,6 +2358,11 @@ msgstr "Слеващ" msgid "No" msgstr "Не" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Потвърждаване на акаунта" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2330,7 +2371,7 @@ msgstr "" msgid "No body" msgstr "Несъществуващ район" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Не е избрана община" @@ -2363,7 +2404,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Няма намерени резултати" @@ -2435,16 +2476,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Сега да изпратим Вашия сигнал…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Изпратете актуализацията…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2453,15 +2484,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2513,6 +2544,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2521,15 +2560,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2566,15 +2605,13 @@ msgstr "Община" msgid "Partial" msgstr "Частичен" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Парола (незадължително)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Връзка" @@ -2592,16 +2629,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Телефонен номер" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Телефонен номер (незадължително)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2612,12 +2654,14 @@ msgstr "" msgid "Phone:" msgstr "Телефон:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2631,7 +2675,7 @@ msgstr "Телефон:" msgid "Photo" msgstr "Снимка" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2639,12 +2683,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2665,7 +2709,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Поставете кабърче върху картата" @@ -2685,7 +2729,7 @@ msgstr "Моля проверете паролите и пробвайте от msgid "Please check your email address is correct" msgstr "Моля проверете дали сте въвели коректен имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2695,15 +2739,15 @@ msgid "Please check your phone number is correct" msgstr "Моля проверете дали сте въвели коректен имейл адрес" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Моля изберете категория" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2725,12 +2769,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Моля не обиждайте никого - обиждайки Общината, Вие обезценявате услугата за всички потребители." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Моля въведете съобщение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2739,8 +2783,8 @@ msgstr "Моля въведете съобщение" msgid "Please enter a mobile number" msgstr "Моля въведете фамилия" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2750,22 +2794,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Моля въведете парола" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Моля въведете тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Моля въведете валиден имейл" @@ -2774,14 +2818,14 @@ msgstr "Моля въведете валиден имейл" msgid "Please enter a valid email address" msgstr "Моля въведете валиден имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Моля въведете фамилия" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Моля въведете информация" @@ -2791,39 +2835,39 @@ msgstr "Моля въведете информация" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Моля въведете имейл" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Моля въведете име" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Моля въведете име" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Моля въведете обръщение" @@ -2850,8 +2894,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Моля отбележете дали бихте искали да участвате в друга анкета" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2863,7 +2907,7 @@ msgstr "Моля имайте предвид, че актуализациите msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2877,12 +2921,12 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Моля въведете информация защо отваряте сигнала отново." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2915,15 +2959,15 @@ msgstr "Моля изберете тип известия, които бихте msgid "Please state whether or not the problem has been fixed" msgstr "Моля посочете дали проблемът е бил разрешен или не" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2931,9 +2975,7 @@ msgstr "" msgid "Please write a message" msgstr "Моля въведете съобщение" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Публикувай" @@ -2942,19 +2984,19 @@ msgstr "Публикувай" msgid "Postcode or street name and area" msgstr "Въведете пощенски код или име на улица в близост до вас" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Публикувано от анонимен потребител в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Публикувано от %s в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Публикувано от %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Публикувано от %s в %s" @@ -2989,14 +3031,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Лично" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Сигнал" @@ -3019,7 +3057,7 @@ msgstr "Сигналът %s е подаден към общината %s " msgid "Problem breakdown by state" msgstr "Разделяне на сигналите по статуси" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -3028,7 +3066,6 @@ msgid "Problem state change based on survey results" msgstr "Статусът на сигнала е променен на основата на резултат от анкета" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Сигнали" @@ -3055,7 +3092,7 @@ msgstr "Проблеми сигнализирани скоро в сайта" msgid "Problems within %.1fkm of %s" msgstr "Сигнали в радиус от %.1fкм от това местоположение" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3081,26 +3118,26 @@ msgstr "" msgid "Property address:" msgstr "Адрес на имота:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Въведете иформация за актуализиране" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Използването на парола е по избор, но това ще ви позволи по-лесно да подавате сигнали и да публикувате и променяте актуализации." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3169,7 +3206,7 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за последни проблеми наоколо" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3194,7 +3231,7 @@ msgstr "RSS абонамент за актуализации по този пр msgid "Receive email when updates are left on this problem." msgstr "Получаване на имейл при актуализация на проблема." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3241,9 +3278,9 @@ msgstr "Премахване на означението" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3275,14 +3312,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Подайте сигнал" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3293,14 +3330,14 @@ msgstr "Подайте сигнал" msgid "Report abuse" msgstr "Сигнализирай за неподходящо съдържание" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Подайте сигнал" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3328,8 +3365,8 @@ msgstr "Сигнализирай, разгледай или коментирай msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3338,8 +3375,8 @@ msgstr "" msgid "Reported before" msgstr "Подавал съм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3348,31 +3385,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Сигналът е подаден в категория %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в категория %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s" @@ -3383,7 +3420,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3392,17 +3429,22 @@ msgstr "Сигнализиране за проблем" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Сигнали" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Сигнали чакащи одобрение" @@ -3423,7 +3465,7 @@ msgstr "" msgid "Reports published" msgstr "Публикувани сигнали" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3485,20 +3527,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Правилното място ли е това?" @@ -3510,15 +3552,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Завъртане наляво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3529,7 +3571,7 @@ msgstr "Завъртане надясно" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3543,8 +3585,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3559,7 +3601,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3599,13 +3641,12 @@ msgstr "Не са намерени потребители." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3636,7 +3677,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3653,11 +3694,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" @@ -3690,9 +3731,9 @@ msgid "Share" msgstr "Сподели" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3700,19 +3741,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3724,7 +3765,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Показвай името ми публично" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3738,17 +3779,17 @@ msgstr "Показване на старите" msgid "Show older reports" msgstr "Търсене на сигнали" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Покажи кабърчетата" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3756,20 +3797,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Вход" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3778,6 +3819,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Влезте или създайте акаунт" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Въведете парола" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3820,15 +3866,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3838,7 +3884,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3882,13 +3928,13 @@ msgstr "Начална дата:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3908,15 +3954,14 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Статус" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3946,7 +3991,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Категория" @@ -3955,21 +4000,22 @@ msgstr "Категория" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Изпращане" @@ -4021,8 +4067,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4057,18 +4102,22 @@ msgstr "" msgid "Survey Results" msgstr "Резултати от проучване" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -4079,6 +4128,7 @@ msgstr "Версия само с текст" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4112,7 +4162,7 @@ msgstr "Благодаря за предоставената снимка. Тъ 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 "Благодаря! Радваме се, че този проблем е бил разрешен! Бихме искли да Ви питаме подавали ли сте сигнали към общината и преди?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Прикачването на изображение е неуспешно (%s). Моля опитайте отново." @@ -4126,7 +4176,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Моля да ни извините, този пощенски код не беше разпознат." @@ -4139,28 +4188,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Сигналът не може да бъде разгледан %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Този сигнал е бил изтрит от ПоправиСофия." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Този сигнал е бил изтрит от ПоправиСофия." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4300,7 +4349,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Този сигнал е бил изтрит от ПоправиСофия." @@ -4320,7 +4369,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4337,15 +4386,19 @@ msgstr "Възникна проблем при визуализирането н msgid "There was a problem with your email/password combination. Please try again." msgstr "Възникна проблем с комбинацията имейл/парола. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Възникна проблем с комбинацията имейл/парола. Ако не можете да си спомните паролата или нямате такава, моля попълнете секцията ‘влизане чрез имейл’." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." @@ -4353,10 +4406,19 @@ msgstr "Възникна проблем с вашата актуализация msgid "There were problems with your report. Please see below." msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Възникнаха проблеми с вашата актуализация. Моля вижте по-долу." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4381,15 +4443,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4420,10 +4473,10 @@ msgstr "Този имейл е изпратен към двете общини 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Тази информация е необходима" @@ -4462,7 +4515,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4478,7 +4531,7 @@ msgstr "Този сигнал е означен със статус поправ msgid "This report is currently marked as open." msgstr "Този сигнал е означен със статус отворен." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Този сигнал е означен със статус отворен." @@ -4495,7 +4548,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линия" @@ -4579,7 +4631,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4589,7 +4641,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Опитайте отново" @@ -4625,7 +4677,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Непотвърден" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Неизвестен" @@ -4633,18 +4685,18 @@ msgstr "Неизвестен" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Непозната грешка" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4663,7 +4715,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Актуализация" @@ -4671,11 +4723,11 @@ msgstr "Актуализация" msgid "Update %s created for problem %d; by %s" msgstr "Актуализиране на %s съществуващ сигнал %d; от %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Актуализирано анонимно на %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Актуализирано от %s на %s" @@ -4715,24 +4767,24 @@ msgstr "Актуализация на статусите" msgid "Updated" msgstr "Актуализирано!" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Публикувано от %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Публикувано от %s в %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Актуализирано!" @@ -4743,7 +4795,7 @@ msgstr "Актуализирано!" msgid "Updates" msgstr "Актуализации" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4798,28 +4850,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Имейлът е добавен в списъка със злоупотреби" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Имейлът е в списъка със злоупотреби" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4845,10 +4897,8 @@ msgid "User:" msgstr "Потребители" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Потребители" @@ -4896,6 +4946,10 @@ msgstr "Разглеждане на сигналите по квартали" msgid "View wards" msgstr "други територии:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4926,7 +4980,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4988,7 +5042,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5016,17 +5070,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5040,11 +5092,11 @@ msgstr "" msgid "Yes" msgstr "Да" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5052,11 +5104,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Можете да разгледате сигнала на този сайт." @@ -5074,7 +5126,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "За техническа поддръжка моля пишете ни на %s" @@ -5096,11 +5148,11 @@ msgstr "Можете да ни помогнете да намерим имейл msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Можете да маркирате района или общината за изтриване, ако не желаете да бъде активна за този сайт." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Вие отказахте; моля попълнете полето по-долу." -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5108,7 +5160,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Вече сте попълнили тази анкета. Ако имате въпрос, моля свържете се с нас, или прегледайте сигнала.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5193,11 +5245,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Имейл" @@ -5206,9 +5258,9 @@ msgstr "Имейл" msgid "Your email address" msgstr "Имейл адрес" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Имейл адрес" @@ -5217,9 +5269,7 @@ msgstr "Имейл адрес" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Вашата информация ще бъде използва само спрямо нашата Политика за поверителност" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Име" @@ -5235,13 +5285,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Парола" @@ -5250,15 +5300,15 @@ msgstr "Парола" msgid "Your password has been changed" msgstr "Паролата Ви беше променена успешно" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Телефонен номер" @@ -5280,7 +5330,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Паролата Ви беше променена успешно" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Актуализации" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5292,8 +5347,8 @@ msgstr "Актуализации" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5311,13 +5366,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5343,7 +5400,7 @@ msgstr "напр. ‘%s’ или ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5382,6 +5439,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "маркиран като \"незадължение на Общината\"" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Влезте или създайте акаунт" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5418,12 +5484,12 @@ msgstr "излизане" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "местната община" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "мястото не е било отбелязано на картата от потребителя" @@ -5440,11 +5506,11 @@ msgstr "този тип сигнали" msgid "today" msgstr "днес" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5460,12 +5526,12 @@ msgstr "потребителят е от същата община като пр msgid "user is problem owner" msgstr "потребителят е собственик на сигнала" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Имейлът е в списъка със злоупотреби" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Имейлът е добавен в списъка със злоупотреби" @@ -5636,8 +5702,32 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Въведете парола" +#~ msgid "No let me sign in by email" +#~ msgstr "Не Нека да вляза в системата чрез имейл" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Не Нека да вляза в системата чрез имейл" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Редактиране на информацията за района" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Въведете пощенски код или име на улица в близост до вас" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Запомни ме" + +#~ msgid "Now to submit your report…" +#~ msgstr "Сега да изпратим Вашия сигнал…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Изпратете актуализацията…" + +#~ 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 "Използването на потребителско име е опционално, но това ще ви позволи по-лесно да подавате сигнали и да публикувате информация и актуализации." #~ msgid "Password:" #~ msgstr "Парола:" diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po index 1db2c30d0b5..1ff68d4ead1 100644 --- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ca_ES.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Josep Lluís - LliureTIC , 2017\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -157,7 +157,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcional)" @@ -176,9 +176,9 @@ msgstr "(enviat als dos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Tria una categoria --" @@ -208,7 +208,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s desat." @@ -217,31 +217,22 @@ msgstr "%s desat." msgid "%s live problems" msgstr "%s problemes actuals" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -250,12 +241,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr " Tinc contrasenya" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Com informar un problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -318,9 +312,9 @@ msgstr "(sense número de telèfon)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -330,16 +324,15 @@ msgstr "" msgid "Add user" msgstr "Afegeix un usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Afegeix/edita categories de problemes" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Afegeix/edita prioritats de resposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Afegeix/edita plantilles de resposta" @@ -347,7 +340,7 @@ msgstr "Afegeix/edita plantilles de resposta" msgid "Added %s" msgstr "Afegit %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +360,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Avisa'm de futures actualitzacions" @@ -435,34 +429,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Una actualització ha marcat aquest problema com a solucionat." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anònim" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anònim" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anònim" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Un altre usuari" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Estàs segur de voler cancel·lar aquesta càrrega?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Estàs segur?" @@ -499,7 +495,7 @@ msgstr "Assigna a un cos extern:" msgid "Assign to subdivision:" msgstr "Assigna a subdivisió:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Assigna usuaris a àreas" @@ -533,6 +529,10 @@ msgstr "Resposta automática:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Categories disponibles" @@ -545,12 +545,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Esperant moderació" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Torna" @@ -564,10 +564,8 @@ msgid "Ban user" msgstr "Marca l'usuari" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -604,7 +602,6 @@ msgid "Can't see the map? Skip this step" msgstr "No pots veure el mapa? Salta aquest pas" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -637,7 +634,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "Categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoria canviada de ‘%s’ a ‘%s’" @@ -647,6 +644,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -702,7 +700,7 @@ msgstr "" msgid "Choose another" msgstr "Escull un altre" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Neteja les dades fora de línia" @@ -731,6 +729,10 @@ msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per e msgid "Click the link in that email to sign in." msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per entrar amb el teu usuari." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -743,7 +745,7 @@ msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per e msgid "Closed" msgstr "Tancat" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -773,18 +775,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuració" @@ -798,8 +799,7 @@ msgstr "Confirma" msgid "Confirm account" msgstr "Confirma el compte" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -818,7 +818,7 @@ msgstr "Confirmació" msgid "Confirmed" msgstr "Confirmat" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -829,16 +829,20 @@ msgstr "Confirmat:" msgid "Contact %s" msgstr "Contacta %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contacta'ns" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contacta a l'equip" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -848,12 +852,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -889,6 +893,11 @@ msgstr "Creat" msgid "Create a report" msgstr "Crea un informe" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Crea un informe" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -898,18 +907,15 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "Crea una prioritat" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -927,7 +933,7 @@ msgstr "Creat" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -953,7 +959,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -982,6 +988,10 @@ msgstr "" msgid "Default priority" msgstr "Crea una prioritat" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -991,7 +1001,7 @@ msgstr "" msgid "Delete" msgstr "Eliminat" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1003,8 +1013,8 @@ msgstr "Elimina plantilla" msgid "Deleted" msgstr "Eliminat" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1020,17 +1030,18 @@ msgstr "Descripció" msgid "Description:" msgstr "Descripció:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalls" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1062,8 +1073,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1072,11 +1083,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Tens contrasenya de %s?" @@ -1088,7 +1095,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "No t'agraden els formularis?" @@ -1096,7 +1103,7 @@ msgstr "No t'agraden els formularis?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1137,34 +1144,36 @@ msgstr "Edita" msgid "Edit body details" msgstr "Edita els detalls del cos" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Edita els detalls del cos" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Edita la categoria d'informes" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Modera detalls de l'informe" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Edita la prioritat d'informes" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Edita els informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Editant l'actualització %d" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1197,20 +1206,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Correu electrònic" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Adreça de correu electrònic" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Adreça de correu electrònic" @@ -1223,6 +1232,15 @@ msgstr "Alerta de correu electrònic creada" msgid "Email alert deleted" msgstr "Alerta de correu electrònic eliminada" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per entrar amb el teu usuari." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1300,10 +1318,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1353,11 +1367,11 @@ msgstr "Categoria existent" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1402,6 +1416,8 @@ msgstr "Detalls extres" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Data extra:" @@ -1424,6 +1440,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1501,17 +1522,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Has oblidat la teva contrasenya?" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Has oblidat la teva contrasenya?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1569,7 +1595,7 @@ msgstr "Ves" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1634,7 +1660,7 @@ msgstr "Ocultat" msgid "Hide all reports and updates" msgstr "Informes i usuaris marcats" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Oculta l'informe complet" @@ -1657,11 +1683,11 @@ msgstr "Oculta el meu nom en aquest informe" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Oculta l'actualització completament?" @@ -1686,7 +1712,7 @@ msgstr "Inici" msgid "How to report a problem" msgstr "Com informar un problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Com enviar informes satisfactoris" @@ -1746,7 +1772,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1856,7 +1882,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1876,8 +1902,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1889,13 +1915,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1935,6 +1954,7 @@ msgstr "Última actualització:" msgid "Last update:" msgstr "Última actualització:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1961,7 +1981,7 @@ msgstr "Llista tots els problemes informats" msgid "Loading reports…" msgstr "Edita els informes" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Carregant..." @@ -1987,23 +2007,22 @@ msgstr "Alertes locals" msgid "Locate the problem on a map of the area" msgstr "Localitza el problema en un mapa de l'àrea" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2015,7 +2034,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -2023,7 +2042,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2031,7 +2050,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Mapa" @@ -2043,11 +2062,11 @@ msgstr "Marca com enviat" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Missatge" @@ -2067,24 +2086,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Modera" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Modera detalls de l'informe" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Modera aquest informe" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Modera aquesta actualització" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Moderat per %s a %s" @@ -2093,6 +2113,12 @@ msgstr "Moderat per %s a %s" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Raó de moderació:" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2118,9 +2144,9 @@ msgstr "Més comentat" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nom" @@ -2133,6 +2159,11 @@ msgstr "Nom" msgid "Name:" msgstr "Nom:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navega a aquest problema" @@ -2200,6 +2231,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nova contrasenya:" @@ -2286,11 +2319,18 @@ msgstr "El més nou" msgid "Next" msgstr "Següent" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Següent" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2303,6 +2343,11 @@ msgstr "Següent" msgid "No" msgstr "No" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Confirma el compte" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Sense àrea" @@ -2311,7 +2356,7 @@ msgstr "Sense àrea" msgid "No body" msgstr "Sense cos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2344,7 +2389,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "No s'han retornat resultats" @@ -2416,16 +2461,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2434,15 +2469,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2495,6 +2530,14 @@ msgstr "" msgid "Options" msgstr "opcional" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2503,15 +2546,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2547,15 +2590,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2573,16 +2614,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2593,12 +2639,14 @@ msgstr "" msgid "Phone:" msgstr "" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2612,7 +2660,7 @@ msgstr "" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2620,12 +2668,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2646,7 +2694,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2666,7 +2714,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2675,15 +2723,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2705,12 +2753,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2718,8 +2766,8 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2729,22 +2777,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "" @@ -2753,13 +2801,13 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" @@ -2769,39 +2817,39 @@ msgstr "" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2828,8 +2876,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2841,7 +2889,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2855,11 +2903,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2892,15 +2940,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2908,9 +2956,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2918,19 +2964,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2965,14 +3011,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2995,7 +3037,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3046,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3070,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,26 +3095,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3142,7 +3182,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3167,7 +3207,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3212,9 +3252,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3246,14 +3286,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3264,14 +3304,14 @@ msgstr "Com informar un problema" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Com informar un problema" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3298,8 +3338,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3308,8 +3348,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3318,31 +3358,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3353,7 +3393,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3362,17 +3402,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3393,7 +3438,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3453,20 +3498,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3478,15 +3523,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3497,7 +3542,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3511,8 +3556,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3527,7 +3572,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3567,13 +3612,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3603,7 +3647,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3620,11 +3664,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3657,9 +3701,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3667,19 +3711,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3691,7 +3735,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3704,17 +3748,17 @@ msgstr "" msgid "Show older reports" msgstr "Informes tancats" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3722,20 +3766,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3744,6 +3788,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Entra una contrasenya" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3786,15 +3835,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3804,7 +3853,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3847,13 +3896,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3872,14 +3921,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3908,7 +3956,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Categoria" @@ -3917,21 +3965,22 @@ msgstr "Categoria" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3981,8 +4030,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4016,18 +4064,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4038,6 +4090,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4071,7 +4124,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4085,7 +4138,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4098,27 +4150,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4258,7 +4310,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4275,7 +4327,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4292,14 +4344,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4307,10 +4362,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4335,15 +4399,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4374,10 +4429,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4416,7 +4471,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4432,7 +4487,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Informes i usuaris marcats" @@ -4449,7 +4504,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4533,7 +4587,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4543,7 +4597,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4579,7 +4633,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4587,18 +4641,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4616,7 +4670,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4624,11 +4678,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4668,23 +4722,23 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "%s problemes actuals" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4695,7 +4749,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4749,28 +4803,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Correu electrònic afegit a la llista d'abús" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "El correu electrònic ja existeix a la llista d'abús" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4795,10 +4849,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4845,6 +4897,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4875,7 +4931,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4936,7 +4992,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4964,17 +5020,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4988,11 +5042,11 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5000,11 +5054,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5021,7 +5075,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5043,11 +5097,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5055,7 +5109,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5133,11 +5187,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5146,9 +5200,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5156,9 +5210,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5174,13 +5226,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5189,15 +5241,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5218,7 +5270,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Obté actualitzacions" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5230,8 +5287,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5250,13 +5307,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5282,7 +5341,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5320,6 +5379,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5356,12 +5423,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5377,11 +5444,11 @@ msgstr "" msgid "today" msgstr "avui" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5397,12 +5464,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "El correu electrònic ja existeix a la llista d'abús" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Correu electrònic afegit a la llista d'abús" @@ -5573,11 +5640,9 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Entra una contrasenya" - -#~ msgid "Moderation reason:" -#~ msgstr "Raó de moderació:" +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Edita els detalls del cos" #, fuzzy #~ msgid "New" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index eca9b706636..7d20111718e 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " a " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(není odesláno na úřad)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(volitelně)" @@ -178,9 +178,9 @@ msgstr "(odesláno dvoum??)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS kanál hlášení v oblasti %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" @@ -213,7 +213,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -222,34 +222,24 @@ msgstr "" msgid "%s live problems" msgstr "%sNevyřešená hlášení" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Ne Potvrdím hlášení e-mailem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Ne Potvrdím hlášení e-mailem" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Ne Potvrdím aktualizaci e-mailem" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Ne Potvrdím aktualizaci e-mailem" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Ne přihlásím se pomocí e-mailu" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Ne přihlásím se pomocí e-mailu" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -258,12 +248,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ano Mám heslo" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Nahlásit problém" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -329,9 +322,9 @@ msgstr "Vaše telefonní číslo:" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -341,16 +334,15 @@ msgstr "" msgid "Add user" msgstr "Přidat Uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -358,7 +350,7 @@ msgstr "" msgid "Added %s" msgstr "Přidáno %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -378,7 +370,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Upozorněte mě na budoucí aktualizace" @@ -446,34 +439,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Hlášení bylo označeno za vyřešené." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonimní" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonimní" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonymní:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -510,7 +505,7 @@ msgstr "Přiřaďte externí instituci:" msgid "Assign to subdivision:" msgstr "Přiřaďte oddělení:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -544,6 +539,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -556,12 +555,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Čeká se na moderování" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Zpět" @@ -575,10 +574,8 @@ msgid "Ban user" msgstr "Sledovat uživatele" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -615,7 +612,6 @@ msgid "Can't see the map? Skip this step" msgstr "Nevidíte mapu? vynechte tento krok" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -648,7 +644,7 @@ msgstr "Katetorie" msgid "Category and State" msgstr "Katetorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -658,6 +654,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Category fix rate for problems > 4 týdny staré" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -720,7 +717,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -748,6 +745,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -760,7 +761,7 @@ msgstr "" msgid "Closed" msgstr "Uzavřena" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Uzavřena úřadem" @@ -790,18 +791,17 @@ msgid "Cobrand:" msgstr "Motiv:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nastavení" @@ -815,8 +815,7 @@ msgstr "Potvrdit" msgid "Confirm account" msgstr "Potvrdit účet" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -835,7 +834,7 @@ msgstr "Potvrzení" msgid "Confirmed" msgstr "Potvrzeno" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -846,16 +845,20 @@ msgstr "Potvrzeno:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontaktujte nás" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontaktujte nás!" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -865,12 +868,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Uživatele nelze najít" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Lokalitu nelze vyhledat" @@ -906,6 +909,11 @@ msgstr "Vytvořeno" msgid "Create a report" msgstr "Vytvořit report" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Přihlaste se nebo si vytvořte účet" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -915,18 +923,15 @@ msgstr "Vytvořit kategorii" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -944,7 +949,7 @@ msgstr "Vytvořeno" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -970,7 +975,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Doposud nebyl vytvořen žádný subjekt." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -998,6 +1003,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1007,7 +1016,7 @@ msgstr "" msgid "Delete" msgstr "Smazána" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1019,8 +1028,8 @@ msgstr "" msgid "Deleted" msgstr "Smazána" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1036,17 +1045,18 @@ msgstr "Popis" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Podrobnosti" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1078,8 +1088,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1088,11 +1098,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1104,7 +1110,7 @@ msgstr "" msgid "Don’t know" msgstr "Není známo" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Nechcete řešit formulářem?" @@ -1112,7 +1118,7 @@ msgstr "Nechcete řešit formulářem?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1153,34 +1159,36 @@ msgstr "Upravit" msgid "Edit body details" msgstr "Editace podrobností subjektu" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Editace podrobností subjektu" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Editace podrobností subjektu" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Vaše aktualizace" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1213,20 +1221,20 @@ msgstr "Úprava" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Heslo (volitelně)" @@ -1239,6 +1247,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1322,11 +1338,6 @@ msgstr "Zadejte název ulice" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1377,11 +1388,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1424,6 +1435,8 @@ msgstr "Doplňující data:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Doplňující data:" @@ -1446,6 +1459,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1523,17 +1541,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Více informací naleznete v článku Jak FixMyStreet používá Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Vaše heslo" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Zapomněli jste své heslo?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1591,7 +1614,7 @@ msgstr "OK" msgid "Going to send questionnaire?" msgstr "Odeslat dotazník?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1659,7 +1682,7 @@ msgstr "Skrytý" msgid "Hide all reports and updates" msgstr "Sledovaná hlášení a sledovaní uživatelé" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1682,11 +1705,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Schovat značky" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1711,7 +1734,7 @@ msgstr "Úvodní stránka" msgid "How to report a problem" msgstr "Jak nahlásit problém" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Anleitung" @@ -1775,7 +1798,7 @@ msgstr "" "Pokud dva nebo více subjektů působí ve stejné lokalitě, FixMyStreet spojuje identické kategorie do jedné\n" " položky menu. Pokud to tak chcete, ujistěte se, že jména kategorie v těchto subjektech jsou totožná." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1890,7 +1913,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1910,8 +1933,8 @@ msgstr "Chybná agency_responsible hodnota %s" msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1923,13 +1946,6 @@ msgstr "Často bývá nejrychlejší zkontrolovat naše Otázky msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Ponechte mě přihlášeného na tomto počítači" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1969,6 +1985,7 @@ msgstr "Poslední úpravy:" msgid "Last update:" msgstr "Poslední úpravy:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1995,7 +2012,7 @@ msgstr "Seznam všech hlášení" msgid "Loading reports…" msgstr "Vaše hlášení" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Nahrávání..." @@ -2021,23 +2038,22 @@ msgstr "Místní upozornění" msgid "Locate the problem on a map of the area" msgstr "Lokalizujte vaše hlášení v mapě" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2049,7 +2065,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAPA" @@ -2057,7 +2073,7 @@ msgstr "MAPA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2065,7 +2081,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Mapa" @@ -2077,11 +2093,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označte uživatele, jejichž chování chcete sledovat a označte je příznakem." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Zpráva" @@ -2101,24 +2117,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Chybějící jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2127,6 +2144,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Moderováno oddělením během jednoho pracovního dne" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2152,9 +2174,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Jméno" @@ -2167,6 +2189,12 @@ msgstr "Jméno" msgid "Name:" msgstr "Jméno:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Aktualizace je omezena na %s znaků její délky. Prosím, zkraťte ji" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2235,6 +2263,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2321,11 +2351,18 @@ msgstr "" msgid "Next" msgstr "Další" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Další" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2338,6 +2375,11 @@ msgstr "Další" msgid "No" msgstr "Ne" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Potvrdit účet" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2346,7 +2388,7 @@ msgstr "" msgid "No body" msgstr "Žádný subjekt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Není vybrán žádný úřad" @@ -2379,7 +2421,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Vráceno bez výsledku." @@ -2457,16 +2499,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "A nyní pro odeslání aktualizace…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2475,15 +2507,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2535,6 +2567,14 @@ msgstr "Specifikace systému Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2543,15 +2583,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2588,15 +2628,13 @@ msgstr "Nadřazený subjekt" msgid "Partial" msgstr "Částečně" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Heslo (volitelně)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Trvalý odkaz" @@ -2614,16 +2652,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonní číslo" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonní číslo (volitelně)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hlášení" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2634,12 +2678,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2653,7 +2699,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Fotografie" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2661,12 +2707,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2687,7 +2733,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Umísti špendlík na mapu" @@ -2707,7 +2753,7 @@ msgstr "Zkontrolujte prosím hesla a zkuste znovu" msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaše emailová adresa správná" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2717,15 +2763,15 @@ msgid "Please check your phone number is correct" msgstr "Zkontrolujte, zda je vaše emailová adresa správná" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Vyberte kategorii" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2747,12 +2793,12 @@ msgid "Please do not be abusive — abusing your council devalues the s 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "prosím zadejte zprávu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2761,8 +2807,8 @@ msgstr "prosím zadejte zprávu" msgid "Please enter a mobile number" msgstr "Prosím zadejte vaše telefonní číslo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2772,22 +2818,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Prosím zadejte heslo" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Prosím zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Prosím zadejte platný e-mail" @@ -2796,14 +2842,14 @@ msgstr "Prosím zadejte platný e-mail" msgid "Please enter a valid email address" msgstr "Prosím zadejte platnou emailovou adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Prosím zadejte vaše telefonní číslo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Prosím zadejte podrobnosti" @@ -2813,39 +2859,39 @@ msgstr "Prosím zadejte podrobnosti" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Prosím zadejte váš e-mail" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Zadejte vaše jméno" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Zadejte vaše jméno" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Prosím zadejte vaše telefonní číslo" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Prosím zadejte vaše příjmení" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Zadejte nadpis" @@ -2872,8 +2918,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Uveďte, zda chcete dostat další dotazník" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2885,7 +2931,7 @@ msgstr "Vezměte prosím na vědomí, že aktualizace nejsou odeslány na úřad msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Vezměte prosím na vědomí, že vaše zpráva ještě nebyla zaslána . Vyberte si kategorii a přidejte další informace níže, a pak odešlete." @@ -2899,12 +2945,12 @@ msgstr "" msgid "Please note:" msgstr "Vezměte prosím na vědomí:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2937,15 +2983,15 @@ msgstr "Vyberte typ upozornění, které chcete" msgid "Please state whether or not the problem has been fixed" msgstr "Uveďte, prosím, zda byl či nebyl problém vyřešen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2953,9 +2999,7 @@ msgstr "" msgid "Please write a message" msgstr "Napište zprávu" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Odeslat" @@ -2964,19 +3008,19 @@ msgstr "Odeslat" msgid "Postcode or street name and area" msgstr "Zadejte blízké poštovní směrovací číslo nebo název ulice či oblasti" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Nahlášeno anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Odesláno uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Odesláno uživatelem %s (%s) v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Odesláno uživatelem %s v %s" @@ -3011,14 +3055,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Neveřejné" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Hlášení" @@ -3041,7 +3081,7 @@ msgstr "Hlášení %s bylo odesláno na úřad %s" msgid "Problem breakdown by state" msgstr "Členění hlášení podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Hlášení bylo označeno za otevřené." @@ -3050,7 +3090,6 @@ msgid "Problem state change based on survey results" msgstr "Stav hlášení byl změněn na základě výsledků šetření" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Hlášení" @@ -3077,7 +3116,7 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Hlášení v okolí %.1fkm od tohoto místa" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3103,26 +3142,26 @@ msgstr "" msgid "Property address:" msgstr "Adresa nemovitosti:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Poskytněte aktuální informace" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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í." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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í." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3191,7 +3230,7 @@ msgstr "RSS kanál pro %s, v oblasti %s " msgid "RSS feed of nearby problems" msgstr "RSS kanál hlášení v okolí" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3216,7 +3255,7 @@ msgstr "RSS kanál aktualizací tohoto hlášení" msgid "Receive email when updates are left on this problem." msgstr "Dostávat e-mail, když je hlášení aktualizováno." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3263,9 +3302,9 @@ msgstr "Odstranit příznak" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3297,14 +3336,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Nahlásit problém" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3315,14 +3354,14 @@ msgstr "Nahlásit problém" msgid "Report abuse" msgstr "Nevhodný obsah" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Nahlásit problém" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3350,8 +3389,8 @@ msgstr "Hlášení, zobrazení a diskuse nad lokálními problémy" 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:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymně v %s" @@ -3360,8 +3399,8 @@ msgstr "Nahlášeno anonymně v %s" msgid "Reported before" msgstr "Hlásil(a) jsem již dříve" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, určeno pro %s" @@ -3370,31 +3409,31 @@ msgstr "Nahlášeno uživatelem %s, určeno pro %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymně v %s v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostřednictvím %s anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 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:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 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" @@ -3405,7 +3444,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3414,17 +3453,23 @@ msgstr "Hlášení problému" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Hlášení" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 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í" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hlášení" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Hlášení čekající na schválení" @@ -3446,7 +3491,7 @@ msgstr "" msgid "Reports published" msgstr "Publikovaná hlášení" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3508,20 +3553,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Správné místo?" @@ -3533,15 +3578,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Otočit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3552,7 +3597,7 @@ msgstr "Otočit doprava" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitní" @@ -3566,8 +3611,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3582,7 +3627,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3622,13 +3667,12 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3659,7 +3703,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3676,11 +3720,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "odesláno do %s o %s později" @@ -3713,9 +3757,9 @@ msgid "Share" msgstr "Sdílet" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3723,19 +3767,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3747,7 +3791,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Zobrazit moje jméno veřejně" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3761,17 +3805,17 @@ msgstr "Zobrazit stará" msgid "Show older reports" msgstr "Vyhledat hlášení" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Zobrazit značky" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3779,20 +3823,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Přihlásit se" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3801,6 +3845,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Přihlaste se nebo si vytvořte účet" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Zadejte heslo" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3843,15 +3892,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Nemůžeme bohužel nalézt tuto lokalitu." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3861,7 +3910,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3905,13 +3954,13 @@ msgstr "Počáteční datum:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Stav" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3931,15 +3980,14 @@ msgid "State:" msgstr "Stav:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Stav" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3969,7 +4017,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Podkategorie: %s" @@ -3978,21 +4026,22 @@ msgstr "Podkategorie: %s" msgid "Subdivision/Body" msgstr "Oddělení/Instituce" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Předmět" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Předmět:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Odeslat" @@ -4044,8 +4093,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4080,18 +4128,22 @@ msgstr "" msgid "Survey Results" msgstr "Výsledky průzkumu" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -4102,6 +4154,7 @@ msgstr "Pouze textová verze" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4135,7 +4188,7 @@ msgstr "Děkujeme za nahrání fotografie. Nyní je třeba lokalizovat Vaše hl 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 "Díky, rádi slyšíme, že to bylo vyřešeno! Můžeme se ještě zeptat, jestli jste někdy předtím hlásili úřadům problém?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím znovu." @@ -4149,7 +4202,6 @@ msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Omlouváme se, ale poštovní směrovací číslo nebylo rozpoznáno." @@ -4162,28 +4214,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Hlášení bude nyní opět odesláno." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Tento report nemůže být zobrazen na %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Toto hlášení bylo vyjmuto z FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Toto hlášení bylo vyjmuto z FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4329,7 +4381,7 @@ msgstr "" 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í" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Toto hlášení bylo vyjmuto z FixMyStreet." @@ -4349,7 +4401,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4366,15 +4418,19 @@ msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později." 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." @@ -4382,10 +4438,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 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." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4415,15 +4480,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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." @@ -4459,10 +4515,10 @@ msgstr "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě, 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Tato informace je vyžadována" @@ -4501,7 +4557,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Hlášení čeká na moderování operátorem." @@ -4517,7 +4573,7 @@ msgstr "Hlášení je aktuálně označené za vyřešené." msgid "This report is currently marked as open." msgstr "Hlášení je aktuálně označené za otevřené." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Hlášení je aktuálně označené za otevřené." @@ -4534,7 +4590,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Časová osa" @@ -4618,7 +4673,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4628,7 +4683,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Opakujte znovu" @@ -4664,7 +4719,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrzeno" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Neznámé" @@ -4672,18 +4727,18 @@ msgstr "Neznámé" msgid "Unknown alert type" msgstr "Neznámý typ upozornění" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Neznámá chyba" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Neznámé ID hlášení" @@ -4702,7 +4757,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Aktualizovat" @@ -4710,11 +4765,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Aktualizace níže byly přidána anonymně v %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Aktualizace níže byly přidána uživatelem %s v %s" @@ -4754,24 +4809,24 @@ msgstr "Aktualizovat status" msgid "Updated" msgstr "Aktualizováno" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Odesláno uživatelem %s (%s) v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Odesláno uživatelem %s v %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Aktualizováno!" @@ -4782,7 +4837,7 @@ msgstr "Aktualizováno!" msgid "Updates" msgstr "Aktualizace" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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" @@ -4837,28 +4892,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "E-mail přidán do seznamu zneužívání" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-mail je již v seznamu zneužívání" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledování" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Uživatel sledován" @@ -4884,10 +4939,8 @@ msgid "User:" msgstr "Uživatelé" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Uživatelé" @@ -4935,6 +4988,10 @@ msgstr "Zobrazení hlášení podle okrsků" msgid "View wards" msgstr "ostatní oblasti:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4966,7 +5023,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5028,7 +5085,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5056,17 +5113,15 @@ msgstr "Můžeme Vám za měsíc odeslat další dotazník, který Vám připome msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5080,11 +5135,11 @@ msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo." msgid "Yes" msgstr "Ano" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5092,11 +5147,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Můžete zobrazit hlášení na tomto webu." @@ -5114,7 +5169,7 @@ msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneuž msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Můžete kontaktovat technickou podporu %s" @@ -5138,11 +5193,11 @@ msgstr "Pomozte nám najít email na kontaktní osobu pro oblast %s %s saved to submit." msgstr "" @@ -5150,7 +5205,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Na tento dotazník jste již odpověděli. Máte-li dotazy, prosím spojte se s námi, nebo si můžete zobrazit hlášení.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5235,11 +5290,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Váš e-mail" @@ -5248,9 +5303,9 @@ msgstr "Váš e-mail" msgid "Your email address" msgstr "Vaše e-mailová adresa" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Vaše e-mailová adresa" @@ -5259,9 +5314,7 @@ msgstr "Vaše e-mailová adresa" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Vámi poskytnuté informace budou použity pouze v souladu se zásadami ochrany osobních údajů" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Vaše jméno a příjmení" @@ -5277,13 +5330,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Vaše heslo" @@ -5292,15 +5345,15 @@ msgstr "Vaše heslo" msgid "Your password has been changed" msgstr "Vaše heslo bylo změněno" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Vaše telefonní číslo:" @@ -5322,7 +5375,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Vaše heslo bylo změněno" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Vaše aktualizace" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5334,8 +5392,8 @@ msgstr "Vaše aktualizace" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5353,13 +5411,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5385,7 +5445,7 @@ msgstr "např. ‘%s’ nebo ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5424,6 +5484,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "označené za nespadající do kompetencí úřadu" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Přihlaste se nebo si vytvořte účet" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5460,12 +5529,12 @@ msgstr "odhlásit" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "místní úřad" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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ů" @@ -5482,11 +5551,11 @@ msgstr "tento typ lokálního problému" msgid "today" msgstr "dnes" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5502,12 +5571,12 @@ msgstr "uživatel je ze stejného úřadu jako hlášení - %d" msgid "user is problem owner" msgstr "uživatel je vlastníkem hlášení" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-mail je již v seznamu zneužívání" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "E-mail přidán do seznamu zneužívání" @@ -5724,8 +5793,35 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Zadejte heslo" +#~ msgid "No let me sign in by email" +#~ msgstr "Ne přihlásím se pomocí e-mailu" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Ne přihlásím se pomocí e-mailu" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Editace podrobností subjektu" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Ponechte mě přihlášeného na tomto počítači" + +#~ msgid "Now to submit your report…" +#~ msgstr "A teď stačí hlášení odeslat" + +#~ msgid "Now to submit your update…" +#~ msgstr "A nyní pro odeslání aktualizace…" + +#~ 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í." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo." #~ msgid "Password:" #~ msgstr "Heslo:" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index a54670ca49c..3e948672dca 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "a" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -157,7 +157,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(dewisol)" @@ -177,9 +177,9 @@ msgstr "(anfonwyd i'r ddau)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -209,7 +209,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -218,34 +218,24 @@ msgstr "" msgid "%s live problems" msgstr "%s o broblemau byw" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Nac oes, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Nac oes, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Nac oes, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Nac oes, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -254,12 +244,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Oes, mae gen i gyfrinair" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Adrodd problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -322,9 +315,9 @@ msgstr "Eich rhif ffôn" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -334,16 +327,15 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -351,7 +343,7 @@ msgstr "" msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -371,7 +363,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" @@ -439,34 +432,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Mae diweddariad wedi nodi'r broblem wedi ei thrwsio." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Dienw" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Dienw" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Dienw:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -503,7 +498,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -537,6 +532,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -549,12 +548,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Yn ôl" @@ -568,10 +567,8 @@ msgid "Ban user" msgstr "Ychwanegu defnyddiwr" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -608,7 +605,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -641,7 +637,7 @@ msgstr "Categori" msgid "Category and State" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -651,6 +647,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -705,7 +702,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -733,6 +730,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -745,7 +746,7 @@ msgstr "" msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -775,18 +776,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -800,8 +800,7 @@ msgstr "Cadarnhau" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -820,7 +819,7 @@ msgstr "" msgid "Confirmed" msgstr "Cadarnhawyd" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -831,16 +830,20 @@ msgstr "Cadarnhawyd:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Cysylltu â ni" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Cysylltu â'r tîm" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -850,12 +853,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Methu dod o hyd i'r lleoliad" @@ -891,6 +894,11 @@ msgstr "Crëwyd" msgid "Create a report" msgstr "Creu adroddiad" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Mewngofnodi neu greu cyfrif" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -900,18 +908,15 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -929,7 +934,7 @@ msgstr "Crëwyd" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -955,7 +960,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Ar hyn o bryd does dim cyrff." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -983,6 +988,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -992,7 +1001,7 @@ msgstr "" msgid "Delete" msgstr "Dilëwyd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1004,8 +1013,8 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1021,17 +1030,18 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Manylion" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1063,8 +1073,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1073,11 +1083,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1089,7 +1095,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1097,7 +1103,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1138,34 +1144,36 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Golygu manylion y corff" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Golygu manylion y corff" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Eich diweddariadau" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1198,20 +1206,20 @@ msgstr "Golygydd" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-bost" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Cyfrinair (dewisol)" @@ -1224,6 +1232,14 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1301,11 +1317,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Rhowch god post DU, neu enw stryd ac ardal" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Rhowch god post DU, neu enw stryd ac ardal" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1356,11 +1367,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1403,6 +1414,8 @@ msgstr "Data ychwanegol:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Data ychwanegol:" @@ -1425,6 +1438,11 @@ msgstr "Methodd anfon neges" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1502,17 +1520,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Eich cyfrinair" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1570,7 +1593,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1638,7 +1661,7 @@ msgstr "Cudd" msgid "Hide all reports and updates" msgstr "Rhestru'r holl broblemau a adroddwyd" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1661,11 +1684,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1690,7 +1713,7 @@ msgstr "Hafan" msgid "How to report a problem" msgstr "Sut i adrodd problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" @@ -1750,7 +1773,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1861,7 +1884,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1881,8 +1904,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1894,13 +1917,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "Mae ar y ffordd i'r cyngor y funud hon." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1940,6 +1956,7 @@ msgstr "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1966,7 +1983,7 @@ msgstr "Rhestru'r holl broblemau a adroddwyd" msgid "Loading reports…" msgstr "Eich adroddiadau" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Wrthi'n llwytho..." @@ -1992,23 +2009,22 @@ msgstr "Hysbysiadau lleol" msgid "Locate the problem on a map of the area" msgstr "Lleoli'r broblem ar fap o'r ardal" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2020,7 +2036,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAP" @@ -2028,7 +2044,7 @@ msgstr "MAP" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2036,7 +2052,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Map" @@ -2048,11 +2064,11 @@ msgstr "Nodi ei fod wedi'i anfon" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Neges" @@ -2072,24 +2088,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2098,6 +2115,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2123,9 +2145,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Enw" @@ -2138,6 +2160,11 @@ msgstr "Enw" msgid "Name:" msgstr "Enw:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2204,6 +2231,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2290,11 +2319,18 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Nesaf" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2307,6 +2343,11 @@ msgstr "Nesaf" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Dim cyngor" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2315,7 +2356,7 @@ msgstr "" msgid "No body" msgstr "Dim corff" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2348,7 +2389,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Dim canlyniadau" @@ -2420,16 +2461,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Nawr i gyflwyno eich diweddariad…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2438,15 +2469,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2498,6 +2529,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2506,15 +2545,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2551,15 +2590,13 @@ msgstr "Rhiant" msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Dolen barhaol" @@ -2577,16 +2614,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Rhif ffôn" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2597,12 +2639,14 @@ msgstr "" msgid "Phone:" msgstr "Ffôn:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2616,7 +2660,7 @@ msgstr "Ffôn:" msgid "Photo" msgstr "Llun" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2624,12 +2668,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2650,7 +2694,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2670,7 +2714,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2680,15 +2724,15 @@ msgid "Please check your phone number is correct" msgstr "Rhowch eich rhif ffôn" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2710,12 +2754,12 @@ 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2724,8 +2768,8 @@ msgstr "Rhowch neges" msgid "Please enter a mobile number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2735,22 +2779,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Rhowch gyfrinair" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" @@ -2759,14 +2803,14 @@ msgstr "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Rhowch eich rhif ffôn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Rhowch fanylion" @@ -2776,39 +2820,39 @@ msgstr "Rhowch fanylion" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Rhowch eich enw" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Rhowch eich rhif ffôn" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Rhowch eich cyfenw" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Rhowch eich teitl" @@ -2835,8 +2879,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2848,7 +2892,7 @@ msgstr "Noder na chaiff diweddariadau eu hanfon at y cyngor." msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2862,11 +2906,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2899,15 +2943,15 @@ msgstr "Dewiswch pa fath o hysbysiad hoffech chi ei gael" msgid "Please state whether or not the problem has been fixed" msgstr "Dywedwch a gafodd y broblem ei thrwsio" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2915,9 +2959,7 @@ msgstr "" msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2926,19 +2968,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postiwyd gan %s (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" @@ -2973,14 +3015,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Preifat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3003,7 +3041,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -3012,7 +3050,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -3039,7 +3076,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3065,26 +3102,26 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Darparu diweddariad" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3153,7 +3190,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3178,7 +3215,7 @@ msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3223,9 +3260,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3257,14 +3294,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Adrodd problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3275,14 +3312,14 @@ msgstr "Adrodd problem" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Adrodd problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3310,8 +3347,8 @@ msgstr "Adrodd, gweld, neu drafod problemau lleol" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" @@ -3320,8 +3357,8 @@ msgstr "Adroddwyd yn ddienw am %s" msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3330,31 +3367,31 @@ msgstr "Adroddwyd gan %s am %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 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:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -3365,7 +3402,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3374,17 +3411,22 @@ msgstr "Adrodd problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3406,7 +3448,7 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3468,20 +3510,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Y lle cywir?" @@ -3493,15 +3535,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3512,7 +3554,7 @@ msgstr "Cylchdroi i'r dde" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3526,8 +3568,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3542,7 +3584,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3582,13 +3624,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3618,7 +3659,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3635,11 +3676,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3672,9 +3713,9 @@ msgid "Share" msgstr "Rhannu" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3682,19 +3723,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3706,7 +3747,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3720,17 +3761,17 @@ msgstr "Dangos yr hen rai" msgid "Show older reports" msgstr "Chwilio am adroddiadau" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3738,20 +3779,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Mewngofnodi" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3760,6 +3801,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Mewngofnodi neu greu cyfrif" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Rhowch gyfrinair" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3802,15 +3848,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3820,7 +3866,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3864,13 +3910,13 @@ msgstr "Dyddiad cychwyn:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Cyflwr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3890,15 +3936,14 @@ msgid "State:" msgstr "Cyflwr:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3928,7 +3973,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Is-gategori: %s" @@ -3937,21 +3982,22 @@ msgstr "Is-gategori: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Pwnc" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Pwnc:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Cyflwyno" @@ -4003,8 +4049,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4039,18 +4084,22 @@ msgstr "" msgid "Survey Results" msgstr "Canlyniadau arolwg" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testun" @@ -4061,6 +4110,7 @@ msgstr "Fersiwn testun yn unig" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4094,7 +4144,7 @@ msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem 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 "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych wedi adrodd problem i gyngor o'r blaen?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." @@ -4108,7 +4158,6 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4121,28 +4170,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4282,7 +4331,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." @@ -4300,7 +4349,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4317,15 +4366,19 @@ msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." @@ -4333,10 +4386,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4361,15 +4423,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4400,10 +4453,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4442,7 +4495,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4458,7 +4511,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Rhestru'r holl broblemau a adroddwyd" @@ -4475,7 +4528,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4559,7 +4611,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4569,7 +4621,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Ceisio eto" @@ -4605,7 +4657,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Heb ei gadarnhau" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Anhysbys" @@ -4613,18 +4665,18 @@ msgstr "Anhysbys" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Gwall anhysbys" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4643,7 +4695,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4651,11 +4703,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4695,24 +4747,24 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postiwyd gan %s (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Diweddarwyd!" @@ -4723,7 +4775,7 @@ msgstr "Diweddarwyd!" msgid "Updates" msgstr "Diweddariadau" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4778,28 +4830,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4824,10 +4876,8 @@ msgid "User:" msgstr "Defnyddwyr" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Defnyddwyr" @@ -4875,6 +4925,10 @@ msgstr "Gweld adroddiadau yn ôl ward" msgid "View wards" msgstr "ardaloedd eraill:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4906,7 +4960,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4967,7 +5021,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4995,17 +5049,15 @@ msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Lleoliad anghywir? Cliciwch ar y map eto." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5019,11 +5071,11 @@ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5031,11 +5083,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Gallwch weld y broblem ar y wefan hon." @@ -5053,7 +5105,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy %s" @@ -5075,11 +5127,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5087,7 +5139,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5169,11 +5221,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Eich e-bost" @@ -5182,9 +5234,9 @@ msgstr "Eich e-bost" msgid "Your email address" msgstr "Eich cyfeiriad e-bost" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Eich cyfeiriad e-bost" @@ -5193,9 +5245,7 @@ msgstr "Eich cyfeiriad e-bost" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Eich enw" @@ -5211,13 +5261,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Eich cyfrinair" @@ -5226,15 +5276,15 @@ msgstr "Eich cyfrinair" msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -5256,7 +5306,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Newidiwyd eich cyfrinair" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Eich diweddariadau" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5268,8 +5323,8 @@ msgstr "Eich diweddariadau" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5287,13 +5342,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5319,7 +5376,7 @@ msgstr "e.e. '%s' neu '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5357,6 +5414,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Mewngofnodi neu greu cyfrif" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5393,12 +5459,12 @@ msgstr "allgofnodi" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "y cyngor lleol" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5415,11 +5481,11 @@ msgstr "" msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5435,12 +5501,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-bost eisoes yn y rhestr camddefnydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" @@ -5657,8 +5723,35 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Rhowch gyfrinair" +#~ msgid "No let me sign in by email" +#~ msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Golygu manylion y corff" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Rhowch god post DU, neu enw stryd ac ardal" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Cadw fi wedi mewngofnodi ar y cyfrifiadur hwn" + +#~ msgid "Now to submit your report…" +#~ msgstr "Nawr i gyflwyno eich adroddiad…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Nawr i gyflwyno eich diweddariad…" + +#~ 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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Lleoliad anghywir? Cliciwch ar y map eto." #~ msgid "Password:" #~ msgstr "Cyfrinair:" @@ -5711,9 +5804,6 @@ msgstr[3] "" #~ msgid "Invalid start date" #~ msgstr "Dyddiad cychwyn annilys" -#~ msgid "No council" -#~ msgstr "Dim cyngor" - #~ msgid "Year" #~ msgstr "Blwyddyn" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index d5e48ea6e40..e0ca839f05b 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(valgfrit)" @@ -178,9 +178,9 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-strøm for problemer indenfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" @@ -210,7 +210,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -219,34 +219,24 @@ msgstr "" msgid "%s live problems" msgstr "%s aktive problemer" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Nej Lad mig bekræfte min rapport med e-post" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Nej Lad mig bekræfte min rapport med e-post" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Nej Lad mig bekræfte min opdatering med e-post" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Nej Lad mig bekræfte min opdatering med e-post" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Nej, lad mig logge ind med e-post:" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Nej, lad mig logge ind med e-post:" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -255,12 +245,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jeg har en adgangskode" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Rapportér et problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -323,9 +316,9 @@ msgstr "Dit telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -335,16 +328,15 @@ msgstr "" msgid "Add user" msgstr "Tilføj bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -352,7 +344,7 @@ msgstr "" msgid "Added %s" msgstr "Tilføjede %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -372,7 +364,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Send mig varsel ved fremtidige opdateringer" @@ -440,34 +433,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "En opdatering markerede dette problem som ordnet." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonym" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -504,7 +499,7 @@ msgstr "Tildel til ekstern myndighed:" msgid "Assign to subdivision:" msgstr "Tildelt underafdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -538,6 +533,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -550,12 +549,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Afventer moderation" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Tilbage" @@ -569,10 +568,8 @@ msgid "Ban user" msgstr "Markér bruger" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -609,7 +606,6 @@ msgid "Can't see the map? Skip this step" msgstr "Hvis du ikke kan se kortet, så overspring dette trin." #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -642,7 +638,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -652,6 +648,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -711,7 +708,7 @@ msgstr "Vælg et kategorinavn som giver mening for indbyggerne msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -739,6 +736,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -751,7 +752,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Lukket af myndigheden" @@ -781,18 +782,17 @@ msgid "Cobrand:" msgstr "Mærkevaresamarbejde:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" @@ -806,8 +806,7 @@ msgstr "Bekræft" msgid "Confirm account" msgstr "Bekræft konto" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -826,7 +825,7 @@ msgstr "Bekræftelse" msgid "Confirmed" msgstr "Bekræftet" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -837,16 +836,20 @@ msgstr "Bekræftet:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontakt os" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakt projektgruppen" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -856,12 +859,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kunne ikke finde bruger" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Kunne ikke finde position" @@ -897,6 +900,11 @@ msgstr "Oprettet" msgid "Create a report" msgstr "Lav en rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Log ind eller opret en konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -906,18 +914,15 @@ msgstr "Lav kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -935,7 +940,7 @@ msgstr "Oprettet" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -961,7 +966,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "I øjeblikket er der ikke lavet nogen instanser." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -989,6 +994,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -998,7 +1007,7 @@ msgstr "" msgid "Delete" msgstr "Slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1010,8 +1019,8 @@ msgstr "" msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1027,17 +1036,18 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1069,8 +1079,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1079,11 +1089,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1095,7 +1101,7 @@ msgstr "" msgid "Don’t know" msgstr "Véd ikke" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Kan du ikke lide skemaer?" @@ -1103,7 +1109,7 @@ msgstr "Kan du ikke lide skemaer?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1147,34 +1153,36 @@ msgstr "Redigér" msgid "Edit body details" msgstr "Redigér detaljer for myndighed" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Redigér detaljer for myndighed" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Redigér detaljer for myndighed" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Dine opdateringer" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1207,20 +1215,20 @@ msgstr "Opdateret af" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Adgangskode (valgfrit)" @@ -1233,6 +1241,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1320,11 +1336,6 @@ msgstr "Indtast et vejnavn i Zürich" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1375,11 +1386,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1422,6 +1433,8 @@ msgstr "Ekstra data:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Ekstra data:" @@ -1444,6 +1457,11 @@ msgstr "Kunne ikke sende besked" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1521,17 +1539,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mere information, se Hvordan FixMyStreet bruger Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Din adgangskode" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Glemt din adgangskode?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1589,7 +1612,7 @@ msgstr "Søg" msgid "Going to send questionnaire?" msgstr "Skal der sendes spørgeskema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1657,7 +1680,7 @@ msgstr "Skjul" msgid "Hide all reports and updates" msgstr "Markerede rapporter og brugere" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1680,11 +1703,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Skjul nåle" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1709,7 +1732,7 @@ msgstr "Hjem" msgid "How to report a problem" msgstr "Hvordan rapporteres et problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Hvordan indsendes rapporter som er løst" @@ -1769,7 +1792,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Hvis to eller flere instanser er lokaliseret på samme sted, kombinerer FixMinVej identiske kategorier i en enkelt opføring i menuen. Kontrollér at du bruger samme kategorinavn for instanserne, hvis det er det du ønsker." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1890,7 +1913,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1910,8 +1933,8 @@ msgstr "Ugyldig agency_responsible-værdi %s" msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1923,13 +1946,6 @@ msgstr "Det er ofte hurtigst at tjekke vores FAQ og se om sva msgid "It’s on its way to the council right now." msgstr "Den er på vej til myndigheden lige nu." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Husk min indlogning på denne datamaskine" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1969,6 +1985,7 @@ msgstr "Sidste opdatering:" msgid "Last update:" msgstr "Sidste opdatering:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1995,7 +2012,7 @@ msgstr "List alle rapporterede problemer" msgid "Loading reports…" msgstr "Dine opdateringer" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Indlæser..." @@ -2021,23 +2038,22 @@ msgstr "Lokale varsler" msgid "Locate the problem on a map of the area" msgstr "Lokalisér problemet på kortet over området" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2049,7 +2065,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "KORT" @@ -2057,7 +2073,7 @@ msgstr "KORT" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2065,7 +2081,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Kort" @@ -2077,11 +2093,11 @@ msgstr "Markér som afsendt" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Markér brugere hvis adfærd du ønsker at have tjek på som markeret." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Besked" @@ -2101,24 +2117,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2127,6 +2144,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Modereret af afdeling inden for en arbejdsdag" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2152,9 +2174,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Navn" @@ -2167,6 +2189,12 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2235,6 +2263,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2321,11 +2351,18 @@ msgstr "" msgid "Next" msgstr "Næste" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Næste" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2338,6 +2375,11 @@ msgstr "Næste" msgid "No" msgstr "Nej" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Bekræft konto" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2346,7 +2388,7 @@ msgstr "" msgid "No body" msgstr "Ingen myndighed" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ingen myndighed er valgt" @@ -2379,7 +2421,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ingen resultater returneret" @@ -2458,16 +2500,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "På tide at registrere din opdatering…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2476,15 +2508,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2536,6 +2568,14 @@ msgstr "Open311-specifikation" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2544,15 +2584,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2589,15 +2629,13 @@ msgstr "Forælder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2615,16 +2653,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfrit)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2635,12 +2679,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2654,7 +2700,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Billed" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2662,12 +2708,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2688,7 +2734,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Placér tegnestiften på kortet" @@ -2708,7 +2754,7 @@ msgstr "Venligst kontrollér adgangskoderne og prøv igen" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2718,15 +2764,15 @@ msgid "Please check your phone number is correct" msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Vælg en kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2748,12 +2794,12 @@ msgid "Please do not be abusive — abusing your council devalues the s 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Venligst indlæg en besked" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2762,8 +2808,8 @@ msgstr "Venligst indlæg en besked" msgid "Please enter a mobile number" msgstr "Angiv dit telefonnummer." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2773,22 +2819,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Indtast en adgangskode" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Tilføj en gyldig e-post" @@ -2797,14 +2843,14 @@ msgstr "Tilføj en gyldig e-post" msgid "Please enter a valid email address" msgstr "Angiv din e-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Angiv dit telefonnummer." -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" @@ -2814,39 +2860,39 @@ msgstr "Angiv oplysninger om problemet" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Angiv din e-post" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Venligst angiv dit fornavn" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Angiv dit navn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Angiv dit telefonnummer." -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Venligst angiv dit mellemnavn" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Venligst angiv din titel" @@ -2875,8 +2921,8 @@ 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" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2888,7 +2934,7 @@ msgstr "Vær opmærksom på at opdateringer ikke bliver videresendt til myndighe msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Bemærk at din rapport endnu ikke er sendt%s (%s) at %s" msgstr "Sendt ind af %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Sendt ind af %s %s" @@ -3014,14 +3058,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3044,7 +3084,7 @@ msgstr "Problem %s sendt til myndighed %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem markeret som åbent." @@ -3053,7 +3093,6 @@ msgid "Problem state change based on survey results" msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -3080,7 +3119,7 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej" msgid "Problems within %.1fkm of %s" msgstr "Problemer indenfor %.1fkm fra denne positionen" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3106,26 +3145,26 @@ msgstr "" msgid "Property address:" msgstr "Ejendomsadresse:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidrag med en opdatering" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3194,7 +3233,7 @@ msgstr "RSS-strøm af %s, indenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheden" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3219,7 +3258,7 @@ msgstr "RSS-strøm med opdateringer for dette problem" msgid "Receive email when updates are left on this problem." msgstr "Modtag e-post når der er opdateringer på dette problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3266,9 +3305,9 @@ msgstr "Fjern markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3300,14 +3339,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapportér et problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3318,14 +3357,14 @@ msgstr "Rapportér et problem" msgid "Report abuse" msgstr "Rapportér misbrug" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Rapportér et problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3353,8 +3392,8 @@ msgstr "Rapportér, find eller diskutér lokale problemer" msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" @@ -3363,8 +3402,8 @@ msgstr "Rapporteret anonymt %s" msgid "Reported before" msgstr "Rapporteret tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" @@ -3373,31 +3412,31 @@ msgstr "Publiceret af %s %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporteret af %s i kategorien %s af %s %s" @@ -3408,7 +3447,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3417,17 +3456,23 @@ msgstr "Rapporterer et problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Rapporter som venter på godkendelse" @@ -3449,7 +3494,7 @@ msgstr "" msgid "Reports published" msgstr "Publicerede rapporter" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3511,20 +3556,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Rigtig sted?" @@ -3536,15 +3581,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3555,7 +3600,7 @@ msgstr "Rotér til højre" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" @@ -3569,8 +3614,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3585,7 +3630,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3625,13 +3670,12 @@ msgstr "Søgningen fandt ingen brugere." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3662,7 +3706,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3679,11 +3723,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3716,9 +3760,9 @@ msgid "Share" msgstr "Del" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3726,19 +3770,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3750,7 +3794,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis mit navn offentligt" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3764,17 +3808,17 @@ msgstr "Vis gamle" msgid "Show older reports" msgstr "Søg i rapporter" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Vis nåle" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3782,20 +3826,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Log ind" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3804,6 +3848,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Log ind eller opret en konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Indtast en ny adgangskode" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3849,15 +3898,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Beklager, men vi kunne ikke finde dette sted." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3867,7 +3916,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3911,13 +3960,13 @@ msgstr "Start-dato:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3937,15 +3986,14 @@ msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3975,7 +4023,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Underkategori: %s" @@ -3984,21 +4032,22 @@ msgstr "Underkategori: %s" msgid "Subdivision/Body" msgstr "Underafdeling/myndighed" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send ind" @@ -4050,8 +4099,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4086,18 +4134,22 @@ msgstr "" msgid "Survey Results" msgstr "Resultater fra spørgeundersøgelsen" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4108,6 +4160,7 @@ msgstr "Tekst-version" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4141,7 +4194,7 @@ msgstr "Tak for at du har lagt dit billede op. Vi skal nu placere dit problem, 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 "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig om du har rapporteret et problem til en myndighed tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv igen." @@ -4155,7 +4208,6 @@ msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen. #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Det postnummer blev ikke genkendt, beklager." @@ -4168,28 +4220,28 @@ msgstr "Det problem er blevet markeret som sendt." msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Denne rapport kan ikke vises på %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Den rapport er blevet fjernet fra FixMinVej." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Den rapport er blevet fjernet fra FixMinVej." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4343,7 +4395,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Den rapport er blevet fjernet fra FixMinVej." @@ -4363,7 +4415,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Der er ingen rapporter at vise." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4380,15 +4432,19 @@ msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 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." @@ -4396,10 +4452,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Der var problemer med din opdatering. Venligst se nedenfor." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4428,15 +4493,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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." @@ -4472,10 +4528,10 @@ msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet fo 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne information er påkrævet" @@ -4514,7 +4570,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapport afventer moderation" @@ -4530,7 +4586,7 @@ msgstr "Denne rapport er for tiden markeret som fikset." msgid "This report is currently marked as open." msgstr "Denne rapport er for tiden markeret som åben." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Denne rapport er for tiden markeret som åben." @@ -4547,7 +4603,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4631,7 +4686,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4641,7 +4696,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Prøv igen" @@ -4677,7 +4732,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ubekræftet" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Ukendt" @@ -4685,18 +4740,18 @@ msgstr "Ukendt" msgid "Unknown alert type" msgstr "Ukendt varsel-type" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Ukendt fejl" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Ukendt problem-Id" @@ -4715,7 +4770,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Opdatering" @@ -4723,11 +4778,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Opdateringen nedenfor lagt ind anonymt %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Opdateringen nedenfor tilføjet af %s %s" @@ -4767,24 +4822,24 @@ msgstr "Opdatér tilstanden" msgid "Updated" msgstr "Opdateret" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Sendt ind af %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Sendt ind af %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Opdateret!" @@ -4795,7 +4850,7 @@ msgstr "Opdateret!" msgid "Updates" msgstr "Opdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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." @@ -4850,28 +4905,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Epost lagt til misbrugsliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Epost allerede i misbrugslisten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Bruger markeret" @@ -4897,10 +4952,8 @@ msgid "User:" msgstr "Brugere" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brugere" @@ -4948,6 +5001,10 @@ msgstr "Se rapport per bydel" msgid "View wards" msgstr "andre områder:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4979,7 +5036,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5041,7 +5098,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5069,17 +5126,15 @@ msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Forkert sted? Bare klik igen på kortet." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5093,11 +5148,11 @@ msgstr "Forkert sted? Bare klik igen på kortet." msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5105,11 +5160,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Du kan læse om problemet på denne side." @@ -5127,7 +5182,7 @@ msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket auto msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Du kan kontakte teknisk support via %s" @@ -5151,11 +5206,11 @@ msgstr "Du kan hjælpe os ved at finde en kontakt-e-post for lokale problemer i msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal være aktiv på dette netsted." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Du afviste; venligst udfyld boksen ovenfor" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5163,7 +5218,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Du har allerede besvaret dette spørgeskema. Hvis du har spørgsmål, venligst tag kontakt, eller se på dit problem.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5247,11 +5302,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" @@ -5260,9 +5315,9 @@ msgstr "Din e-post" msgid "Your email address" msgstr "Din e-postadresse" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Din e-postadresse" @@ -5271,9 +5326,7 @@ msgstr "Din e-postadresse" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Vi vil kun bruge personlig information om dig i henhold til vores privatlivsregler." -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Dit navn" @@ -5289,13 +5342,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Din adgangskode" @@ -5304,15 +5357,15 @@ msgstr "Din adgangskode" msgid "Your password has been changed" msgstr "Din adgangskode er blevet ændret" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Dit telefonnummer" @@ -5334,7 +5387,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Din adgangskode er blevet ændret" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Dine opdateringer" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5346,8 +5404,8 @@ msgstr "Dine opdateringer" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5365,13 +5423,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5397,7 +5457,7 @@ msgstr "for eksempel '%s' eller '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5436,6 +5496,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "markeret som ikke myndighedens ansvar" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Log ind eller opret en konto" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5472,12 +5541,12 @@ msgstr "log ud" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "den lokale myndighed" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5494,11 +5563,11 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5514,12 +5583,12 @@ msgstr "bruger er fra samme myndighed som problemet - %d" msgid "user is problem owner" msgstr "bruger er ejer af problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Epost allerede i misbrugslisten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Epost lagt til misbrugsliste" @@ -5690,8 +5759,35 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Indtast en ny adgangskode" +#~ msgid "No let me sign in by email" +#~ msgstr "Nej, lad mig logge ind med e-post:" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Nej, lad mig logge ind med e-post:" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Redigér detaljer for myndighed" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Husk min indlogning på denne datamaskine" + +#~ msgid "Now to submit your report…" +#~ msgstr "På tide at sende din rapport…" + +#~ msgid "Now to submit your update…" +#~ msgstr "På tide at registrere din opdatering…" + +#~ 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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Forkert sted? Bare klik igen på kortet." #~ msgid "Password:" #~ msgstr "Adgangskode:" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index a2a76efd6ff..36d709384db 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "und" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(optional)" @@ -174,9 +174,9 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" @@ -206,7 +206,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s Meldungen %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -215,34 +215,24 @@ msgstr "" msgid "%s live problems" msgstr "%s Meldungen Total" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Meldung per E-Mail bestätigen" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Meldung per E-Mail bestätigen" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Meldung per E-Mail bestätigen" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Neu Registrieren" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Neu Registrieren" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -251,12 +241,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Passwort" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Eine Meldung erfassen" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -319,9 +312,9 @@ msgstr "Ihre Telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -331,16 +324,15 @@ msgstr "" msgid "Add user" msgstr "User hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Füge neue Kategorie hinzu" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Vorlagen für %s" @@ -348,7 +340,7 @@ msgstr "Vorlagen für %s" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -368,7 +360,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -436,34 +429,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonym" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "User hinzufügen" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -500,7 +495,7 @@ msgstr "Nachricht an zuständige Stelle" msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "User an Gegenden zuweisen" @@ -534,6 +529,10 @@ msgstr "Rückmeldung an User" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -546,12 +545,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Verhindern Sie persönliche Informationen wie Kfz-Kennzeichen oder Personen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Zurück" @@ -565,10 +564,8 @@ msgid "Ban user" msgstr "User hinzufügen" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -605,7 +602,6 @@ msgid "Can't see the map? Skip this step" msgstr "Karte nicht sichtbar? Überspringen Sie diesen Schritt" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -638,7 +634,7 @@ msgstr "Kategorie" msgid "Category and State" msgstr "Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategorie von ‘%s’ nach ‘%s’ geändert" @@ -648,6 +644,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -702,7 +699,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -731,6 +728,10 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." msgid "Click the link in that email to sign in." msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -743,7 +744,7 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -773,18 +774,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -798,8 +798,7 @@ msgstr "Bestätigen" msgid "Confirm account" msgstr "Account bestätigen" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -818,7 +817,7 @@ msgstr "Bestätigung" msgid "Confirmed" msgstr "Bestätigt" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -829,16 +828,20 @@ msgstr "Bestätigt:" msgid "Contact %s" msgstr "%s kontaktieren" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -848,12 +851,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -889,6 +892,11 @@ msgstr "Erstellt" msgid "Create a report" msgstr "Erfasse eine Meldung" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Erfasse eine Meldung" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -898,18 +906,15 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "Priorität erstellen" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -927,7 +932,7 @@ msgstr "Erstellt" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -953,7 +958,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Bisher wurden noch keine Organisationseinheiten erfasst." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kunde nicht kontaktierbar" @@ -982,6 +987,10 @@ msgstr "" msgid "Default priority" msgstr "Priorität erstellen" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -991,7 +1000,7 @@ msgstr "" msgid "Delete" msgstr "Gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1003,8 +1012,8 @@ msgstr "Vorlage löschen" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1020,17 +1029,18 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1062,8 +1072,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1072,11 +1082,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Haben Sie ein %s Passwort?" @@ -1088,7 +1094,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1096,7 +1102,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Fotos hierhin ziehen oder hochladen" @@ -1137,33 +1143,36 @@ msgstr "Anpassen" msgid "Edit body details" msgstr "Details editieren" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "User-Details editieren" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Kategorie editieren" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Meldungsdetails anpassen" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Priorität editieren" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Meldungen editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Kategorie editieren" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1196,20 +1205,20 @@ msgstr "" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Ihre E-Mail Adresse" @@ -1222,6 +1231,15 @@ msgstr "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1298,11 +1316,6 @@ msgstr "Ungefähre Adresse des Schadens" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Geben Sie eine Adresse an" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1353,11 +1366,11 @@ msgstr "Bestehende Kategorie" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1402,6 +1415,8 @@ msgstr "Zusätzliche Details" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1424,6 +1439,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1501,17 +1521,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ihr Passwort" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Ihr Passwort" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "An externe Stelle weitergeleitet" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Wunsch an externe Stelle weitergeleitet" @@ -1569,7 +1594,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1635,7 +1660,7 @@ msgstr "Unsichtbar" msgid "Hide all reports and updates" msgstr "Liste aller Meldungen" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1658,11 +1683,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1687,7 +1712,7 @@ msgstr "" msgid "How to report a problem" msgstr "Erfassen Sie eine neue Meldung:" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Anleitung" @@ -1747,7 +1772,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1858,7 +1883,7 @@ msgstr "" msgid "Inspection required" msgstr "Kontrolle notwendig" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1878,8 +1903,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1891,13 +1916,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Angemeldet bleiben" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1937,6 +1955,7 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Bearbeitung" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1963,7 +1982,7 @@ msgstr "Liste aller Meldungen" msgid "Loading reports…" msgstr "Meldungen editieren" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1989,23 +2008,22 @@ msgstr "RSS" msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Schaden auf der Karte" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2017,7 +2035,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -2025,7 +2043,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2033,7 +2051,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2045,11 +2063,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Nachricht" @@ -2069,24 +2087,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Meldungsdetails anpassen" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Meldung anpassen" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2095,6 +2114,12 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Innerhalb eines Arbeitstages moderiert" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Meldung anpassen" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2120,9 +2145,9 @@ msgstr "Am meisten kommentiert" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Name" @@ -2135,6 +2160,11 @@ msgstr "Name" msgid "Name:" msgstr "Name:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Zu dieser Meldung zoomen" @@ -2203,6 +2233,8 @@ msgid "New note to DM:" msgstr "Neue Nachricht an die Kommunikation" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Neues Passwort" @@ -2289,11 +2321,18 @@ msgstr "Neueste" msgid "Next" msgstr "Weiter" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Weiter" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2306,6 +2345,11 @@ msgstr "Weiter" msgid "No" msgstr "Nein" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Ihr Account" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2314,7 +2358,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2347,7 +2391,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2419,16 +2463,6 @@ msgstr "Nachrichten an die Kommunikationstelle" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2437,15 +2471,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2498,6 +2532,14 @@ msgstr "" msgid "Options" msgstr "optional" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2506,15 +2548,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2550,15 +2592,13 @@ msgstr "Gehört zu" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Passwort" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2577,16 +2617,21 @@ msgid "Phone Reporter:" msgstr "Gemeldet" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2598,12 +2643,14 @@ msgstr "Gemeldet" msgid "Phone:" msgstr "Telefonnummer:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2617,7 +2664,7 @@ msgstr "Telefonnummer:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto wird benötigt" @@ -2625,12 +2672,12 @@ msgstr "Foto wird benötigt" msgid "Photo required" msgstr "Foto benötigt" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2651,7 +2698,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" @@ -2671,7 +2718,7 @@ msgstr "" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,15 +2728,15 @@ msgid "Please check your phone number is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2711,12 +2758,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,8 +2772,8 @@ msgstr "" msgid "Please enter a mobile number" msgstr "Obligatorisches Feld" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2736,22 +2783,22 @@ msgstr "Obligatorisches Feld" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Obligatorisches Feld" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" @@ -2760,14 +2807,14 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Obligatorisches Feld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" @@ -2777,39 +2824,39 @@ msgstr "Bitte geben Sie einige Details an" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Obligatorisches Feld" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren Namen an" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" @@ -2836,8 +2883,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2849,7 +2896,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2863,11 +2910,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2900,15 +2947,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2916,9 +2963,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2927,19 +2972,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Ungefähre Adresse des Schadens" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2974,14 +3019,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Meldung" @@ -3004,7 +3045,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -3013,7 +3054,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -3040,7 +3080,7 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of %s" msgstr "Meldungen innerhalb %s, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3066,26 +3106,25 @@ msgstr "Meldungen innerhalb %s, %s" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Meldung aktualisieren als" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3154,7 +3193,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3179,7 +3218,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3224,9 +3263,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3258,14 +3297,14 @@ msgid "Report ID:" msgstr "Meldungs-ID" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3276,14 +3315,14 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Eine Meldung erfassen" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Melden als" @@ -3311,8 +3350,8 @@ msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -3321,8 +3360,8 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3331,31 +3370,31 @@ msgstr "Gemeldet von %s um %s" msgid "Reported by:" msgstr "Gemeldet von" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3366,7 +3405,7 @@ msgstr "Gemeldet" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3375,17 +3414,22 @@ msgstr "Ihre Meldung" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Rückmeldung ausstehend" @@ -3407,7 +3451,7 @@ msgstr "" msgid "Reports published" msgstr "Beantwortet" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3469,20 +3513,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Vorlagen für %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Richtiger Ort?" @@ -3494,15 +3538,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3513,7 +3557,7 @@ msgstr "Rechts drehen" 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:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3527,8 +3571,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3543,7 +3587,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3583,13 +3627,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3619,7 +3662,7 @@ msgstr "" msgid "Select:" msgstr "Auswählen" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3636,11 +3679,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Meldung zurückgewiesen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3673,9 +3716,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3683,19 +3726,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3707,7 +3750,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3720,17 +3763,17 @@ msgstr "" msgid "Show older reports" msgstr "Meldungen suchen" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3738,20 +3781,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Anmelden" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3760,6 +3803,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Ihr Passwort" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3803,15 +3851,15 @@ msgstr "Entschuldigung, dieser Link ist ungültig" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Diese Adresse wurde nicht gefunden." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3821,7 +3869,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "Diese Adresse wurde nicht gefunden." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals." @@ -3864,13 +3912,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3890,15 +3938,14 @@ msgid "State:" msgstr "Status" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Status" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3927,7 +3974,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Kategorie" @@ -3936,21 +3983,22 @@ msgstr "Kategorie" msgid "Subdivision/Body" msgstr "FB/Externe" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Titel" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Abschicken" @@ -4000,8 +4048,7 @@ msgid "Summarise your changes" msgstr "Fassen Sie Ihre Änderungen zusammen" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4036,18 +4083,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Vorlage «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Vorlagen" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4058,6 +4109,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4091,7 +4143,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4105,7 +4157,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4118,28 +4169,28 @@ msgstr "Die Meldung wurde als gesendet markiert." msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4279,7 +4330,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." @@ -4297,7 +4348,7 @@ msgstr "Namen müssen nicht eindeutig sein." msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4314,15 +4365,18 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4330,10 +4384,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4359,15 +4422,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4398,10 +4452,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -4440,7 +4494,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -4456,7 +4510,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Liste aller Meldungen" @@ -4473,7 +4527,6 @@ msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4557,7 +4610,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4567,7 +4620,7 @@ msgstr "Vertrauenswürdig" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Erneut versuchen" @@ -4603,7 +4656,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Unbekannt" @@ -4611,18 +4664,18 @@ msgstr "Unbekannt" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Unbekannter Fehler" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4641,7 +4694,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Speichern" @@ -4649,11 +4702,11 @@ msgstr "Speichern" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4693,23 +4746,23 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "%s Meldungen Total" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Aktualisiert!" @@ -4720,7 +4773,7 @@ msgstr "Aktualisiert!" msgid "Updates" msgstr "Antwort" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4775,26 +4828,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4818,10 +4871,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4868,6 +4919,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4898,7 +4953,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4959,7 +5014,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4987,17 +5042,15 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5011,11 +5064,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5023,11 +5076,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Danke! Sie können Ihre aktualisierte Meldung auf der Webseite anschauen." @@ -5045,7 +5098,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5067,11 +5120,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5079,7 +5132,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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)." @@ -5161,11 +5214,11 @@ msgid "Your account" msgstr "Ihr Account" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-Mail Adresse" @@ -5174,9 +5227,9 @@ msgstr "E-Mail Adresse" msgid "Your email address" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Ihre E-Mail Adresse" @@ -5185,9 +5238,7 @@ msgstr "Ihre E-Mail Adresse" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer Datenschutzrichtlinien." -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ihr Name" @@ -5203,13 +5254,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ihr Passwort" @@ -5218,15 +5269,15 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -5248,7 +5299,12 @@ msgstr "Ihre Favoriten" msgid "Your token has been generated" msgstr "Ihr Passwort wurde geändert" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Ihr Name" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5260,8 +5316,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Sie selbst" @@ -5279,13 +5335,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5311,7 +5369,7 @@ msgstr "z.B. ‘%s’ oder ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5349,6 +5407,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5385,12 +5451,12 @@ msgstr "ausloggen" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5407,11 +5473,11 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5427,11 +5493,11 @@ msgstr "" msgid "user is problem owner" msgstr "Der User ist der Eigner der Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5601,8 +5667,22 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Ihr Passwort" +#~ msgid "No let me sign in by email" +#~ msgstr "Neu Registrieren" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Neu Registrieren" + +#~ msgid "Edit other users' details" +#~ msgstr "User-Details editieren" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Geben Sie eine Adresse an" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Angemeldet bleiben" #, fuzzy #~ msgid "New" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index 254b097f36b..97101783fdf 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "und" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(optional)" @@ -175,9 +175,9 @@ msgstr "(gesendet an beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" @@ -207,7 +207,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s gespeichert." @@ -216,31 +216,22 @@ msgstr "%s gespeichert." msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -249,12 +240,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, ich habe ein Passwort" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Eine Meldung erfassen" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -317,9 +311,9 @@ msgstr "(Keine Telefonnummer)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -329,16 +323,15 @@ msgstr "" msgid "Add user" msgstr "Benutzer hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -346,7 +339,7 @@ msgstr "" msgid "Added %s" msgstr "%s hinzugefügt" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -366,7 +359,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "Alarm %d deaktiviert (erstellt %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -434,34 +428,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonym" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Anderer Benutzer" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Sind Sie sicher?" @@ -498,7 +494,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -532,6 +528,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -544,12 +544,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Wartet auf Moderation" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Zurück" @@ -563,10 +563,8 @@ msgid "Ban user" msgstr "Benutzer hinzufügen" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -603,7 +601,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -636,7 +633,7 @@ msgstr "Kategorie" msgid "Category and State" msgstr "Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -646,6 +643,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -701,7 +699,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -729,6 +727,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -741,7 +743,7 @@ msgstr "" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -771,18 +773,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -796,8 +797,7 @@ msgstr "Bestätigen" msgid "Confirm account" msgstr "Konto bestätigen" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -816,7 +816,7 @@ msgstr "Bestätigung" msgid "Confirmed" msgstr "Bestätigt" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -827,16 +827,20 @@ msgstr "Bestätigt:" msgid "Contact %s" msgstr "%s kontaktieren" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontaktieren Sie uns" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontaktieren Sie das Team" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -846,12 +850,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -887,6 +891,11 @@ msgstr "Erstellt" msgid "Create a report" msgstr "Erfasse eine Meldung" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Melden Sie sich an oder erstellen Sie ein Konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -896,18 +905,15 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -925,7 +931,7 @@ msgstr "Erstellt" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -951,7 +957,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -980,6 +986,10 @@ msgstr "" msgid "Default priority" msgstr "Neue Priorität" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -989,7 +999,7 @@ msgstr "" msgid "Delete" msgstr "Gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1001,8 +1011,8 @@ msgstr "Vorlage löschen" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1018,17 +1028,18 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1060,8 +1071,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Änderungen verwerfen" @@ -1070,11 +1081,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Haben Sie ein %s-Passwort?" @@ -1086,7 +1093,7 @@ msgstr "" msgid "Don’t know" msgstr "Weiß ich nicht" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Sie mögen keine Formulare?" @@ -1094,7 +1101,7 @@ msgstr "Sie mögen keine Formulare?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1135,34 +1142,36 @@ msgstr "Bearbeiten" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Bitte geben Sie einiges Details an" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Bitte geben Sie einiges Details an" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Ihre Aktualisierungen" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1195,20 +1204,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "E-Mail-Adresse" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "E-Mail-Adresse" @@ -1221,6 +1230,14 @@ msgstr "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1298,11 +1315,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Geben Sie eine Adresse an" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1353,11 +1365,11 @@ msgstr "Vorhandene Kategorie" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1400,6 +1412,8 @@ msgstr "Zusätzliche Daten:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Zusätzliche Daten:" @@ -1422,6 +1436,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1499,17 +1518,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ihr Passwort" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Passwort vergessen?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1567,7 +1591,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1635,7 +1659,7 @@ msgstr "Unsichtbar" msgid "Hide all reports and updates" msgstr "Liste aller Meldungen" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1658,11 +1682,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1687,7 +1711,7 @@ msgstr "" msgid "How to report a problem" msgstr "Erfasse eine neue Meldung:" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1747,7 +1771,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1858,7 +1882,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1878,8 +1902,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1891,13 +1915,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1937,6 +1954,7 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Aktualisierung:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1963,7 +1981,7 @@ msgstr "Liste aller Meldungen" msgid "Loading reports…" msgstr "Ihre Meldungen" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Lade..." @@ -1989,23 +2007,22 @@ msgstr "RSS" msgid "Locate the problem on a map of the area" msgstr "Identifizieren Sie den Mangel auf der Karte" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Mit Facebook anmelden" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Mit Twitter anmelden" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Mit E-Mail anmelden" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 #, fuzzy msgid "Log in with email/text" msgstr "Mit E-Mail anmelden" @@ -2018,7 +2035,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "KARTE" @@ -2026,7 +2043,7 @@ msgstr "KARTE" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2034,7 +2051,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Karte" @@ -2046,11 +2063,11 @@ msgstr "Als gesendet markieren" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Nachricht" @@ -2070,24 +2087,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2096,6 +2114,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2121,9 +2144,9 @@ msgstr "Meistkommentiert" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Name" @@ -2136,6 +2159,11 @@ msgstr "Name" msgid "Name:" msgstr "Name:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2202,6 +2230,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Neues Passwort:" @@ -2288,11 +2318,18 @@ msgstr "Neueste" msgid "Next" msgstr "Weiter" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Weiter" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2305,6 +2342,11 @@ msgstr "Weiter" msgid "No" msgstr "Nein" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Konto bestätigen" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Kein Gebiet" @@ -2313,7 +2355,7 @@ msgstr "Kein Gebiet" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Kein Rat ausgewählt" @@ -2346,7 +2388,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Kein Ergebnis zurückgegeben" @@ -2418,16 +2460,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2436,15 +2468,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2497,6 +2529,14 @@ msgstr "Open311-Spezifikation" msgid "Options" msgstr "optional" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2505,15 +2545,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2550,15 +2590,13 @@ msgstr "Übergeordnet" msgid "Partial" msgstr "Teilweise" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Passwort (optional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2577,16 +2615,21 @@ msgid "Phone Reporter:" msgstr "Gemeldet:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2598,12 +2641,14 @@ msgstr "Gemeldet:" msgid "Phone:" msgstr "Telefonnummer:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2617,7 +2662,7 @@ msgstr "Telefonnummer:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto ist erforderlich." @@ -2625,12 +2670,12 @@ msgstr "Foto ist erforderlich." msgid "Photo required" msgstr "Foto erforderlich" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2651,7 +2696,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Stecknadel auf Karte platzieren" @@ -2671,7 +2716,7 @@ msgstr "" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,15 +2726,15 @@ msgid "Please check your phone number is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2711,12 +2756,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,8 +2770,8 @@ msgstr "Bitte geben Sie eine Nachricht ein" msgid "Please enter a mobile number" msgstr "Bitte geben Sie Ihre Telefonnummer ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Bitte geben Sie Ihren Namen ein" @@ -2736,22 +2781,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Bitte geben Sie ein Passwort ein" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" @@ -2760,14 +2805,14 @@ msgstr "Bitte geben Sie eine gültige eMail-Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Bitte geben Sie Ihre Telefonnummer ein" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" @@ -2777,39 +2822,39 @@ msgstr "Bitte geben Sie einiges Details an" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Vornamen ein" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Bitte geben Sie Ihre Telefonnummer ein" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren zweiten Vornamen ein" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Bitte geben Sie Ihren Titel ein" @@ -2836,8 +2881,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2849,7 +2894,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2863,11 +2908,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2900,15 +2945,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2916,9 +2961,7 @@ msgstr "" msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2927,19 +2970,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2974,14 +3017,10 @@ msgstr "Datenschutz und Cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Private Details" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Meldung" @@ -3004,7 +3043,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -3013,7 +3052,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -3040,7 +3078,7 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3066,26 +3104,25 @@ msgstr "" msgid "Property address:" msgstr "Immobilien-Adresse:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Meldung aktualisieren" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Öffentliche Details" @@ -3154,7 +3191,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3179,7 +3216,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3225,9 +3262,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3259,14 +3296,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3277,14 +3314,14 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Eine Meldung erfassen" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3312,8 +3349,8 @@ msgstr "Melden sie Mängel an der Infrastruktur von Zürich" msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" @@ -3322,8 +3359,8 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3332,31 +3369,31 @@ msgstr "Gemeldet von %s um %s" msgid "Reported by:" msgstr "Gemeldet von:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3367,7 +3404,7 @@ msgstr "Gemeldet:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3376,17 +3413,22 @@ msgstr "Verfassen Sie eine Meldung" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Berichte" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Berichte warten auf Moderation" @@ -3408,7 +3450,7 @@ msgstr "" msgid "Reports published" msgstr "Berichte veröffentlicht" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3470,20 +3512,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Richtiger Ort?" @@ -3495,15 +3537,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3514,7 +3556,7 @@ msgstr "Nach rechts drehen" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" @@ -3528,8 +3570,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3544,7 +3586,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3584,13 +3626,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3620,7 +3661,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3638,11 +3679,11 @@ msgstr "Mit E-Mail anmelden" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3675,9 +3716,9 @@ msgid "Share" msgstr "Teilen" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3685,19 +3726,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Foto anzeigen?" @@ -3709,7 +3750,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Name öffentlich anzeigen?" @@ -3723,17 +3764,17 @@ msgstr "Alte anzeigen" msgid "Show older reports" msgstr "Berichte suchen" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Foto anzeigen" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3741,20 +3782,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Anmelden" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3763,6 +3804,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Melden Sie sich an oder erstellen Sie ein Konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Geben Sie ein Passwort ein" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3805,15 +3851,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3823,7 +3869,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3867,13 +3913,13 @@ msgstr "Startdatum:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3893,15 +3939,14 @@ msgid "State:" msgstr "Status:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Status" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3931,7 +3976,7 @@ msgstr "Straßenansicht" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Unterkategorie: %s" @@ -3940,21 +3985,22 @@ msgstr "Unterkategorie: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Titel:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Abschicken" @@ -4006,8 +4052,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4042,18 +4087,22 @@ msgstr "" msgid "Survey Results" msgstr "Umfrageergebnisse" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Vorlagen" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -4064,6 +4113,7 @@ msgstr "Nur-Text-Version" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4097,7 +4147,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4111,7 +4161,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4124,28 +4173,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4285,7 +4334,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Diese Meldung wurde von Fix My Zürich entfernt." @@ -4303,7 +4352,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4320,14 +4369,18 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." @@ -4335,10 +4388,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Es gab Probleme mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4363,15 +4425,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4402,10 +4455,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -4444,7 +4497,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Dieser Bericht wartet auf Moderation." @@ -4460,7 +4513,7 @@ msgstr "Dieser Bericht ist aktuell als behoben markiert." msgid "This report is currently marked as open." msgstr "Dieser Bericht ist aktuell als offen markiert." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Dieser Bericht ist aktuell als offen markiert." @@ -4477,7 +4530,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -4561,7 +4613,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4571,7 +4623,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Erneut versuchen" @@ -4607,7 +4659,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Unbekannt" @@ -4615,18 +4667,18 @@ msgstr "Unbekannt" msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Unbekannter Fehler" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" @@ -4645,7 +4697,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Beschreibung" @@ -4653,11 +4705,11 @@ msgstr "Beschreibung" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4697,24 +4749,24 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Anmerkung: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Anmerkung: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Aktualisiert!" @@ -4725,7 +4777,7 @@ msgstr "Aktualisiert!" msgid "Updates" msgstr "Aktualisierungen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4780,26 +4832,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4824,10 +4876,8 @@ msgid "User:" msgstr "Benutzer" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Benutzer" @@ -4875,6 +4925,10 @@ msgstr "" msgid "View wards" msgstr "andere Gebiete:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4905,7 +4959,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4966,7 +5020,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4994,17 +5048,15 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5018,11 +5070,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5030,11 +5082,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5051,7 +5103,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5073,11 +5125,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5085,7 +5137,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5167,11 +5219,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ihre eMail" @@ -5180,9 +5232,9 @@ msgstr "Ihre eMail" msgid "Your email address" msgstr "Ihre eMail-Adresse" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Ihre eMail-Adresse" @@ -5191,9 +5243,7 @@ msgstr "Ihre eMail-Adresse" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ihr Name" @@ -5209,13 +5259,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ihr Passwort" @@ -5224,15 +5274,15 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -5254,7 +5304,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Ihr Passwort wurde geändert" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Ihre Aktualisierungen" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5266,8 +5321,8 @@ msgstr "Ihre Aktualisierungen" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5286,13 +5341,15 @@ msgid "all" msgstr "alle" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5318,7 +5375,7 @@ msgstr "z.B. ‘%s’ oder ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5356,6 +5413,15 @@ msgstr "keine" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Melden Sie sich an oder erstellen Sie ein Konto" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5392,12 +5458,12 @@ msgstr "ausloggen" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5413,11 +5479,11 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5433,11 +5499,11 @@ msgstr "" msgid "user is problem owner" msgstr "Benutzer ist Problemeigentümer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Von Seite entfernen" @@ -5608,8 +5674,12 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Geben Sie ein Passwort ein" +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Geben Sie eine Adresse an" + +#~ msgid "Private details" +#~ msgstr "Private Details" #, fuzzy #~ msgid "New" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 23a420bec7e..00a28c5eea8 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: George Kanellopoulos , 2018\n" "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "και" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -166,7 +166,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηρεσία)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(προαιρετικό)" @@ -186,9 +186,9 @@ msgstr "(στάλθηκε και στις δύο)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Ροή RSS για προβλήματα στο "%s"" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγορία --" @@ -221,7 +221,7 @@ msgstr "

Αναφορές, Στατιστικά και Ενέργειες γ msgid " %s reports %s" msgstr " %s αναφορές %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s αποθηκεύτηκε." @@ -230,34 +230,24 @@ msgstr "%s αποθηκεύτηκε." msgid "%s live problems" msgstr "%s προβλήματα τώρα" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Όχι Να γίνει επιβεβαίωση της αναφοράς μέσω email" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Όχι Να γίνει επιβεβαίωση της αναφοράς μέσω email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Όχι Να γίνει επιβεβαίωση της ενημέρωσης μέσω email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Όχι Να γίνει επιβεβαίωση της ενημέρωσης μέσω email" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Όχι να συνδεθώ μέσω email" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Όχι να συνδεθώ μέσω email" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Σημείωση: Η αναφορά έχει δρομολογηθεί προς ενέργεια. Για οποιαδήποτε μεταβολή συμβεί δεν θα ενημερωθεί αυτόματα." @@ -266,12 +256,15 @@ msgstr "Σημείωση: Η αναφορά έχει δρομο msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Σημείωση: Η αναφορά δεν έχει δρομολογηθεί ακόμα προς ενέργεια. Οποιαδήποτε μεταβολή μπορεί να μην ενηρωθεί." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ναι έχω κωδικό πρόσβασης" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Αναφορά προβλήματος" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Έλεγχος ταυτότητας δύο παραγόντων" @@ -333,9 +326,9 @@ msgstr "Προσθήκη αρ. τηλεφώνου" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Προσθήκη στoν κατάλογο" @@ -345,16 +338,15 @@ msgstr "Προσθήκη στoν κατάλογο" msgid "Add user" msgstr "Προσθήκη χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -362,7 +354,7 @@ msgstr "" msgid "Added %s" msgstr "Προστέθηκε %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -382,7 +374,8 @@ msgstr "Η ειδοποίηση %d δημιουργήθηκε για το " msgid "Alert %d disabled (created %s)" msgstr "Η ειδοποίηση %d απενεργοποιήθηκε (δημιουργήθηκε %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσεις" @@ -449,33 +442,35 @@ msgstr "Πάντα ανάκτηση του συνόλου των προβλημ msgid "An update marked this problem as fixed." msgstr "Το πρόβλημα ενημερώθηκε ως διορθωμένο." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Ανώνυμος" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Ανώνυμος χρήστης" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Ανώνυμος:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Άλλος χρήστης" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την μεταφόρτωση;" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Είσαι σίγουρος?" @@ -512,7 +507,7 @@ msgstr "Ανάθεση σε εξωτερικό τομέα:" msgid "Assign to subdivision:" msgstr "Ανάθεση στο τμήμα:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -546,6 +541,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -558,12 +557,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Σε αναμονή ελέγχου" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Πίσω" @@ -577,10 +576,8 @@ msgid "Ban user" msgstr "Επισήμανση χρήστη" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -617,7 +614,6 @@ msgid "Can't see the map? Skip this step" msgstr "Δεν μπορείς να δεις τον χάρτη; Παράλειψη βήματος" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -650,7 +646,7 @@ msgstr "Κατηγορία" msgid "Category and State" msgstr "Κατηγορία" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -660,6 +656,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -719,7 +716,7 @@ msgstr "Επίλεξε ένα όνομα κατηγορίας msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -748,6 +745,10 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα msgid "Click the link in that email to sign in." msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβαίωσης για να συνδεθείς." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -760,7 +761,7 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Κλειστό από την υπηρεσία" @@ -790,18 +791,17 @@ msgid "Cobrand:" msgstr "Προστεθέν σήμα:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" @@ -815,8 +815,7 @@ msgstr "Επιβεβαίωση" msgid "Confirm account" msgstr "Επιβεβαίωση λογαριασμού" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισάγοντας έναν νέο κωδικό πρόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός πρόσβασης θα αλλάξει." @@ -835,7 +834,7 @@ msgstr "Επιβεβαίωση" msgid "Confirmed" msgstr "Επιβεβαιώθηκε" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -846,16 +845,20 @@ msgstr "Επιβεβαιώθηκε:" msgid "Contact %s" msgstr "Επικοινωνία με %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Επικοινώνησε με εμάς" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Επικοινώνησε με την ομάδα διαχείρισης" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -865,12 +868,12 @@ msgstr "" msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εύρεση χρήστη" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Δεν είναι δυνατή η εύρεση της τοποθεσίας" @@ -906,6 +909,11 @@ msgstr "Δημιουργήθηκε" msgid "Create a report" msgstr "Δημιουργία αναφοράς" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Σύνδεση ή δημιουργία λογαριασμού" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -915,18 +923,15 @@ msgstr "Δημιουργία κατηγορίας" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -944,7 +949,7 @@ msgstr "Δημιουργήθηκε" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -970,7 +975,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Δεν έχουν δημιουργηθεί τομείς μέχρι στιγμής." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Δεν υπάρχει τρόπος επικοινωνίας με τον πελάτη" @@ -998,6 +1003,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1007,7 +1016,7 @@ msgstr "" msgid "Delete" msgstr "Διαγραμμένα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1019,8 +1028,8 @@ msgstr "Διαγραφή προτύπου" msgid "Deleted" msgstr "Διαγραμμένα" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1036,17 +1045,18 @@ msgstr "Περιγραφή" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Πληροφορίες" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1078,8 +1088,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1088,11 +1098,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Έχεις κωδικό πρόσβασης %s?" @@ -1104,7 +1110,7 @@ msgstr "" msgid "Don’t know" msgstr "Δεν γνωρίζω" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Δεν σου αρέσουν οι φόρμες;" @@ -1112,7 +1118,7 @@ msgstr "Δεν σου αρέσουν οι φόρμες;" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Σύρε φωτογραφίες εδώ ή κάνε κλικ για ανέβασμα" @@ -1156,34 +1162,36 @@ msgstr "Επεξεργασία" msgid "Edit body details" msgstr "Επεξεργασία λεπτομερειών του τομέα" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Επεξεργασία λεπτομερειών του τομέα" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Επεξεργασία λεπτομερειών του τομέα" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Οι ενημερώσεις σου" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1216,20 +1224,20 @@ msgstr "Επεξεργαστής" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Κωδικός πρόσβασης (προαιρετικό)" @@ -1242,6 +1250,15 @@ msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μέσω email διεγράφη" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβαίωσης για να συνδεθείς." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1331,11 +1348,6 @@ msgstr "Δώσε μια ονομασία για την οδό" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1386,11 +1398,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1433,6 +1445,8 @@ msgstr "Επιπλέον δεδομένα:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Επιπλέον δεδομένα:" @@ -1455,6 +1469,11 @@ msgstr "Αποτυχία αποστολής μηνύματος" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1532,17 +1551,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Για περισσότερες πληροφορίες, δες Πώς το FixMyStreet χρησιμοποιεί το Mapit (στα Αγγλικά)." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ο κωδικός σου" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Ξέχασες τον κωδικό πρόσβασής σου;" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Προωθήθηκε στον εξωτερικό τομέα" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Η επιθυμία προωθήθηκε στον εξωτερικό τομέα" @@ -1600,7 +1624,7 @@ msgstr "Εμπρός" msgid "Going to send questionnaire?" msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1668,7 +1692,7 @@ msgstr "Κρυμμένα" msgid "Hide all reports and updates" msgstr "Επισημασμένες αναφορές και χρήστες" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1691,11 +1715,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Απόκρυψη καρφιτσών" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1720,7 +1744,7 @@ msgstr "Αρχική" msgid "How to report a problem" msgstr "Πώς να αναφέρεις ένα πρόβλημα" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Πώς να στείλεις επιτυχημένες αναφορές" @@ -1782,7 +1806,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Αν δύο ή περισσότεροι τομείς υπηρετούν την ίδια περιοχή, το FixMyStreet συνδυάζει τις ίδιες κατηγορίες σε μία ενιαία καταχώριση στο μενού. Αν θες να χρησιμοποιήσεις αυτή τη δυνατότητα, βεβαιώσου ότι σε κάθε τομέα το όνομα της συγκεκριμένης κατηγορίας είναι ίδιο." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1898,7 +1922,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1918,8 +1942,8 @@ msgstr "Εσφαλμένη τιμή agency_responsible %s" msgid "Invalid format %s specified." msgstr "Λανθασμένη μορφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1931,13 +1955,6 @@ msgstr "Συχνά είναι γρηγορότερο να ελέ msgid "It’s on its way to the council right now." msgstr "Το δημοτικό συμβούλιο ενημερώνεται για το πρόβλημα." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Να παραμείνω συνδεδεμένος από αυτήν τη συσκευή" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1977,6 +1994,7 @@ msgstr "Τελευταία ενημέρωση" msgid "Last update:" msgstr "Τελευταία ενημέρωση:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2003,7 +2021,7 @@ msgstr "Λίστα όλων των αναφερθέντων προβλημάτω msgid "Loading reports…" msgstr "κλειστές αναφορές" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Φορτώνει..." @@ -2029,23 +2047,22 @@ msgstr "Τοπικές ειδοποιήσεις" msgid "Locate the problem on a map of the area" msgstr "Εντόπισε το πρόβλημα στον χάρτη της περιοχής" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2057,7 +2074,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "ΧΑΡΤΗΣ" @@ -2065,7 +2082,7 @@ msgstr "ΧΑΡΤΗΣ" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2073,7 +2090,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Χάρτης" @@ -2085,11 +2102,11 @@ msgstr "Σημείωση ως απεσταλμένο" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Να επισημάνεις ως επισημασμένους τους χρήστες των οποίων τη συμπεριφορά θα ήθελες να παρακολουθείς." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Μήνυμα" @@ -2109,24 +2126,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Λείπει το jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2135,6 +2153,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Ελέγχθηκε από το τμήμα μέσα σε μία εργάσιμη ημέρα" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2160,9 +2183,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Όνομα" @@ -2175,6 +2198,12 @@ msgstr "Όνομα" msgid "Name:" msgstr "Όνομα:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2244,6 +2273,8 @@ msgid "New note to DM:" msgstr "Νέα σημείωση προς τον Διαχειριστή Παροχών Υπηρεσίας:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2330,11 +2361,18 @@ msgstr "" msgid "Next" msgstr "Επόμενο" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Επόμενο" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2347,6 +2385,11 @@ msgstr "Επόμενο" msgid "No" msgstr "Όχι" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Επιβεβαίωση λογαριασμού" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2355,7 +2398,7 @@ msgstr "" msgid "No body" msgstr "Κανένας τομέας" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Δεν επιλέχθηκε κάποια υπηρεσία" @@ -2388,7 +2431,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Δεν επιστράφηκαν αποτελέσματα." @@ -2463,16 +2506,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Τώρα, για να υποβάλεις την αναφορά σου…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Τώρα, για να υποβάλεις την ενημέρωσή σου…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2481,15 +2514,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "ΟΚ" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2541,6 +2574,14 @@ msgstr "Προδιαγραφές Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2549,15 +2590,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2594,15 +2635,13 @@ msgstr "Πηγή" msgid "Partial" msgstr "Εν μέρει" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Κωδικός πρόσβασης (προαιρετικό)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Σύνδεσμος" @@ -2621,16 +2660,22 @@ msgid "Phone Reporter:" msgstr "Αναφέρθηκε:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Αριθμός τηλεφώνου" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Αριθμός τηλεφώνου (προαιρετικό)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Παρακαλούμε συντόμευσε την αναφορά σου" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2642,12 +2687,14 @@ msgstr "Αναφέρθηκε:" msgid "Phone:" msgstr "Τηλέφωνο:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2661,7 +2708,7 @@ msgstr "Τηλέφωνο:" msgid "Photo" msgstr "Φωτογραφία" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Απαιτείται φωτογραφία." @@ -2669,12 +2716,12 @@ msgstr "Απαιτείται φωτογραφία." msgid "Photo required" msgstr "Απαιτείται φωτογραφία" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2695,7 +2742,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Θέση της περιοχής στο χάρτη" @@ -2715,7 +2762,7 @@ msgstr "Παρακαλούμε έλεγξε τους κωδικούς πρόσβ msgid "Please check your email address is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2725,15 +2772,15 @@ msgid "Please check your phone number is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Παρακαλούμε επίλεξε μια κατηγορία" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2758,12 +2805,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Παρακαλούμε να μην κάνεις κατάχρηση — η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2772,8 +2819,8 @@ msgstr "Παρακαλούμε γράψε ένα μήνυμα" msgid "Please enter a mobile number" msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Παρακαλώ γράψτε ένα όνομα" @@ -2783,22 +2830,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Παρακαλούμε γράψε ένα θέμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Παρακαλούμε γράψε ένα έγκυρο email" @@ -2807,14 +2854,14 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email" msgid "Please enter a valid email address" msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες" @@ -2824,39 +2871,39 @@ msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειε #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Παρακαλούμε γράψε το email σου" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Παρακαλούμε γράψε το όνομά σου" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Παρακαλούμε γράψε το όνομά σου" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Παρακαλούμε γράψε το επίθετό σου" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Παρακαλούμε γράψε τον τίτλο σου" @@ -2883,8 +2930,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Παρακαλούμε σήμανε αν θα ήθελες να λάβεις άλλο ερωτηματολόγιο" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2896,7 +2943,7 @@ msgstr "Παρακαλούμε σημείωσε ότι οι ενημερώσει msgid "Please note your report has not yet been sent." msgstr "Παρακαλούμε σημείωσε ότι η αναφορά σου δεν έχει αποσταλεί ακόμη. " -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Παρακαλούμε σημείωσε ότι η αναφορά σου δεν έχει αποσταλεί ακόμη. Επίλεξε μια κατηγορία και αφού προσθέσεις περαιτέρω πληροφορίες παρακάτω, κάνε υποβολή." @@ -2910,12 +2957,12 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ msgid "Please note:" msgstr "Παρακαλούμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2948,15 +2995,15 @@ msgstr "Παρακαλούμε επίλεξε το είδος της ειδοπ msgid "Please state whether or not the problem has been fixed" msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Παρακαλούμε ανέβασε μία εικόνα μόνο" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2964,9 +3011,7 @@ msgstr "" msgid "Please write a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Δημοσίευση" @@ -2975,19 +3020,19 @@ msgstr "Δημοσίευση" msgid "Postcode or street name and area" msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Δημοσιεύθηκε ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Δημοσιεύθηκε από %s (%s) στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" @@ -3022,14 +3067,10 @@ msgstr "Ιδιωτικότητα και cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Ιδιωτικό" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Πρόβλημα" @@ -3052,7 +3093,7 @@ msgstr "Το πρόβλημα %s στάλθηκε στην υπηρεσία %s" msgid "Problem breakdown by state" msgstr "Ανάλυση προβλήματος ανά κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό." @@ -3061,7 +3102,6 @@ msgid "Problem state change based on survey results" msgstr "Αλλαγή κατάστασης προβλήματος βάσει αποτελεσμάτων από έρευνες" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Προβλήματα" @@ -3088,7 +3128,7 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ msgid "Problems within %.1fkm of %s" msgstr "Λήψη ειδοποιήσεων για προβλήματα σε ακτίνα %.1f χλμ από εδώ" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3114,26 +3154,26 @@ msgstr "Προβλήματα σε ακτίνα %s, %s" msgid "Property address:" msgstr "Διεύθυνση ακινήτου:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Δώσε μια ενημέρωση" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Η εισαγωγή κωδικού πρόσβασης είναι προαιρετική, αλλά έτσι θα σου είναι ευκολότερο να αναφέρεις προβλήματα, να αφήνεις ενημερώσεις και να διαχειρίζεσαι τις αναφορές σου." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3202,7 +3242,7 @@ msgstr "Ροή RSS από %s, στην περιοχή "%s"" msgid "RSS feed of nearby problems" msgstr "Ροή RSS για κοντινά προβλήματα" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3227,7 +3267,7 @@ msgstr "Ροή RSS για ενημερώσεις σε αυτό το πρόβλη msgid "Receive email when updates are left on this problem." msgstr "Λήψη email όταν γίνονται ενημερώσεις για αυτό το πρόβλημα" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3274,9 +3314,9 @@ msgstr "Αφαίρεση σήμανσης" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3308,14 +3348,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Αναφορά προβλήματος" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3326,14 +3366,14 @@ msgstr "Αναφορά προβλήματος" msgid "Report abuse" msgstr "Αναφορά κατάχρησης" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Αναφορά προβλήματος" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3361,8 +3401,8 @@ msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλ msgid "Report, view, or discuss local problems" msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλήματα" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Αναφέρθηκε ανώνυμα στις %s" @@ -3371,8 +3411,8 @@ msgstr "Αναφέρθηκε ανώνυμα στις %s" msgid "Reported before" msgstr "Αναφέρθηκε προηγουμένως" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Αναφέρθηκε από %s στις %s" @@ -3381,31 +3421,31 @@ msgstr "Αναφέρθηκε από %s στις %s" msgid "Reported by:" msgstr "Αναφέρθηκε από:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Αναφέρθηκε στην κατηγορία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s" @@ -3416,7 +3456,7 @@ msgstr "Αναφέρθηκε:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3425,17 +3465,23 @@ msgstr "Αναφορά προβλήματος" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Αναφορές" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Παρακαλούμε συντόμευσε την αναφορά σου" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Παρακαλούμε συντόμευσε την αναφορά σου" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Αναφορές που αναμένουν έγκριση" @@ -3457,7 +3503,7 @@ msgstr "" msgid "Reports published" msgstr "Αναφορές που δημοσιεύθηκαν" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3520,20 +3566,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Πρότυπα απαντήσεων για %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Σωστή τοποθεσία;" @@ -3545,15 +3591,15 @@ msgstr "Χειριστής δρόμου για την ονομασμένη οδ msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Περιστροφή αριστερά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3564,7 +3610,7 @@ msgstr "Περιστροφή δεξιά" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Αν περιστρέψετε την φωτογραφία θα χαθούν οι αλλαγές που κάνατε στην αναφορά." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Δορυφόρος" @@ -3578,8 +3624,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3594,7 +3640,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3634,13 +3680,12 @@ msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3671,7 +3716,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3688,11 +3733,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Επιστροφή αναφοράς" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Στάλθηκε στο %s %s αργότερα" @@ -3725,9 +3770,9 @@ msgid "Share" msgstr "Κοινοποίηση" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3735,19 +3780,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3759,7 +3804,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Δημόσια προβολή του ονόματός μου" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3773,17 +3818,17 @@ msgstr "Προβολή παλαιότερων" msgid "Show older reports" msgstr "Αναζήτηση αναφορών" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Προβολή καρφιτσών" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3791,20 +3836,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Σύνδεση" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 #, fuzzy msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισάγοντας έναν νέο κωδικό πρόσβασης. Όταν γίνει η επιβεβαίωση, ο κωδικός πρόσβασης θα αλλάξει." @@ -3814,6 +3859,11 @@ msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισ msgid "Sign in or create an account" msgstr "Σύνδεση ή δημιουργία λογαριασμού" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Γράψε ένα κωδικό πρόσβασης" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3857,15 +3907,15 @@ msgstr "Λυπούμαστε, αυτός δεν είναι ένας έγκυρο msgid "Sorry, there has been an error confirming your problem." msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Συγνώμη, δεν μπορέσαμε να βρούμε αυτήν την τοποθεσία." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Λυπούμαστε, δεν μπορούμε να σας συνδέσουμε. Παρακαλούμε συμπληρώστε την παρακάτω φόρμα." @@ -3875,7 +3925,7 @@ msgstr "Λυπούμαστε, δεν μπορούμε να σας συνδέσο msgid "Sorry, we could not parse that location. Please try again." msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυτήν την τοποθεσία. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Λυπούμαστε, δεν μπορέσαμε να αποθηκεύσουμε τις εικόνες σας, παρακαλούμε προσπαθήστε ξανά." @@ -3919,13 +3969,13 @@ msgstr "Ημερομηνία Έναρξης:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3945,15 +3995,14 @@ msgid "State:" msgstr "Κατάσταση:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Κατάσταση" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3983,7 +4032,7 @@ msgstr "Street View" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Υποκατηγορία: %s" @@ -3992,21 +4041,22 @@ msgstr "Υποκατηγορία: %s" msgid "Subdivision/Body" msgstr "Τμήμα/Σώμα" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Θέμα" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Θέμα:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Υποβολή" @@ -4058,8 +4108,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4094,18 +4143,22 @@ msgstr "" msgid "Survey Results" msgstr "Αποτελέσματα έρευνας" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Πρότυπο «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Πρότυπα" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Κείμενο" @@ -4116,6 +4169,7 @@ msgstr "Έκδοση απλού κειμένου" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4149,7 +4203,7 @@ msgstr "Ευχαριστούμε που ανέβασες την φωτογραφ 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 "Ευχαριστούμε, χαιρόμαστε που διορθώθηκε! Μπορούμε απλά να σε ρωτήσουμε αν έχεις αναφέρει ξανά κάποιο πρόβλημα στην υπηρεσία στο παρελθόν;" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτωθεί σωστά (%s), παρακαλούμε προσπάθησε ξανά." @@ -4163,7 +4217,6 @@ msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται σ #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε." @@ -4176,28 +4229,28 @@ msgstr "Αυτό το πρόβλημα έχει σημειωθεί ως απεσ msgid "That problem will now be resent." msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Η αναφορά δεν μπορεί να προβληθεί σε %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4343,7 +4396,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Ο χρήστης δεν μπορέσε να εντοπίσει το πρόβλημα στον χάρτη, αλλά για να δει την περιοχή κοντά στην τοποθεσία έγραψε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet." @@ -4363,7 +4416,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Δεν υπάρχουν αναφορές προς εμφάνιση." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4380,15 +4433,19 @@ msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της msgid "There was a problem with your email/password combination. Please try again." msgstr "Υπήρξε πρόβλημα με τον συνδυασμό email/κωδικού πρόσβασης. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Υπήρξε πρόβλημα με το συνδυασμό του email/κωδικού πρόσβασής σου. Αν δεν μπορείς να θυμηθείς τον κωδικό σου, ή δεν έχεις, παρακαλούμε συμπλήρωσε τον τομέα ‘σύνδεση μέσω email’ αυτής της φόρμας." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά." @@ -4396,10 +4453,19 @@ msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Π msgid "There were problems with your report. Please see below." msgstr "Υπήρξαν προβλήματα με την αναφορά σου. Παρακαλούμε δες παρακάτω." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Υπήρξαν προβλήματα με την ενημέρωσή σου. Παρακαλούμε δες παρακάτω." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4427,15 +4493,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 είναι έργο σε εξέλιξη και δεν είναι ακόμη σταθερή. Θα αλλάξει χωρίς προειδοποιήσεις στο μέλλον." @@ -4471,10 +4528,10 @@ msgstr "Αυτό το email στάλθηκε και στις δύο υπηρεσ 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Αυτή η πληροφορία απαιτείται" @@ -4513,7 +4570,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Αυτή η αναφορά αναμένει έγκριση." @@ -4529,7 +4586,7 @@ msgstr "Αυτή η αναφορά είναι προς το παρόν κατα msgid "This report is currently marked as open." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως ανοιχτή." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως ανοιχτή." @@ -4546,7 +4603,6 @@ msgid "Time spent (in minutes):" msgstr "Χρόνος που αφιερώθηκε (λεπτά):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Χρονοδιάγραμμα" @@ -4630,7 +4686,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4640,7 +4696,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Δοκίμασε ξανά" @@ -4676,7 +4732,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ανεπιβεβαίωτο" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Άγνωστο" @@ -4684,18 +4740,18 @@ msgstr "Άγνωστο" msgid "Unknown alert type" msgstr "Άγνωστο είδος ειδοποίησης" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Άγνωστο σφάλμα" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα προβλήματος" @@ -4714,7 +4770,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ενημέρωση" @@ -4722,11 +4778,11 @@ msgstr "Ενημέρωση" msgid "Update %s created for problem %d; by %s" msgstr "Η ενημέρωση %s δημιουργήθηκε για το πρόβλημα %d από %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε ανώνυμα στις %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε από %s στις %s" @@ -4766,24 +4822,24 @@ msgstr "Καταστάσεις ενημέρωσης" msgid "Updated" msgstr "Ενημερώθηκε" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Δημοσιεύθηκε από %s (%s) στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Ενημερώθηκε!" @@ -4794,7 +4850,7 @@ msgstr "Ενημερώθηκε!" msgid "Updates" msgstr "Ενημερώσεις" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου" @@ -4849,28 +4905,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Το Email προστέθηκε στην μαύρη λίστα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Το Email είναι ήδη στην μαύρη λίστα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Η επισήμανση του χρήστη αφαιρέθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Ο χρήστης επισημάνθηκε" @@ -4896,10 +4952,8 @@ msgid "User:" msgstr "Χρήστες" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Χρήστες" @@ -4947,6 +5001,10 @@ msgstr "Προβολή αναφορών ανά πτέρυγα" msgid "View wards" msgstr "άλλες περιοχές:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4978,7 +5036,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5040,7 +5098,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Ήρεμα ρε Τεστίνο! Τρεις φωτογραφίες είναι αρκετές." @@ -5068,17 +5126,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "Λάθος γεωγραφική τοποθεσία; Απλά κάνε κλικ ξανά πάνω στον χάρτη." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5092,11 +5148,11 @@ msgstr "Λάθος γεωγραφική τοποθεσία; Απλά κάνε κ msgid "Yes" msgstr "Ναι" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλήματος διαγράφτηκε από τον διαχειριστή χωρίς λόγο: " -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5104,11 +5160,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω ενημέρωση είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο: " -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Μπορείς να δεις το πρόβλημα σε αυτόν τον ιστότοπο." @@ -5126,7 +5182,7 @@ msgstr "Μπορείς να προσθέσεις την ηλεκτρονική msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Μπορείς να επικοινωνήσεις για τεχνική υποστήριξη στο %s" @@ -5151,11 +5207,11 @@ msgstr "Μπορείς να μας βοηθήσεις με το να βρεις msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Μπορείς να επισημάνεις έναν τομέα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργός σε αυτόν τον ιστότοπο." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Έχεις υποχωρήσει - παρακαλούμε συμπλήρωσε το κουτί που υπάρχει παραπάνω." -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5163,7 +5219,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Έχεις ήδη απαντήσεις σε αυτό το ερωτηματολόγιο. Αν έχεις κάποιος απορία, παρακαλούμε επικοινώνησε, ή δες το πρόβλημά σου.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Έχεις ήδη επισυνάψει φωτογραφίες σε αυτήν την αναφορά. Μπορείς να επισυνάψεις μέχρι 3 (αν προσπαθήσεις να μεταφορτώσεις περισσότερες, θα αφαιρεθούν οι παλιότερες)." @@ -5248,11 +5304,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Το e-mail σου" @@ -5261,9 +5317,9 @@ msgstr "Το e-mail σου" msgid "Your email address" msgstr "Η διεύθυνση του e-mail σου" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Η διεύθυνση του e-mail σου" @@ -5272,9 +5328,7 @@ msgstr "Η διεύθυνση του e-mail σου" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν μόνο σύμφωνα με την πολιτική απορρήτου" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Το όνομά σου" @@ -5290,13 +5344,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ο κωδικός σου" @@ -5305,15 +5359,15 @@ msgstr "Ο κωδικός σου" msgid "Your password has been changed" msgstr "Ο κωδικός σου έχει αλλάξει" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ο αριθμός τηλεφώνου σου" @@ -5335,7 +5389,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Ο κωδικός σου έχει αλλάξει" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Οι ενημερώσεις σου" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5347,8 +5406,8 @@ msgstr "Οι ενημερώσεις σου" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5367,13 +5426,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5400,7 +5461,7 @@ msgstr "π.χ. ‘%s’ ή ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Λακκούβα 25 εκ. στην οδό Τάδε, κοντά στη ταχυδρομική θυρίδα" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5439,6 +5500,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Σύνδεση ή δημιουργία λογαριασμού" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5475,12 +5545,12 @@ msgstr "έξοδος" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "η τοπική υπηρεσία" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "δεν υπάρχει καρφίτσα στον χάρτη επειδή ο χρήστης δεν χρησιμοποίησε τον χάρτη" @@ -5497,11 +5567,11 @@ msgstr "αυτή η κατηγορία τοπικού προβλήματος" msgid "today" msgstr "σήμερα" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5517,12 +5587,12 @@ msgstr "ο χρήστης είναι από την ίδια υπηρεσία ό msgid "user is problem owner" msgstr "ο χρήστης είναι ο ιδιοκτήτης του προβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Το Email είναι ήδη στην μαύρη λίστα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Το Email προστέθηκε στην μαύρη λίστα" @@ -5693,8 +5763,35 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Γράψε ένα κωδικό πρόσβασης" +#~ msgid "No let me sign in by email" +#~ msgstr "Όχι να συνδεθώ μέσω email" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Όχι να συνδεθώ μέσω email" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Επεξεργασία λεπτομερειών του τομέα" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Να παραμείνω συνδεδεμένος από αυτήν τη συσκευή" + +#~ msgid "Now to submit your report…" +#~ msgstr "Τώρα, για να υποβάλεις την αναφορά σου…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Τώρα, για να υποβάλεις την ενημέρωσή σου…" + +#~ 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 "Η εισαγωγή ονόματος και κωδικού πρόσβασης είναι προαιρετική, αλλά έτσι θα σου είναι ευκολότερο να αναφέρεις προβλήματα, να αφήνεις ενημερώσεις και να διαχειρίζεσαι τις αναφορές σου." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Λάθος γεωγραφική τοποθεσία; Απλά κάνε κλικ ξανά πάνω στον χάρτη." #~ msgid "Password:" #~ msgstr "Νέος κωδικός πρόσβασης:" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 222b4a61e4d..5f93537bcff 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: 2018-09-06 20:57+0000\n" "Last-Translator: jose antonio prado, 2018\n" "Language-Team: Spanish (https://www.transifex.com/mysociety/teams/12067/es/)\n" @@ -22,13 +22,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " y " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -160,7 +160,7 @@ msgstr "(ya no existe)" msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcional)" @@ -178,9 +178,9 @@ msgstr "(enviado a ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(también tenemos feeds RSS para problemas en %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" @@ -212,7 +212,7 @@ msgstr "

Informes, estadísticas y acciones para

%s

" msgid " %s reports %s" msgstr " %s informes %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s guardado" @@ -221,31 +221,22 @@ msgstr "%s guardado" msgid "%s live problems" msgstr "%s notificaciones en curso" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "No- confirmar mi notificación por email" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "No Quiero confirmar mi reporte a través de email o mensaje de texto" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "No- confirmar mi actualización por email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "No Quiero confirmar mi actualización a través de email o mensaje de texto" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "No- permítanme registrarme por email" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "No quiero iniciar sesión a través de email o mensaje de texto" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota\\: Este informe se ha enviado para la acción. Los cambios realizados no se transmitirán." @@ -254,12 +245,15 @@ msgstr "Nota\\: Este informe se ha enviado para la acción. Lo msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota\\: Este informe aún no ha sido enviado para la acción. Cualquier cambio hecho no puede ser enviado." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "- tengo una contraseña" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Resuma el problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Activar autenticación doble" @@ -322,9 +316,9 @@ msgstr "Agregar número de teléfono" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Añadir a favoritos" @@ -334,16 +328,15 @@ msgstr "Añadir a favoritos" msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Añadir/editar categoría de problemas" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Añadir / editar prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Añadir / editar plantillas de respuesta" @@ -351,7 +344,7 @@ msgstr "Añadir / editar plantillas de respuesta" msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Añadir este informe a tu lista de favoritos lo eliminará de la lista de favoritos de %s." @@ -371,7 +364,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" @@ -438,33 +432,35 @@ msgstr "Siempre cargar todos los problemas" msgid "An update marked this problem as fixed." msgstr "Una actualización marcó este problema como arreglado." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anónimo" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Usuario anónimo" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anónimo:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Otro usuario" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "¿Estás seguro que quieres cancelar esta carga?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Estás seguro?" @@ -501,7 +497,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Asignar usuarios a áreas" @@ -534,6 +530,10 @@ msgstr "Auto-respuesta \\:" msgid "Automated" msgstr "Automático" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Categorías disponibles" @@ -546,12 +546,12 @@ msgstr "Promedio de tiempo entre el informe de un problema y su arreglo, último msgid "Avoid personal information and vehicle number plates" msgstr "Evite la información personal y las matrículas de vehículos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "En espera de revisión" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Atras" @@ -564,10 +564,8 @@ msgid "Ban user" msgstr "Bloquear usuario" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -604,7 +602,6 @@ msgid "Can't see the map? Skip this step" msgstr "¿No puedes ver el mapa? Salte este paso" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -636,7 +633,7 @@ msgstr "Categoría" msgid "Category and State" msgstr "Categoría y Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de '%s' a '%s'" @@ -646,6 +643,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -708,7 +706,7 @@ msgstr "" msgid "Choose another" msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Borrar datos sin conexión" @@ -736,6 +734,10 @@ msgstr "Haga clic en el enlace de nuestro correo electrónico de confirmación p msgid "Click the link in that email to sign in." msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -748,7 +750,7 @@ msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión." msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -777,18 +779,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Código" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "Cerrar mapa" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -802,8 +803,7 @@ msgstr "Confirmar" msgid "Confirm account" msgstr "Confirmar cuenta" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirmar por email, proporcionando una nueva contraseña. Al confirmar, su contraseña se actualizará." @@ -822,7 +822,7 @@ msgstr "Confirmación" msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -833,16 +833,20 @@ msgstr "Confirmada:" msgid "Contact %s" msgstr "Contacto %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contáctenos" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contactar con el equipo" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -852,12 +856,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "No se pudo consultar la ubicación" @@ -892,6 +896,11 @@ msgstr "Crear" msgid "Create a report" msgstr "Crear una notificación" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Iniciar sesión o crear una cuenta" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -901,18 +910,15 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear una prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "Crear reportes/actualizaciones como usuario anónimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Crear reportes/actualizaciones como el Ayuntamiento" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Crear reportes/actualizaciones a nombre de un usuario" @@ -930,7 +936,7 @@ msgstr "Creado" msgid "Created %d new users" msgstr "Creados %d nuevos usuarios" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -954,7 +960,7 @@ msgstr "Actualmente agrupados por %s" msgid "Currently no bodies have been created." msgstr "No se han creado organismos aún." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Cliente no localizable" @@ -982,6 +988,11 @@ msgstr "Por defecto" msgid "Default priority" msgstr "Prioridad por defecto" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Crear reportes/actualizaciones como el Ayuntamiento" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Tipo por defecto" @@ -990,7 +1001,7 @@ msgstr "Tipo por defecto" msgid "Delete" msgstr "Eliminar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1002,8 +1013,8 @@ msgstr "Eliminar plantilla" msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Describa por qué está moderando esto" @@ -1019,17 +1030,18 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "La información detallada está limitada a %d caracteres." #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalles" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1061,8 +1073,8 @@ msgstr "Desactivar" msgid "Disabled:" msgstr "Desactivados:" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Descartar cambios" @@ -1071,11 +1083,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "¿Tiene una contraseña de %s?" @@ -1087,7 +1095,7 @@ msgstr "" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" @@ -1095,7 +1103,7 @@ msgstr "¿No te gustan los formularios?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Arrastre aquí su(s) foto(s) o haga clic para subirla(s)" @@ -1139,33 +1147,36 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Editar los detalles de otros usuarios" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Editar la categoría del reporte" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Moderar detalles del reporte" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Editar la prioridad del reporte" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Editar reportes" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "Editar detalles de usuarios/buscar sus reportes" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Sus actualizaciones" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1198,20 +1209,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email:" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Dirección de email" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "Dirección de email (opcional)" @@ -1223,6 +1234,15 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Email verificado:" @@ -1306,10 +1326,6 @@ msgstr "Introduzca un nombre de calle de Zürich" 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" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1359,11 +1375,11 @@ msgstr "Categoría existente" msgid "Existing users won't be modified." msgstr "Los usuarios existentes no serán modificados." -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Expandir mapa" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Explique qué es lo que está mal" @@ -1405,6 +1421,8 @@ msgstr "Campos adicionales" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Datos adicionales:" @@ -1426,6 +1444,11 @@ msgstr "Fallo en el envío del mensaje" msgid "Fields" msgstr "Campos" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1503,17 +1526,22 @@ msgstr "Para cada opción, Key es el valor almacenado en la bas msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Su contraseña" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "¿Olvidó su contraseña?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Enviado al órgano externo" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1571,7 +1599,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1634,7 +1662,7 @@ msgstr "Campo oculto" msgid "Hide all reports and updates" msgstr "Ocultar todos los reportes y actualizaciones" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Ocultar el reporte completo" @@ -1657,11 +1685,11 @@ msgstr "Ocultar mi nombre en este reporte" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Ocultar marcadores" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "¿Ocultar completamente la actualización?" @@ -1686,7 +1714,7 @@ msgstr "Inicio" msgid "How to report a problem" msgstr "Cómo notificar un problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" @@ -1750,7 +1778,7 @@ msgstr "" "Si dos o más organismos tienen la misma ubicación, FixMyStreet combina categorías de notificaciones idénticas en una sola entrada en\n" "el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Si nos está contactando acerca de un reporte o actualización específicas, por favor incluya un link al reporte en su mensaje." @@ -1862,7 +1890,7 @@ msgstr "Inspeccionar reporte" msgid "Inspection required" msgstr "Inspección requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instruir a contratistas que resuelvan los problemas" @@ -1882,8 +1910,8 @@ msgstr "Valor inválido para agency_responsible %s" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Ubicación inválida. La nueva ubicación debe estar cubierta por el mismo ayuntamiento." @@ -1895,13 +1923,6 @@ msgstr "A menudo es más rápido consultar nuestro Listado de Pre msgid "It’s on its way to the council right now." msgstr "De camino al ayuntamiento en este momento." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Mantener mi sesión abierta en este ordenador" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1941,6 +1962,7 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1966,7 +1988,7 @@ msgstr "Listar todos los problemas notificados" msgid "Loading reports…" msgstr "Cargando reportes..." -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Cargando..." @@ -1992,23 +2014,22 @@ msgstr "Alertas locales" msgid "Locate the problem on a map of the area" msgstr "Señale en el mapa de la zona la localización del problema" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Iniciar sesión con Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Iniciar sesión con Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Iniciar sesión con email" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Iniciar sesión con email/mensaje de texto" @@ -2020,7 +2041,7 @@ msgstr "Cerrar todas las sesiones" msgid "Look up" msgstr "Buscar" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAPA" @@ -2028,7 +2049,7 @@ msgstr "MAPA" msgid "Make anonymous on all reports and updates" msgstr "Volver anónimo en todos los reportes y actualizaciones" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2036,7 +2057,7 @@ msgstr "" msgid "Manual order" msgstr "Orden manual" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr " Mapa" @@ -2048,11 +2069,11 @@ msgstr "Marcado como enviado" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Señalar como marcados aquellos usuarios cuyo comportamiento desea observar." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Mensaje:" @@ -2072,24 +2093,25 @@ msgstr "Órganos faltantes:" msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderar" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Moderar detalles del reporte" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderar este reporte" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderar esta actualización" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Moderado por %s el %s" @@ -2098,6 +2120,12 @@ msgstr "Moderado por %s el %s" msgid "Moderated by division within one working day" msgstr "Moderado por el organismo durante el siguiente día laborable" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Moderar este reporte" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2123,9 +2151,9 @@ msgstr "Más comentado" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nombre" @@ -2138,6 +2166,12 @@ msgstr "Nombre" msgid "Name:" msgstr "Nombre:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navegar a éste problema" @@ -2206,6 +2240,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nueva contraseña:" @@ -2290,11 +2326,18 @@ msgstr "" msgid "Next" msgstr "Siguiente" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Siguiente" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2307,6 +2350,11 @@ msgstr "Siguiente" msgid "No" msgstr "No" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Su cuenta" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2315,7 +2363,7 @@ msgstr "" msgid "No body" msgstr "Sin órgano administrativo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -2348,7 +2396,7 @@ msgstr "No hubieron inspecciones en el rango de fechas seleccionado." msgid "No reports to show on map, here are some nearby:" msgstr "No hay reportes para mostrar en el mapa, aquí hay algunos cercanos:" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ningún resultado devuelto" @@ -2426,16 +2474,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Ahora a enviar tu notificación…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Numero de problemas reportados en cada categoría en los últimos 7 días." @@ -2444,15 +2482,15 @@ msgstr "Numero de problemas reportados en cada categoría en los últimos 7 día msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2504,6 +2542,14 @@ msgstr "Especificación Open311" msgid "Options" msgstr "Opciones" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "O suscríbase por RSS" @@ -2512,15 +2558,15 @@ msgstr "O suscríbase por RSS" msgid "Order" msgstr "Orden" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2556,15 +2602,13 @@ msgstr "Padre" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Enlace permanente" @@ -2581,16 +2625,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Número de teléfono" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación." + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Teléfono verificado:" @@ -2601,12 +2651,14 @@ msgstr "Teléfono verificado:" msgid "Phone:" msgstr "Teléfono:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2620,7 +2672,7 @@ msgstr "Teléfono:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "La foto es obligatoria." @@ -2628,12 +2680,12 @@ msgstr "La foto es obligatoria." msgid "Photo required" msgstr "Foto obligatoria" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "No se pudo cargar la foto." #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2654,7 +2706,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" @@ -2674,7 +2726,7 @@ msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2683,15 +2735,15 @@ msgid "Please check your phone number is correct" msgstr "Por favor verifique que su número de teléfono es correcto" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Por favor, elija una categoría" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Por favor elija una contraseña menos habitual" @@ -2716,12 +2768,12 @@ msgid "Please do not be abusive — abusing your council devalues the s 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2729,8 +2781,8 @@ msgstr "Por favor escriba su mensaje." msgid "Please enter a mobile number" msgstr "Por favor ingrese un número de celular o móvil" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Por favor ingrese un nombre" @@ -2740,22 +2792,22 @@ msgstr "Por favor ingrese un nombre para éste órgano" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" @@ -2764,13 +2816,13 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Por favor ingrese un email o número de teléfono válidos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" @@ -2780,39 +2832,39 @@ msgstr "Por favor, describa los detalles más relevantes" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2839,8 +2891,8 @@ msgstr "Por favor genere un código de dos factores e ingréselo a continuación msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "Por favor asegúrese de que su contraseña tenga al menos %d caracteres" @@ -2852,7 +2904,7 @@ msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento. msgid "Please note your report has not yet been sent." msgstr "Tome en cuenta que su reporte aún no ha sido enviado. " -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Por favor, tenga en cuenta la notificación no ha sido enviada aún. Elija una categoría y añada más información a continuación antes de enviar." @@ -2866,11 +2918,11 @@ msgstr "Tome en cuenta que su actualización aún no ha sido publicada%s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -2976,14 +3026,10 @@ msgstr "Privacidad y cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Detalles privados" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3006,7 +3052,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s" msgid "Problem breakdown by state" msgstr "Desglose de problemas según estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -3015,7 +3061,6 @@ msgid "Problem state change based on survey results" msgstr "El estado del problema cambió debido a los resultados de la encuesta" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3040,7 +3085,7 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemas en un radio de %.1fkm de %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3065,26 +3110,26 @@ msgstr "" msgid "Property address:" msgstr "Dirección de la propiedad:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Proporcionar una actualización" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Detalles públicos" @@ -3153,7 +3198,7 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3178,7 +3223,7 @@ msgstr "Listado RSS de actualizaciones sobre este problema" msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3222,9 +3267,9 @@ msgstr "Eliminar marca" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3256,14 +3301,14 @@ msgid "Report ID:" msgstr "ID del reporte:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Notificar un problema" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Reportar un problema aquí" @@ -3273,13 +3318,13 @@ msgstr "Reportar un problema aquí" msgid "Report abuse" msgstr "Denunciar abuso" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "Reportar otro problema aquí" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Reportar como" @@ -3306,8 +3351,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -3316,8 +3361,8 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -3326,31 +3371,31 @@ msgstr "Notificado por %s en %s" msgid "Reported by:" msgstr "Reportado por:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Notificado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 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:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vía %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Notificado vía %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 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" @@ -3361,7 +3406,7 @@ msgstr "Reportado:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3370,17 +3415,23 @@ msgstr "Notificando un problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Notificaciones" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 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." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Informes en espera de aprobación" @@ -3401,7 +3452,7 @@ msgstr "" msgid "Reports published" msgstr "Notificaciones publicadas" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3461,20 +3512,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Revertir al original" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Revertir al texto original" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Revertir al título original" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "¿Es correcto el lugar?" @@ -3486,15 +3537,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3505,7 +3556,7 @@ msgstr "Rotar a la derecha" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotar esta foto descartará los cambios del reporte que no hayan sido guardados." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" @@ -3519,8 +3570,8 @@ msgstr "Guardar como duplicado y cerrar " #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3535,7 +3586,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3575,13 +3626,12 @@ msgstr "La búsqueda no encontró usuarios." msgid "Security" msgstr "Seguridad" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Vea nuestra política de privacidad" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3611,7 +3661,7 @@ msgstr "" msgid "Select:" msgstr "Seleccionar:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Enviar" @@ -3628,11 +3678,11 @@ msgstr "Enviar email de inicio de sesión" msgid "Sending a confirmation text failed: \"%s\"" msgstr "El envío del texto de confirmación falló: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -3664,9 +3714,9 @@ msgid "Share" msgstr "Compartir" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3674,19 +3724,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "¿Mostrar la foto?" @@ -3698,7 +3748,7 @@ msgstr "Mostrar todas las actualizaciones" msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "¿Mostrar nombre publicamente?" @@ -3710,17 +3760,17 @@ msgstr "Mostrar los más antiguos" msgid "Show older reports" msgstr "Mostrar los reportes más antiguos" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Mostrar foto" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "Mostrar nombre de la persona que reporta" @@ -3728,20 +3778,20 @@ msgstr "Mostrar nombre de la persona que reporta" msgid "Show reports in your area" msgstr "Mostrar reportes en tu área" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Iniciar sesión" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Iniciar sesión por email, proveyendo una nueva contraseña. Al seguir el enlace incluido en el email, su contraseña será actualizada." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Iniciar sesión a través de email o de mensaje de texto, definiendo una nueva contraseña. La contraseña se actualizará al hacer clic en el enlace enviado por email, o al ingresar el código de autenticación enviado por SMS." @@ -3750,6 +3800,11 @@ msgstr "Iniciar sesión a través de email o de mensaje de texto, definiendo una msgid "Sign in or create an account" msgstr "Iniciar sesión o crear una cuenta" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Asignar contraseña" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3794,15 +3849,15 @@ msgstr "Lo sentimos, el código es incorrecto" 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Lo sentimos, no hemos podido encontrar ese lugar." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Lo sentimos, no fue posible iniciar su sesión. Por favor complete el formulario a continuación." @@ -3812,7 +3867,7 @@ msgstr "Lo sentimos, no fue posible iniciar su sesión. Por favor complete el fo 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Perdón, no pudimos guardar la(s) imágenes, por favor intente nuevamente." @@ -3858,13 +3913,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3883,14 +3938,13 @@ msgid "State:" msgstr "Estado/Prov.:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3919,7 +3973,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Subcategoría" @@ -3927,21 +3981,22 @@ msgstr "Subcategoría" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Título" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Título:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Enviar" @@ -3991,8 +4046,7 @@ msgid "Summarise your changes" msgstr "Resuma sus cambios" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4026,18 +4080,22 @@ msgstr "" msgid "Survey Results" msgstr "Resultados de la Encuesta" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Plantilla «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Plantillas" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -4048,6 +4106,7 @@ msgstr "Versión solo texto" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4081,7 +4140,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así 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 "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." @@ -4095,7 +4154,6 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." @@ -4108,27 +4166,27 @@ msgstr "El problema se ha marcado como enviado." msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Esa notificación no se puede ver en %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "Los detalles personales de ese usuario han sido eliminados." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "Los reportes y actualizaciones de ese usuario han sido ocultados." @@ -4278,7 +4336,7 @@ msgstr "El archivo CSV debe contener una fila de encabezado, y los registros deb 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "Se ha enviado un email de inicio de sesión al usuario" @@ -4297,7 +4355,7 @@ msgstr "" msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "Ya existe una plantilla de respuesta automática para esta categoría/estado." @@ -4314,14 +4372,18 @@ msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Hubo un problema con su información de inicio de sesión. Si olvidó su contraseña, o no tiene una, por favor complete la sección ‘No’ del formulario." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 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." @@ -4329,10 +4391,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con su actualización. Por favor, vea más abajo." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Serán remitidos al ayuntamiento, pero no serán publicados en línea." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "No serán publicados en línea." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4361,15 +4434,6 @@ msgstr "Se publicarán en línea de acuerdo con nuestra política msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "Serán remitidos a %s y publicados en línea , de acuerdo con nuestra política de privacidad." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Serán remitidos al ayuntamiento, pero no serán publicados en línea." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "No serán publicados en línea." - #: 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." @@ -4405,10 +4469,10 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" @@ -4447,7 +4511,7 @@ msgstr "Este reporte es un duplicado. Por favor contribuya actualizando el repor #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." @@ -4463,7 +4527,7 @@ msgstr "Esta notificación está marcada como arreglada." msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "Este reporte ya no admite actualizaciones." @@ -4479,7 +4543,6 @@ msgid "Time spent (in minutes):" msgstr "Tiempo utilizado (en minutos):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4563,7 +4626,7 @@ msgstr "Traducciones" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4573,7 +4636,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4609,7 +4672,7 @@ msgstr "Desbloquear" msgid "Unconfirmed" msgstr "Sin confirmar" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Desconocido" @@ -4617,18 +4680,18 @@ msgstr "Desconocido" msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Error desconocido" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID de problema desconocido" @@ -4646,7 +4709,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4654,11 +4717,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:28 +#: templates/web/base/contact/index.html:31 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:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" @@ -4698,22 +4761,22 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "Actualizado por %s (%s) el %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "Actualizado por %s el %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "¡Actualizado!" @@ -4724,7 +4787,7 @@ msgstr "¡Actualizado!" msgid "Updates" msgstr "Actualizaciones" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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." @@ -4783,26 +4846,26 @@ msgstr "" msgid "User Import" msgstr "Importación de Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "Usuarios añadidos a la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "El usuario ya existe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "El usuario ya está en la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Usuario marcado" @@ -4826,10 +4889,8 @@ msgid "User:" msgstr "Usuario:" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuarios" @@ -4874,6 +4935,10 @@ msgstr "Ver notificaciones por barrio" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4904,7 +4969,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "Hemos enviado un código de confirmación a su teléfono. Por favor ingréselo a continuación:" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4965,7 +5030,7 @@ msgstr "¿Sobre cuales problemas quiere recibir alertas?" msgid "Which report is it a duplicate of?" msgstr "¿De cual reporte es un duplicado?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Tres fotos son suficientes." @@ -4993,17 +5058,15 @@ msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debe msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5017,11 +5080,11 @@ msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar corr msgid "Yes" msgstr "SÍ" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Ud. está desconectado" @@ -5029,11 +5092,11 @@ msgstr "Ud. está desconectado" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "Puede crear un nuevo reporte en la misma ubicación." @@ -5050,7 +5113,7 @@ msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que ocul msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Puede ponerse en contacto con el soporte técnico en %s" @@ -5075,11 +5138,11 @@ msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5087,7 +5150,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, póngase en contacto con nosotros, o vea su problema.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Ya ha adjuntado fotos a este reporte. Tome en cuenta que el máximo que puede adjuntar a este reporte son 3 fotos (si intenta cargar más, se eliminará la foto más antigua)." @@ -5168,11 +5231,11 @@ msgid "Your account" msgstr "Su cuenta" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" @@ -5181,9 +5244,9 @@ msgstr "Su email:" msgid "Your email address" msgstr "Su dirección de email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "Su email o número de celular/móvil" @@ -5191,9 +5254,7 @@ msgstr "Su email o número de celular/móvil" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Su información sólo será usada de acuerdo con nuestra política de privacidad" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Su nombre" @@ -5209,13 +5270,13 @@ msgstr "Su nombre está ahora oculto en todos sus reportes y actualizaciones." msgid "Your name has been hidden." msgstr "Su nombre ha sido ocultado." -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Su contraseña" @@ -5224,15 +5285,15 @@ msgstr "Su contraseña" msgid "Your password has been changed" msgstr "Su contraseña ha cambiado" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "Su contraseña debería incluir %d o más caracteres." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Su número de teléfono" @@ -5253,7 +5314,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Su token ha sido generado" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Sus actualizaciones" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "Su actualización ha sido guardada para ser enviada cuando esté conectado nuevamente. " @@ -5265,8 +5331,8 @@ msgstr "Sus actualizaciones" msgid "Your verification code is %s" msgstr "Su código de verificación es %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Usted" @@ -5284,13 +5350,15 @@ msgid "all" msgstr "todas" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "un administrador" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5316,7 +5384,7 @@ msgstr "por ejemplo, '%s' o '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "ej. ‘Bache de 50cm en la calle Ejemplo, cerca del buzón’" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "ej. ‘Este bache lleva al menos dos meses y...’" @@ -5354,6 +5422,16 @@ msgstr "ninguna" msgid "not the council's responsibility" msgstr "no es responsabilidad del ayuntamiento" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Iniciar sesión o crear una cuenta" + +#: templates/web/base/auth/create.html:13 +#, fuzzy +msgid "or sign in" +msgstr "Nuevos problemas para %s" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5390,12 +5468,12 @@ msgstr "salir" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "ayuntamiento" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5411,11 +5489,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5431,11 +5509,11 @@ msgstr "El usuario es del mismo ayuntamiento que el problema - %d" msgid "user is problem owner" msgstr "El usuario es el propietario del problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "el usuario no está en la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "usuario eliminado de la lista de abusos" @@ -5604,3 +5682,30 @@ msgid "report" msgid_plural "reports" msgstr[0] "reporte" msgstr[1] "reportes" + +#~ msgid "No let me sign in by email" +#~ msgstr "No- permítanme registrarme por email" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "No quiero iniciar sesión a través de email o mensaje de texto" + +#~ msgid "Edit other users' details" +#~ msgstr "Editar los detalles de otros usuarios" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Mantener mi sesión abierta en este ordenador" + +#~ msgid "Now to submit your report…" +#~ msgstr "Ahora a enviar tu notificación…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Ahora a enviar tu notificación…" + +#~ msgid "Private details" +#~ msgstr "Detalles privados" + +#~ 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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po index af25377ead5..7e8e2eaee16 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es_DO.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " y " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -161,7 +161,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcional)" @@ -181,9 +181,9 @@ msgstr "(enviado a ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Listado RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" @@ -217,7 +217,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -226,34 +226,24 @@ msgstr "" msgid "%s live problems" msgstr "%s notificaciones en curso" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "No- confirmar mi notificación por email" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "No- confirmar mi notificación por email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "No- confirmar mi actualización por email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "No- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "No- permítanme registrarme por email" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "No- permítanme registrarme por email" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota: Este informe ha sido enviado y espera una acción. Cualquier cambio realizado no será pasado." @@ -262,12 +252,15 @@ msgstr "Nota: Este informe ha sido enviado y espera una acción msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota: Este informe aún no se ha sido enviado por una acción. Cualquier cambio realizado podría no pasar." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "- tengo una contraseña" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Resuma el problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -333,9 +326,9 @@ msgstr "(Sin número de teléfono)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Añadir a la lista de pre-seleccionados" @@ -345,16 +338,15 @@ msgstr "Añadir a la lista de pre-seleccionados" msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Añadir/editar las categorias del problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Añadir/Editar las prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Añadir/Editar las plantillas de respuesta" @@ -362,7 +354,7 @@ msgstr "Añadir/Editar las plantillas de respuesta" msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados." @@ -382,7 +374,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" @@ -450,34 +443,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Una actualización marcó este problema como arreglado." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anónimo" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anónimo" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anónimo:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Otro usuario" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "¿Está seguro(a) que quiere cancelar esta carga?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Está seguro(a)?" @@ -514,7 +509,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Asignar usuarios a las áreas" @@ -548,6 +543,10 @@ msgstr "Respuesta automática:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Categorías disponibles" @@ -560,12 +559,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Evitar información personal y las placas de matrícula de los carros" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "En espera de revisión" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Atras" @@ -579,10 +578,8 @@ msgid "Ban user" msgstr "Marca usuario" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -619,7 +616,6 @@ msgid "Can't see the map? Skip this step" msgstr "¿No puedes ver el mapa? Salte este paso" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -652,7 +648,7 @@ msgstr "Categoría" msgid "Category and State" msgstr "Categoría" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de ‘%s’ a ‘%s’" @@ -662,6 +658,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -726,7 +723,7 @@ msgstr "" msgid "Choose another" msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Eliminar datos sin conexión" @@ -755,6 +752,10 @@ msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión." msgid "Click the link in that email to sign in." msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -767,7 +768,7 @@ msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión." msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -797,18 +798,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -822,8 +822,7 @@ msgstr "Confirmar" msgid "Confirm account" msgstr "Confirmar cuenta" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Como alternativa confirme por email, para lo cual tendrá que indicar una nueva contraseña. Cuando lo confirme, su contraseña será actualizada." @@ -842,7 +841,7 @@ msgstr "Confirmación" msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -853,16 +852,20 @@ msgstr "Confirmada:" msgid "Contact %s" msgstr "Contactar %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contáctenos" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contactar con el equipo" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -872,12 +875,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "No se pudo consultar la ubicación" @@ -913,6 +916,11 @@ msgstr "Creado" msgid "Create a report" msgstr "Crear una notificación" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Iniciar sesión o crear una cuenta" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -922,19 +930,16 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Crear informes/actualizaciones en nombre del usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Crear informes/actualizaciones como ayuntamiento" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Crear informes/actualizaciones en nombre del usuario" @@ -952,7 +957,7 @@ msgstr "Creado" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -978,7 +983,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "No se han creado organismos aún." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Cliente imposible de contactar" @@ -1007,6 +1012,11 @@ msgstr "" msgid "Default priority" msgstr "Crear prioridad" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Crear informes/actualizaciones como ayuntamiento" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Tipo de defecto" @@ -1016,7 +1026,7 @@ msgstr "Tipo de defecto" msgid "Delete" msgstr "Eliminado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1028,8 +1038,8 @@ msgstr "Eliminar plantilla" msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Describe el motivo de la moderación" @@ -1045,17 +1055,18 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalles" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1087,8 +1098,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Desechar cambios" @@ -1097,11 +1108,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "No enviar alertas por email en los comentarios recopilados para el creador del problema" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "¿Tiene una contraseña %s?" @@ -1113,7 +1120,7 @@ msgstr "" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" @@ -1121,7 +1128,7 @@ msgstr "¿No te gustan los formularios?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Deslice y deje las fotos aquí o haga clic para subir" @@ -1165,33 +1172,36 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Editar los detalles de otros usuarios" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Editar la categoría del informe" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Moderar los detalles del informe" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Editar la prioridad del informe" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Editar los informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Sus actualizaciones" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1224,20 +1234,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email:" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Dirección de email" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Dirección de email" @@ -1250,6 +1260,15 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1339,11 +1358,6 @@ msgstr "Introduzca un nombre de calle de Zürich" 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" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1394,11 +1408,11 @@ msgstr "Categoría existente" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Explicar el problema" @@ -1443,6 +1457,8 @@ msgstr "Detalles adicionales" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Datos adicionales:" @@ -1465,6 +1481,11 @@ msgstr "Fallo en el envío del mensaje" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1542,17 +1563,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Su contraseña" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "¿Olvidó su contraseña?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Reenviado al organismo administrativo externo" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Deseo reenviado al organismo administrativo externo" @@ -1610,7 +1636,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Permitir el acceso al administrador" @@ -1678,7 +1704,7 @@ msgstr "Oculto" msgid "Hide all reports and updates" msgstr "Señalizar informes y usuarios" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Ocultar el reporte entero" @@ -1701,11 +1727,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Ocultar marcadores" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Ocultar actualización entero" @@ -1730,7 +1756,7 @@ msgstr "Inicio" msgid "How to report a problem" msgstr "Cómo notificar un problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" @@ -1794,7 +1820,7 @@ msgstr "" "Si dos o más organismos tienen la misma ubicación, CuidoMiCiudad combina categorías de notificaciones idénticas en una sola entrada en\n" "el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1918,7 +1944,7 @@ msgstr "" msgid "Inspection required" msgstr "Inspección requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Dar instrucciones a los contratistas para que solucionen los problemas" @@ -1938,8 +1964,8 @@ msgstr "Valor inválido para agency_responsible %s" msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Ubicación equivocada. Una nueva ubicación debe estar bajo la protección del mismo ayuntamiento." @@ -1951,13 +1977,6 @@ msgstr "A menudo es más rápido consultar nuestro Listado de Pre msgid "It’s on its way to the council right now." msgstr "De camino al ayuntamiento en este momento." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Mantener mi sesión abierta en este ordenador" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1997,6 +2016,7 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2023,7 +2043,7 @@ msgstr "Listar todos los problemas notificados" msgid "Loading reports…" msgstr "Editar los informes" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Cargando..." @@ -2049,23 +2069,22 @@ msgstr "Alertas locales" msgid "Locate the problem on a map of the area" msgstr "Señale en el mapa de la zona la localización del problema" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Iniciar sesión con Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Iniciar sesión con Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Iniciar sesión con email" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 #, fuzzy msgid "Log in with email/text" msgstr "Iniciar sesión con email" @@ -2078,7 +2097,7 @@ msgstr "" msgid "Look up" msgstr "Buscar" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAPA" @@ -2086,7 +2105,7 @@ msgstr "MAPA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Administrar los pre-seleccionados" @@ -2094,7 +2113,7 @@ msgstr "Administrar los pre-seleccionados" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr " Mapa" @@ -2106,11 +2125,11 @@ msgstr "Marcado como enviado" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Señalar como marcados aquellos usuarios cuyo comportamiento desea observar." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "Marcar los detalles del problema" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Mensaje:" @@ -2130,24 +2149,25 @@ msgstr "Organismos administrativos perdidos:" msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderar" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Moderar los detalles del informe" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderar este informe" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderar este actualización" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Moderado por %s a %s" @@ -2156,6 +2176,12 @@ msgstr "Moderado por %s a %s" msgid "Moderated by division within one working day" msgstr "Moderado por el organismo durante el siguiente día laborable" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Motivo de moderación" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2181,9 +2207,9 @@ msgstr "Lo más comentado" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nombre" @@ -2196,6 +2222,12 @@ msgstr "Nombre" msgid "Name:" msgstr "Nombre:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Las actualizaciones están limitadas a %s caracteres. Por favor acorte su actualización." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navegue a este problema" @@ -2266,6 +2298,8 @@ msgid "New note to DM:" msgstr "Nota nueva al DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Contraseña nueva:" @@ -2352,11 +2386,18 @@ msgstr "Lo más reciente" msgid "Next" msgstr "Siguiente" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Siguiente" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2369,6 +2410,11 @@ msgstr "Siguiente" msgid "No" msgstr "No" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Su cuenta" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Sin área" @@ -2377,7 +2423,7 @@ msgstr "Sin área" msgid "No body" msgstr "Sin órgano administrativo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -2410,7 +2456,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ningún resultado devuelto" @@ -2490,16 +2536,6 @@ msgstr "Notas de SDM a DM" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Ahora a enviar tu notificación…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2508,15 +2544,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Datos sin conexión eliminados" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2569,6 +2605,14 @@ msgstr "Especificación Open311" msgid "Options" msgstr "opcional" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2577,15 +2621,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2622,15 +2666,13 @@ msgstr "Padre" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Enlace permanente" @@ -2649,16 +2691,22 @@ msgid "Phone Reporter:" msgstr "Notificado:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Número de teléfono" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación." + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2670,12 +2718,14 @@ msgstr "Notificado:" msgid "Phone:" msgstr "Teléfono:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2689,7 +2739,7 @@ msgstr "Teléfono:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto es obligatoria." @@ -2697,12 +2747,12 @@ msgstr "Foto es obligatoria." msgid "Photo required" msgstr "Foto es obligatoria" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2723,7 +2773,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" @@ -2743,7 +2793,7 @@ msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2753,15 +2803,15 @@ msgid "Please check your phone number is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Por favor, elija una categoría" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2783,12 +2833,12 @@ msgid "Please do not be abusive — abusing your council devalues the s 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2797,8 +2847,8 @@ msgstr "Por favor escriba su mensaje." msgid "Please enter a mobile number" msgstr "Por favor, introduzca su número de telefono" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Por favor, indique un nombre" @@ -2808,22 +2858,22 @@ msgstr "Por favor, indique un nombre para este organismo" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" @@ -2832,14 +2882,14 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Por favor, introduzca su número de telefono" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" @@ -2849,39 +2899,39 @@ msgstr "Por favor, describa los detalles más relevantes" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2908,8 +2958,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2921,7 +2971,7 @@ msgstr "Tenga en cuenta que las actualizaciones no son enviadas al ayuntamiento. msgid "Please note your report has not yet been sent." msgstr "Por favor, tenga en cuenta que su informe no ha sido aún enviado." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Por favor, tenga en cuenta la notificación no ha sido enviada aún. Elija una categoría y añada más información a continuación antes de enviar." @@ -2935,12 +2985,12 @@ msgstr "Por favor, tenga en cuenta que su actualización no ha sido aún msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Por favor, proveer una actualización pública para este reporte." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Por favor, proveer una actualización pública para este reporte." @@ -2973,15 +3023,15 @@ msgstr "Por favor, seleccione el tipo de alerta que desea" msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique si el problema se ha solucionado" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Por favor, suba solo una imagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2989,9 +3039,7 @@ msgstr "" msgid "Please write a message" msgstr "Por favor, escriba un mensaje" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Publicar" @@ -3000,19 +3048,19 @@ msgstr "Publicar" msgid "Postcode or street name and area" msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Publicado de forma anónima - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -3047,14 +3095,10 @@ msgstr "Privacidad y cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Detalles privado" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3077,7 +3121,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s" msgid "Problem breakdown by state" msgstr "Desglose de problemas según estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -3086,7 +3130,6 @@ msgid "Problem state change based on survey results" msgstr "El estado del problema cambió debido a los resultados de la encuesta" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3113,7 +3156,7 @@ msgstr "Problemas recientemente notificados como arreglados en CuidoMiCiudad" msgid "Problems within %.1fkm of %s" msgstr "Problemas en %.1fkm alrededor" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3139,26 +3182,26 @@ msgstr "Problemas dentro %s, %s" msgid "Property address:" msgstr "Dirección de la propiedad:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Proporcionar una actualización" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Proporcionar la actualización como" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Detalles públicos" @@ -3227,7 +3270,7 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3252,7 +3295,7 @@ msgstr "Listado RSS de actualizaciones sobre este problema" msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Recibido por unos %s momentos tarde" @@ -3299,9 +3342,9 @@ msgstr "Eliminar marca" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Eliminar de los pre-seleccionados" @@ -3333,14 +3376,14 @@ msgid "Report ID:" msgstr "ID del informe:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Notificar un problema" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3351,14 +3394,14 @@ msgstr "Notificar un problema" msgid "Report abuse" msgstr "Denunciar abuso" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Notificar un problema" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Notificar como:" @@ -3386,8 +3429,8 @@ msgstr "Notifique, consulte o discuta problemas locales" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" @@ -3396,8 +3439,8 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -3406,31 +3449,31 @@ msgstr "Notificado por %s en %s" msgid "Reported by:" msgstr "Notificado por:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Notificado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 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:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vía %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Notificado vía %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 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" @@ -3441,7 +3484,7 @@ msgstr "Notificado:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3450,17 +3493,23 @@ msgstr "Notificando un problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Informes" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 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." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Las notificaciones tienen una longitud máxima de %s. Por favor, acorte su notificación." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Informes en espera de aprobación" @@ -3482,7 +3531,7 @@ msgstr "" msgid "Reports published" msgstr "Notificaciones publicadas" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3545,20 +3594,20 @@ msgstr "Plantillas de respuesta" msgid "Response Templates for %s" msgstr "Plantillas de respuesta por %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Volver al texto original" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Volver al texto original" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Volver al titulo original" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "¿Es correcto el lugar?" @@ -3570,15 +3619,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3589,7 +3638,7 @@ msgstr "Rotar a la derecha" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotar esta foto eliminará los cambios no guardados al informe." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" @@ -3603,8 +3652,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3619,7 +3668,7 @@ msgid "Save with a public update" msgstr "Guardar con una actualización pública" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "Guardando reportes sin conexión" @@ -3659,13 +3708,12 @@ msgstr "La búsqueda no encontró usuarios." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Ver nuestra política de privacidad" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3696,7 +3744,7 @@ msgstr "" msgid "Select:" msgstr "Seleccionar:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3714,11 +3762,11 @@ msgstr "Iniciar sesión con email" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Devolver el informe" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -3751,9 +3799,9 @@ msgid "Share" msgstr "Compartir" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Pre-seleccionados" @@ -3761,19 +3809,19 @@ msgstr "Pre-seleccionados" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Entre los pre-seleccionados" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Pre-seleecionados por %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Mostrar foto" @@ -3785,7 +3833,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Mostrar el nombre públicamente" @@ -3799,17 +3847,17 @@ msgstr "Mostrar antiguos" msgid "Show older reports" msgstr "Buscar informes" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Mostrar foto" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "Mostrar el nombre del reportero" @@ -3817,20 +3865,20 @@ msgstr "Mostrar el nombre del reportero" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Iniciar sesión" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Inicie sesión con su dirección de email, proporcionando una nueva contraseña. Cuando haga click en el enlace en su correo electrónico su clave será actualizada." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 #, fuzzy msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Inicie sesión con su dirección de email, proporcionando una nueva contraseña. Cuando haga click en el enlace en su correo electrónico su clave será actualizada." @@ -3840,6 +3888,11 @@ msgstr "Inicie sesión con su dirección de email, proporcionando una nueva cont msgid "Sign in or create an account" msgstr "Iniciar sesión o crear una cuenta" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Introduzca una contraseña" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3885,15 +3938,15 @@ msgstr "Lo sentimos, este no fue’ un enlace válido" 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Lo sentimos, no hemos podido encontrar ese lugar." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Lo sentimos, pero pudimos iniciar la sesión. Por favor, llena el siguiente formulario." @@ -3903,7 +3956,7 @@ msgstr "Lo sentimos, pero pudimos iniciar la sesión. Por favor, llena el sigui 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Lo sentimos, no pudimos guardar su(s) imagen(es), por favor inténtelo de nuevo." @@ -3947,13 +4000,13 @@ msgstr "Fecha de inicio:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3973,15 +4026,14 @@ msgid "State:" msgstr "Estado/Prov.:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Estado" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4011,7 +4063,7 @@ msgstr "Vista de calle" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Subcategoria: %s" @@ -4020,21 +4072,22 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Título" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Título:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Enviar" @@ -4086,8 +4139,7 @@ msgid "Summarise your changes" msgstr "Resuma sus cambios" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4122,18 +4174,22 @@ msgstr "Los súperusuarios tienen el permiso de realizar todas las accio msgid "Survey Results" msgstr "Resultados de la Encuesta" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Plantilla «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Plantillas" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -4144,6 +4200,7 @@ msgstr "Versión solo texto" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4177,7 +4234,7 @@ msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así 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 "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si había notificado un problema a un ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." @@ -4191,7 +4248,6 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." @@ -4204,28 +4260,28 @@ msgstr "El problema se ha marcado como enviado." msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Esa notificación no se puede ver en %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4373,7 +4429,7 @@ msgstr "" 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad." @@ -4393,7 +4449,7 @@ msgstr "" msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4410,15 +4466,19 @@ msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 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." @@ -4426,10 +4486,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con su actualización. Por favor, vea más abajo." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Estos serán enviados al ayuntamiento, pero nunca se mostrarán online." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Estos nunca se mostrarán online." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4459,15 +4530,6 @@ msgstr "Estos serán publicados online para que otros los vean: de acuerdo con n msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "Estos serán enviados al %s y también publicados online para que otros los vean, de acuerdo a nuestra política de privacidad." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Estos serán enviados al ayuntamiento, pero nunca se mostrarán online." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Estos nunca se mostrarán online." - #: 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." @@ -4503,10 +4565,10 @@ msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cub 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" @@ -4545,7 +4607,7 @@ msgstr "Ese reporte es duplicado. Por favor, actualizar el reporte original:" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." @@ -4561,7 +4623,7 @@ msgstr "Esta notificación está marcada como arreglada." msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Esta notificación está marcada como abierta." @@ -4578,7 +4640,6 @@ msgid "Time spent (in minutes):" msgstr "Tiempo invertido (en minutos):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4662,7 +4723,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "Confiables por los organismos administrativos:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Acreditado para hacer informes que no requieren inspección" @@ -4672,7 +4733,7 @@ msgstr "Acreditado:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4708,7 +4769,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Sin confirmar" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Desconocido" @@ -4716,18 +4777,18 @@ msgstr "Desconocido" msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Error desconocido" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID de problema desconocido" @@ -4746,7 +4807,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4754,11 +4815,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:28 +#: templates/web/base/contact/index.html:31 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:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" @@ -4798,24 +4859,24 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Publicado por %s - %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "¡Actualizado!" @@ -4826,7 +4887,7 @@ msgstr "¡Actualizado!" msgid "Updates" msgstr "Actualizaciones" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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." @@ -4881,28 +4942,28 @@ msgstr "ID de usuario a quien atribuir los comentarios obtenidos" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Email añadido a lista de abusones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Usuario marcado" @@ -4928,10 +4989,8 @@ msgid "User:" msgstr "Usuarios" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuarios" @@ -4979,6 +5038,10 @@ msgstr "Ver notificaciones por barrio" msgid "View wards" msgstr "otras áreas:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5009,7 +5072,7 @@ msgstr "Hemos encontrado más de una coincidencia para el problema de referencia msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5070,7 +5133,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "¿Ese reporte es un reporte duplicado de qué reporte?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "¡Espere! Tres fotos son suficientes." @@ -5098,17 +5161,15 @@ msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debe msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5122,11 +5183,11 @@ msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar corr msgid "Yes" msgstr "SÍ" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Está sin conexion" @@ -5134,11 +5195,11 @@ msgstr "Está sin conexion" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Usted puede ver el problema en este sitio." @@ -5156,7 +5217,7 @@ msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que ocul msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Puede ponerse en contacto con el soporte técnico en %s" @@ -5181,11 +5242,11 @@ msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5193,7 +5254,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, póngase en contacto con nosotros, o vea su problema.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Ya ha adjuntado fotos a este informe. Tenga en cuenta que solo puede adjuntar un máximo de 3 a este informe (si intenta subir más, las más antiguas serán desechadas)." @@ -5278,11 +5339,11 @@ msgid "Your account" msgstr "Su cuenta" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" @@ -5291,9 +5352,9 @@ msgstr "Su email:" msgid "Your email address" msgstr "Su dirección de email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Su dirección de email" @@ -5302,9 +5363,7 @@ msgstr "Su dirección de email" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Su información sólo será usada de acuerdo con nuestra política de privacidad" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Su nombre" @@ -5320,13 +5379,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Su contraseña" @@ -5335,15 +5394,15 @@ msgstr "Su contraseña" msgid "Your password has been changed" msgstr "Su contraseña ha cambiado" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Su número de teléfono" @@ -5365,7 +5424,12 @@ msgstr "Sus pre-seleccionados" msgid "Your token has been generated" msgstr "Su contraseña ha cambiado" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Sus actualizaciones" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "Su reporte está guardado para subir cuando tenga una conexión internet." @@ -5377,8 +5441,8 @@ msgstr "Sus actualizaciones" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Usted mismo" @@ -5397,13 +5461,15 @@ msgid "all" msgstr "todo" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5430,7 +5496,7 @@ msgstr "por ejemplo, '%s' o '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Un bache de 25 centímetros en Calle Ejemplo, cerca al buzón de correos" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Este bache ha estado aquí dos meses y ..." @@ -5470,6 +5536,15 @@ msgstr "nada" msgid "not the council's responsibility" msgstr "marcado como que el ayuntamiento no es responsable" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Iniciar sesión o crear una cuenta" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5506,12 +5581,12 @@ msgstr "salir" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "ayuntamiento" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5528,11 +5603,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5548,12 +5623,12 @@ msgstr "El usuario es del mismo ayuntamiento que el problema - %d" msgid "user is problem owner" msgstr "El usuario es el propietario del problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Email ya incluido en la lista de abusones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Eliminar de los pre-seleccionados" @@ -5724,11 +5799,37 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Introduzca una contraseña" +#~ msgid "No let me sign in by email" +#~ msgstr "No- permítanme registrarme por email" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "No- permítanme registrarme por email" + +#~ msgid "Edit other users' details" +#~ msgstr "Editar los detalles de otros usuarios" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Mantener mi sesión abierta en este ordenador" + +#~ msgid "Now to submit your report…" +#~ msgstr "Ahora a enviar tu notificación…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Ahora a enviar tu notificación…" + +#~ msgid "Private details" +#~ msgstr "Detalles privado" + +#~ 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." -#~ msgid "Moderation reason:" -#~ msgstr "Motivo de moderación" +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." #, fuzzy #~ msgid "New" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index a48932e0cb8..170cd55144b 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: 2018-09-06 20:57+0000\n" "Last-Translator: fixmystreetfr , 2018\n" "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n" @@ -22,13 +22,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " et " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -166,7 +166,7 @@ msgstr "(n'existe plus)" msgid "(not sent to council)" msgstr "(non signalé à l’administration)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(facultatif)" @@ -184,9 +184,9 @@ msgstr "(envoyé aux deux)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(nous avons également des flux RSS pour les problèmes internes%s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" @@ -218,7 +218,7 @@ msgstr "

Rapports, statistiques et actions pour

%s

" msgid " %s reports %s" msgstr " %s les rapports %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%senregistré." @@ -227,31 +227,22 @@ msgstr "%senregistré." msgid "%s live problems" msgstr "%s problèmes actifs" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Non, laissez-moi confirmer mon rapport par email :" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "Non Permettez-moi de confirmer mon rapport par email/texte" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Non, laissez-moi confirmer ma mise à jour par email :" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "Non Laissez-moi confirmer ma mise à jour par email/texte" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Non, laissez-moi m'authentifier par email :" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "Non, laissez-moi m’authentifier par email or texte" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr " Remarque: Ce rapport a été envoyé pour action. Toutes les modifications apportées ne seront pas transmises." @@ -260,12 +251,15 @@ msgstr " Remarque: Ce rapport a été envoyé pour action. Tou msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr " Remarque: Ce rapport n'a pas encore été envoyé pour action. Toutes les modifications apportées ne peuvent pas être transmises." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Oui, j'ai un mot de passe :" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Résumer le problème" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Activer l’authentification à deux facteurs" @@ -328,9 +322,9 @@ msgstr "Ajouter un táláphone" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Ajouter à la liste" @@ -340,16 +334,15 @@ msgstr "Ajouter à la liste" msgid "Add user" msgstr "Ajouter un utilisateur" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Ajouter/modifier des catégories de problèmes" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Ajouter/modifier les priorités de réponse" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Ajouter/modifier des modèles de réponse" @@ -357,7 +350,7 @@ msgstr "Ajouter/modifier des modèles de réponse" msgid "Added %s" msgstr "Ajouté %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s." @@ -377,7 +370,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "M'alerter de futures mises à jour" @@ -444,33 +438,35 @@ msgstr "Toujours chercher tous les problèmes" msgid "An update marked this problem as fixed." msgstr "Une mise à jour a marqué ce problème comme résolu" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonyme" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Utilisateur anonyme" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonyme :" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "un autre utilisateur" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Êtes-vous sûr de vouloir annuler cet envoi ?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" @@ -507,7 +503,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:" msgid "Assign to subdivision:" msgstr "Affecté à la subdivision:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Affecter des utilisateurs aux zones" @@ -540,6 +536,10 @@ msgstr "Réponse automatique:" msgid "Automated" msgstr "Automatique" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Catégories disponibles" @@ -552,12 +552,12 @@ msgstr "Temps moyen entre un problème signalé et corrigé sur les 100 derniers msgid "Avoid personal information and vehicle number plates" msgstr "Évitez les renseignements personnels et les plaques d'immatriculation" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "En attente de modération" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Retour" @@ -570,10 +570,8 @@ msgid "Ban user" msgstr "Bannir un utilisateur" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -610,7 +608,6 @@ msgid "Can't see the map? Skip this step" msgstr "Vous ne pouvez pas voir le plan ? Sautez cette étape" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -642,7 +639,7 @@ msgstr "Catégorie" msgid "Category and State" msgstr "Catégorie et Statistique" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Changement de catégorie de ‘%s’ à ‘%s’" @@ -652,6 +649,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -715,7 +713,7 @@ msgstr "" msgid "Choose another" msgstr "Choisissez un autre" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Effacer les données hors ligne" @@ -743,6 +741,10 @@ msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connec msgid "Click the link in that email to sign in." msgstr "Cliquez sur le lien dans ce courrier électronique pour vous connecter." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -755,7 +757,7 @@ msgstr "Cliquez sur le lien dans ce courrier électronique pour vous conne msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Clos par l'administration" @@ -784,18 +786,17 @@ msgid "Cobrand:" msgstr "Collaboration :" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Code" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "Réduire la carte" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" @@ -809,8 +810,7 @@ msgstr "Confirmer" msgid "Confirm account" msgstr "Confirmer le compte" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Confirmez par email à la place, Si vous fournissez un nouveau mot de passe à cette étape, lorsque vous confirmez, votre mot de passe sera mis à jour." @@ -829,7 +829,7 @@ msgstr "Confirmation" msgid "Confirmed" msgstr "Confirmé" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -840,16 +840,20 @@ msgstr "Confirmé :" msgid "Contact %s" msgstr "Contacter %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Nous contacter" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contacter l'équipe" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "Convertir l’emplacement Est/Nord" @@ -859,12 +863,12 @@ msgstr "Convertir l’emplacement Est/Nord" msgid "Coordinates:" msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Le lieu n'a pas pu être trouvé" @@ -899,6 +903,11 @@ msgstr "Créer" msgid "Create a report" msgstr "Créer un rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Connectez-vous ou créez un compte" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -908,18 +917,15 @@ msgstr "Créer une catégorie" msgid "Create priority" msgstr "Créer une priorité" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "Créer un rapports / une mises à jour en tant qu'utilisateur anonyme" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Créer des rapports/mises à jour de l'administration" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur" @@ -937,7 +943,7 @@ msgstr "Créé" msgid "Created %d new users" msgstr "Création %d de nouveaux utilisateurs" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -961,7 +967,7 @@ msgstr "Actuellement regroupé par %s" msgid "Currently no bodies have been created." msgstr "Pour l'instant, aucun intelocuteur n'a été créé." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Le client est injoignable" @@ -989,6 +995,11 @@ msgstr "Défaut" msgid "Default priority" msgstr "Priorité par défaut" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Créer des rapports/mises à jour de l'administration" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Type de défaut" @@ -997,7 +1008,7 @@ msgstr "Type de défaut" msgid "Delete" msgstr "Effacer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1009,8 +1020,8 @@ msgstr "Supprimer le modèle" msgid "Deleted" msgstr "Effacé" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Décrivez pourquoi vous modérez ceci" @@ -1026,17 +1037,18 @@ msgstr "Description" msgid "Description:" msgstr "Description :" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "Les informations détaillées se à %d caractàre." #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Détails :" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1068,8 +1080,8 @@ msgstr "Désactiver" msgid "Disabled:" msgstr "Désactivé:" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Annuler les modifications" @@ -1078,11 +1090,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Ne pas envoyer d'alertes par email concernant les commentaires sur le problème au créateur" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Avez-vous un mot de passe %s ?" @@ -1094,7 +1102,7 @@ msgstr "Voulez-vous élever automatiquement un défaut?" msgid "Don’t know" msgstr "Je ne sais pas" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Vous n'aimez pas les formulaires ?" @@ -1102,7 +1110,7 @@ msgstr "Vous n'aimez pas les formulaires ?" msgid "Down one" msgstr "En bas d'un" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Glissez et déposez les photos ici ou cliquer pour les envoyer " @@ -1146,33 +1154,36 @@ msgstr "Éditer" msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Modifier les détails des autres utilisateurs" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Modifier les autorisations des autres utilisateurs" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Éditer la catégorie des rapports" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Modérer les détails du rapport" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Éditer la priorité des rapports" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Éditer les rapports" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "Modifier les détails des utilisateurs/rechercher leurs rapports" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Vos mises à jour" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1205,20 +1216,20 @@ msgstr "Éditeur" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Adresse e-mail" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "Adresse e-mail (facultatif)" @@ -1230,6 +1241,15 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Cliquez sur le lien dans ce courrier électronique pour vous connecter." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Email verifié:" @@ -1312,10 +1332,6 @@ msgstr "Saisir un nom de rue Zücomplet" 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é" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Entrez un code postal britannique, le nom de la rue et de la région ou le nom du bien" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1365,11 +1381,11 @@ msgstr "Catégorie existante" msgid "Existing users won't be modified." msgstr "Les utilisateurs existants ne seront pas modifiés." -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Agrandir la carte" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Expliquez le problème" @@ -1411,6 +1427,8 @@ msgstr "Champs supplémentaires" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Donnée supplémentaire:" @@ -1432,6 +1450,11 @@ msgstr "Échec de l'envoi du message" msgid "Fields" msgstr "Champs" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1509,17 +1532,22 @@ msgstr "Pour chaque option, La clé est la valeur qui est msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Pour plus d'information, Lire comment FixMyStreet utilise Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Votre mot de passe" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Vous avez oublié votre mot de passe? " -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Transmis à l'administration" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Souhait transmis à l'administration" @@ -1577,7 +1605,7 @@ msgstr "Ok" msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Accorder l'accès à l'admin" @@ -1640,7 +1668,7 @@ msgstr "Champ caché" msgid "Hide all reports and updates" msgstr "Masquer tous les rapports et mises à jour" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Masquer tout le rapport" @@ -1663,11 +1691,11 @@ msgstr "Cacher mon nom sur ce rapport" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Cacher les épingles" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Masquer la mise à jour complètement?" @@ -1692,7 +1720,7 @@ msgstr "Retour" msgid "How to report a problem" msgstr "Comment signaler un problème" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Comment envoyer des rapports réussis" @@ -1752,7 +1780,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Si deux interlocuteurs ou plus servent le même lieu, FixMyStreet combine les catégories identiques dans une saisie unique du menu. Vérifiez que vous utilisez le même nom de catégorie pour les interlocuteurs si vous voulez que ce mode de fonctionnement. " -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Si vous nous contacté pour un rapport ou une mise à jour spécifique, veuillez inclure un lien vers le rapport dans le message." @@ -1864,7 +1892,7 @@ msgstr "Inspecter le rapport" msgid "Inspection required" msgstr "inspection requise" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instruire entrepreneurs pour résoudre les problèmes" @@ -1884,8 +1912,8 @@ msgstr "Valeur agency_responsible invalide \"%s\"" msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Location invalide. Le nouvel emplacement doit être couvert par la même administration." @@ -1897,13 +1925,6 @@ msgstr "Il est souvent plus rapide de parcourir notre FAQs et msgid "It’s on its way to the council right now." msgstr "Il est sur le chemin de l’administration en ce moment." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Se souvenir de moi sur cet ordinateur" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "Clé" @@ -1943,6 +1964,7 @@ msgstr "Dernière actualisation :" msgid "Last update:" msgstr "Dernière actualisation :" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1968,7 +1990,7 @@ msgstr "Lister tous les problèmes rapportés" msgid "Loading reports…" msgstr "Chargement des rapports…" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Chargement…" @@ -1994,23 +2016,22 @@ msgstr "Alertes locales" msgid "Locate the problem on a map of the area" msgstr "Localisez le problème sur un plan des alentours" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Se connecter avec Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Se connecter avec Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Se connecter par email" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Connectez-vous avec email/texte" @@ -2022,7 +2043,7 @@ msgstr "Se déconnecter de toutes les sessions" msgid "Look up" msgstr "Chercher" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "CARTE" @@ -2030,7 +2051,7 @@ msgstr "CARTE" msgid "Make anonymous on all reports and updates" msgstr "Rendre anonyme tous les rapports et mises à jour" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Gérer la liste" @@ -2038,7 +2059,7 @@ msgstr "Gérer la liste" msgid "Manual order" msgstr "Commande manuelle" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Carte" @@ -2050,11 +2071,11 @@ msgstr "Marqué comme envoyé" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Marquer les utilisateurs dont vous voulez surveiller le comportement comme cochés." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "Marquer les détails du problème" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Message" @@ -2074,24 +2095,25 @@ msgstr "Organismes disparus :" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Modérer" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Modérer les détails du rapport" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Modérer ce rapport" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Modifiez cette mise à jour" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Modifiez par %s à %s" @@ -2100,6 +2122,12 @@ msgstr "Modifiez par %s à %s" msgid "Moderated by division within one working day" msgstr "Modéré par division dans le délai d'un jour ouvrable" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Modérer ce rapport" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2125,9 +2153,9 @@ msgstr "Les plus commentés" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nom" @@ -2140,6 +2168,12 @@ msgstr "Nom" msgid "Name:" msgstr "Nom :" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Les mises à jour sont limitées à %s caractères de long. Merci de raccourcir votre texte" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Accédez à ce problème" @@ -2208,6 +2242,8 @@ msgid "New note to DM:" msgstr "Nouvelle note à DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nouveau mot de passe :" @@ -2292,11 +2328,18 @@ msgstr "Plus récents" msgid "Next" msgstr "Suivant" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Suivant" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2309,6 +2352,11 @@ msgstr "Suivant" msgid "No" msgstr "Non" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Votre compte" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Aucune zone" @@ -2317,7 +2365,7 @@ msgstr "Aucune zone" msgid "No body" msgstr "Aucun intelocuteur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Aucune administration sélectionnée" @@ -2350,7 +2398,7 @@ msgstr "Aucune inspection dans la plage de dates sélectionnée." msgid "No reports to show on map, here are some nearby:" msgstr "Aucun rapport à afficher sur la carte, en voici quelques-uns à proximité:" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Aucun résultat retourné" @@ -2430,16 +2478,6 @@ msgstr "Notes du SDM pour DM" msgid "Notice" msgstr "Notification" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Maintenant pour envoyer votre mise à jour…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Nombre de problèmes signalés dans chaque catégorie, au cours des 7 derniers jours." @@ -2448,15 +2486,15 @@ msgstr "Nombre de problèmes signalés dans chaque catégorie, msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Nombre de problèmes signalés dans chaque service au cours des 7 derniers jours." -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Données hors ligne effacées" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "Données de mise à jour hors ligne enregistrées" @@ -2508,6 +2546,14 @@ msgstr "Spécification Open311" msgid "Options" msgstr "Options" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "Ou abonnez-vous par RSS" @@ -2516,15 +2562,15 @@ msgstr "Ou abonnez-vous par RSS" msgid "Order" msgstr "Commander" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2560,15 +2606,13 @@ msgstr "Parent" msgid "Partial" msgstr "Partiel" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Mot de passe (facultatif)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Lien permanent" @@ -2585,16 +2629,22 @@ msgid "Phone Reporter:" msgstr "Téléphone Reporter:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numéro de téléphone" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Téléphone vérifié:" @@ -2605,12 +2655,14 @@ msgstr "Téléphone vérifié:" msgid "Phone:" msgstr "Téléphone" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2624,7 +2676,7 @@ msgstr "Téléphone" msgid "Photo" msgstr "Photo" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "La photo est nécessaire." @@ -2632,12 +2684,12 @@ msgstr "La photo est nécessaire." msgid "Photo required" msgstr "Photo requise" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "Échec du téléchargement de la photo." #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2658,7 +2710,7 @@ msgid "Pick your ward" msgstr "Choisissez votre quartier" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Placer l'épingle sur la carte" @@ -2678,7 +2730,7 @@ msgstr "Merci de vérifier les mots de passe et de réessayer" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2687,15 +2739,15 @@ msgid "Please check your phone number is correct" msgstr "Veuillez vérifier que votre numéro de téléphone est correct" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Merci de sélectionner une catégorie" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Veuillez choisir un mot de passe moins utilisé" @@ -2720,12 +2772,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Merci de ne pas être injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Merci d'entrer un message" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2733,8 +2785,8 @@ msgstr "Merci d'entrer un message" msgid "Please enter a mobile number" msgstr "Merci d’entrer un numéro de téléphone portable" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Merci d'entrer un nom" @@ -2744,22 +2796,22 @@ msgstr "S'il vous plaît entrez un nom pour cet organisme" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Merci d'entrer un mot de passe :" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Merci d'entrer un email valide" @@ -2768,13 +2820,13 @@ msgstr "Merci d'entrer un email valide" msgid "Please enter a valid email address" msgstr "Merci d'entrer une adresse email valide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Veuillez entrer un email ou un numéro de téléphone valide" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" @@ -2784,39 +2836,39 @@ msgstr "Merci d'entrer quelques détails" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Merci d'entrer votre email" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Saisissez votre prénom" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Merci de saisir votre nom" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Saisissez votre numéro de téléphone" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Saisissez votre nom de famille" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Saisissez votre profession" @@ -2843,8 +2895,8 @@ msgstr "Veuillez générer un code à deux facteurs et entrez- msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "Veuillez vous assurer que votre mot de passe comporte au moins %d caractères" @@ -2856,7 +2908,7 @@ msgstr "Nous vous informons que les mises à jour ne sont pas envoyées à l'adm msgid "Please note your report has not yet been sent." msgstr "Veuillez noter que votre rapport n'a pas encore été envoyé ." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Merci de noter que votre rapport n'a pas été envoyé. Choisissez une catégorie et rajoutez des informations supplémentaires ci-dessous, puis envoyez." @@ -2870,11 +2922,11 @@ msgstr "Veuillez noter que votre mise à jour n'a pas encore été post msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "Veuillez fournir un ID en double ou une mise à jour publique pour ce rapport." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Veuillez fournir une mise à jour publique de ce rapport." @@ -2907,15 +2959,15 @@ msgstr "Merci de sélectionner le type d'alerte que vous voulez" msgid "Please state whether or not the problem has been fixed" msgstr "Merci de préciser si le problème a été réglé ou non." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Veuillez uniquement envoyer une image" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "Merci de vérifier au moins l’un des e-mail/téléphone" @@ -2923,9 +2975,7 @@ msgstr "Merci de vérifier au moins l’un des e-mail/tél&eacut msgid "Please write a message" msgstr "Merci de saisir un message" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Envoyer" @@ -2933,19 +2983,19 @@ msgstr "Envoyer" msgid "Postcode or street name and area" msgstr "Code postal ou nom de rue et zone" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Signalé anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Signalé par %s à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Envoyé par %s (%s) à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Envoyé par %s à %s" @@ -2980,14 +3030,10 @@ msgstr "Vie privée et cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privé" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "détails privés" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problème" @@ -3010,7 +3056,7 @@ msgstr "Problème %d signalé à l’administration %s" msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -3019,7 +3065,6 @@ msgid "Problem state change based on survey results" msgstr "Changement état des problèmes d'après résultats sondage" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problèmes" @@ -3044,7 +3089,7 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr" msgid "Problems within %.1fkm of %s" msgstr "Problèmes entre %.1fkm de %s " -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3069,26 +3114,26 @@ msgstr "Problèmes dans %s, %s" msgid "Property address:" msgstr "Adresse de propriété:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Apporter une mise à jour" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Fournir la mise à jour comme" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Détails public" @@ -3157,7 +3202,7 @@ msgstr "Flux RSS de %s, dans la localité %s" msgid "RSS feed of nearby problems" msgstr "Flux RSS de problèmes à proximité" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3182,7 +3227,7 @@ msgstr "Flux RSS des mises à jour pour ce problème" msgid "Receive email when updates are left on this problem." msgstr "Etre informé par courriel lorsque ce problème est mis à jour." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Reçu par %s un peu plus tard" @@ -3226,9 +3271,9 @@ msgstr "Effacer le signalement" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Supprimer de votre liste" @@ -3260,14 +3305,14 @@ msgid "Report ID:" msgstr "Rapport ID :" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Signaler un problème" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Signaler un problème ici" @@ -3277,13 +3322,13 @@ msgstr "Signaler un problème ici" msgid "Report abuse" msgstr "Signaler un abus" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "Signaler un autre problème ici" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Signaler comme" @@ -3310,8 +3355,8 @@ msgstr "Signalez des incidents sur l’espace public et participez à msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" @@ -3320,8 +3365,8 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -3330,31 +3375,31 @@ msgstr "Signalé par %s à %s" msgid "Reported by:" msgstr "Rapporté par:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" @@ -3365,7 +3410,7 @@ msgstr "Remis:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3374,17 +3419,23 @@ msgstr "Signalisation d'un problème" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapports" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 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" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Rapports attendant une validation" @@ -3405,7 +3456,7 @@ msgstr "Selon le type de problème, les rapports à proximité sont msgid "Reports published" msgstr "Rapports publiés" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "Rapports enregistrés hors ligne." @@ -3465,20 +3516,20 @@ msgstr "Modèles de réponse" msgid "Response Templates for %s" msgstr "Modèles de réponse pour %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Revenir à l'original" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Revenir au texte original" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Revenir au titre original" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Lieu correct?" @@ -3490,15 +3541,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3509,7 +3560,7 @@ msgstr "Pivoter à droite" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellite" @@ -3523,8 +3574,8 @@ msgstr "Enregistrer + fermer en double" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3539,7 +3590,7 @@ msgid "Save with a public update" msgstr "Sauvegardez avec une mise à jour publique" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "Enregistrement des rapports hors ligne" @@ -3579,13 +3630,12 @@ msgstr "Aucun utilisateur trouvé lors de la recherche." msgid "Security" msgstr "Sécurité" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Voir notre politique de confidentialité" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "Voir les détails des utilisateurs pour les rapports créés en tant que conseil" @@ -3615,7 +3665,7 @@ msgstr "Sélectionnez plusieurs quartiers?" msgid "Select:" msgstr "Sélectionner :" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Envoyé" @@ -3632,11 +3682,11 @@ msgstr "Envoyer un e-mail de connexion" msgid "Sending a confirmation text failed: \"%s\"" msgstr "L’envoi d’un texte de confirmation a échoué: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Envoyé le rapport en retour" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" @@ -3668,9 +3718,9 @@ msgid "Share" msgstr "Partagez" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Liste" @@ -3678,19 +3728,19 @@ msgstr "Liste" msgid "Shortlist all visible" msgstr "Liste abrégée visible" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Shortlisté" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Shortlisté par %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Afficher la photo ?" @@ -3702,7 +3752,7 @@ msgstr "Afficher toutes les mises à jour" msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Afficher le nom publiquement ?" @@ -3714,17 +3764,17 @@ msgstr "Montrer les plus vieux" msgid "Show older reports" msgstr "Afficher les anciens rapports" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Afficher la photo" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Montrer les épingles" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "Afficher le nom du déclarant" @@ -3732,20 +3782,20 @@ msgstr "Afficher le nom du déclarant" msgid "Show reports in your area" msgstr "Afficher les rapports dans votre région" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "S'authentifier" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Connectez-vous par e-mail à la place en fournissant un nouveau mot de passe. Lorsque vous cliquez sur le lien dans votre e-mail, votre mot de passe sera mis à jour." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Connectez-vous par e-mail ou texte, en fournissant un nouveau mot de passe. Lorsque vous cliquez sur le lien dans votre e-mail ou entrez le code d’authentification SMS, votre mot de passe sera mis à jour." @@ -3754,6 +3804,11 @@ msgstr "Connectez-vous par e-mail ou texte, en fournissant un nouveau mot de pas msgid "Sign in or create an account" msgstr "Connectez-vous ou créez un compte" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Définir un mot de passe" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3798,15 +3853,15 @@ msgstr "Désolé, ce n’était pas le bon code" 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Désolé, nous ne pouvons pas vous connecter pour le moment. Veuillez compléter le formulaire ci-dessous." @@ -3816,7 +3871,7 @@ msgstr "Désolé, nous ne pouvons pas vous connecter pour le moment. Veuillez co 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau." @@ -3861,13 +3916,13 @@ msgstr "Date de début" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "État actuel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "L’état et le code d’état externe ne peuvent pas etre utilisés simultanément." @@ -3886,14 +3941,13 @@ msgid "State:" msgstr "État actuel :" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "État" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3922,7 +3976,7 @@ msgstr "Street View" msgid "String" msgstr "Chaîne" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Sous-catégorie" @@ -3930,21 +3984,22 @@ msgstr "Sous-catégorie" msgid "Subdivision/Body" msgstr "Subdivision/Interlocuteur" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Sujet" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Sujet :" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Envoyer" @@ -3994,8 +4049,7 @@ msgid "Summarise your changes" msgstr "Résumez vos modifications" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4029,18 +4083,22 @@ msgstr "Supeusers ont l'autorisation d'effectuer des toutes les actions msgid "Survey Results" msgstr "Résultats de l'enquête" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Modèle «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Modèles" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texte" @@ -4051,6 +4109,7 @@ msgstr "Version texte seulement" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4084,7 +4143,7 @@ msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de local 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 "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous juste vous demander si vous aviez déjà signalé un problème à une administration auparavant ?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), réessayez s'il vous plaît." @@ -4098,7 +4157,6 @@ msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à n #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." @@ -4111,27 +4169,27 @@ msgstr "Ce problème a été marqué comme envoyé." msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Ce rapport ne peut pas être vu sur %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de FixMyStreet.fr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "Cet utilisateur a été déconnecté." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "Cet utilisateur a été rendu anonyme sur tous les rapports et mises à jour." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "Les informations personnelles de cet utilisateur ont été supprimées." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "Les rapports et mises à jour de cet utilisateur ont été masqués." @@ -4283,7 +4341,7 @@ msgstr "Le fichier CSV téléchargé doit contenir une ligne d 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é" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "L’utilisateur a reçu un email de connexion" @@ -4302,7 +4360,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Il n'y a pas de rapports à montrer." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "Il existe déjà un modèle de réponse automatique pour cette catégorie/Emplacement." @@ -4319,14 +4377,18 @@ msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ult 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Il y a un problème avec vos informations de connexion. Si vous ne vous souvenez plus de votre mot de passe ou n’en avez pas, veuillez remplir le champ ‘Non‘ du formulaire." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 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." @@ -4334,10 +4396,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 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." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Ceux-ci seront envoyés a l'administration, mais ne seront jamais affichés en ligne." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Ceux-ci ne seront jamais affichés en ligne." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4365,15 +4438,6 @@ msgstr "Ceux-ci seront publiés en ligne pour les autres, conformément à la %s and also published online for others to see, in accordance with our privacy policy." msgstr "Ceux-ci seront envoyés à %s et également publié en ligne pour les autres, conformément à notre politique de confidentialité." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Ceux-ci seront envoyés a l'administration, mais ne seront jamais affichés en ligne." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Ceux-ci ne seront jamais affichés en ligne." - #: 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." @@ -4409,10 +4473,10 @@ msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacemen 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -4451,7 +4515,7 @@ msgstr "Ce rapport est un dupliqua. Veuillez mettre è jour le rapport ori #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ce rapport attend une modération." @@ -4467,7 +4531,7 @@ msgstr "Ce rapport est actuellement marqué comme résolu." msgid "This report is currently marked as open." msgstr "Ce rapport est actuellement marqué comme ouvert." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "Ce rapport est maintenant fermé aux mises à jour." @@ -4483,7 +4547,6 @@ msgid "Time spent (in minutes):" msgstr "Le temps passé (en minutes):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -4567,7 +4630,7 @@ msgstr "Traductions" msgid "Trusted by bodies:" msgstr "Accrédité par les organismes:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Accrédité pour faire des rapports sans être inspectés" @@ -4577,7 +4640,7 @@ msgstr "Accrédité :" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Essayez à nouveau" @@ -4613,7 +4676,7 @@ msgstr "Débannir" msgid "Unconfirmed" msgstr "Non confirmé" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Inconnu" @@ -4621,18 +4684,18 @@ msgstr "Inconnu" msgid "Unknown alert type" msgstr "Type d'alerte inconnu" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "erreur inconnue" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID de problème inconnu" @@ -4650,7 +4713,7 @@ msgstr "Remonter d'un" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Mise à jour" @@ -4658,11 +4721,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Mise à jour ci-dessous ajoutée par %s à %s" @@ -4702,22 +4765,22 @@ msgstr "Mettre à jour les statuts" msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "Mis à par %s (%s) à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "Mis à par %s à %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Mis à jour !" @@ -4728,7 +4791,7 @@ msgstr "Mis à jour !" msgid "Updates" msgstr "Mises à jour" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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" @@ -4788,26 +4851,26 @@ msgstr "ID utilisateur de récupération des commentaires à" msgid "User Import" msgstr "Import utilisateur" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "Utilisateur ajouté à la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "L’utilisateur existe déjà" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "Utilisateur déjà dans la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Utilisateur signalé" @@ -4831,10 +4894,8 @@ msgid "User:" msgstr "Utilisateur:" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Utilisateurs" @@ -4879,6 +4940,10 @@ msgstr "Afficher les rapports par quartier" msgid "View wards" msgstr "Voir les quartiers" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4909,7 +4974,7 @@ msgstr "Nous avons trouvé plus d'une correspondance pour cette référence de p msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "Nous avons envoyé un code de confirmation à votre téléphone. Veuillez l’entrer ci-dessous:" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4970,7 +5035,7 @@ msgstr "De quels problèmes voulez-vous alerter?" msgid "Which report is it a duplicate of?" msgstr "De quel rapport ? s'agit-il d'un double exemplaire?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Trois photos suffisent." @@ -4998,17 +5063,15 @@ msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5022,11 +5085,11 @@ msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte." msgid "Yes" msgstr "Oui" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "vous êtes hors ligne" @@ -5034,11 +5097,11 @@ msgstr "vous êtes hors ligne" 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:22 +#: templates/web/base/contact/index.html:25 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 :" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "Vous pouvez créer un nouveau rapport au même endroit.." @@ -5055,7 +5118,7 @@ msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des a msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "Vous pouvez choisir de vous abonner à tous les problèmes signalés dans une zone ou des rapports suivant leur destination." -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Vous pouvez contacte le support technique par le courriel %s" @@ -5080,11 +5143,11 @@ msgstr "Vous pouvez nous aider en trouvant une adresse e-mail de contact pour le msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez pas qu'il soit actif sur le site." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Vous avez refusé; merci de remplir le champ ci-dessus" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "vous avez %s sauvegradé à publié." @@ -5092,7 +5155,7 @@ msgstr "vous avez %s sauvegradé &agr msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Vous avez déjà répondu à ce questionnaire. Si vous avez une question, entrez en contact avec nous, ou affichez votre problème.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "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é)." @@ -5170,11 +5233,11 @@ msgid "Your account" msgstr "Votre compte" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Votre email" @@ -5183,9 +5246,9 @@ msgstr "Votre email" msgid "Your email address" msgstr "Votre adresse email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "Votre email ou mobile" @@ -5193,9 +5256,7 @@ msgstr "Votre email ou mobile" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Votre information sera utilisée seulement en accord avec notre politique de confidentialité" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Votre nom" @@ -5211,13 +5272,13 @@ msgstr "Votre nom a été caché de tous vos rapports et mises msgid "Your name has been hidden." msgstr "Votre nom a été caché." -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "Vos rapports hors ligne" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Votre mot de passe" @@ -5226,15 +5287,15 @@ msgstr "Votre mot de passe" msgid "Your password has been changed" msgstr "Votre mot de passe a été changé" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "Votre mot de passe doit inclure %d ou plus de caractères." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Votre numéro de téléphone" @@ -5255,7 +5316,12 @@ msgstr "Votre liste" msgid "Your token has been generated" msgstr "Votre jeton a été généré" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Vos mises à jour" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "Votre mise à jour a été sauvegardée en mode hors connexion pour la soumission en ligne." @@ -5267,8 +5333,8 @@ msgstr "Vos mises à jour" msgid "Your verification code is %s" msgstr "Votre code de vérification est %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Vous" @@ -5286,13 +5352,15 @@ msgid "all" msgstr "Tous" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "un administrateur" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "et un défaut soulevé" @@ -5318,7 +5386,7 @@ msgstr "Par exemple '%s' ou '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "par exemple. 'Nid de poule de 10cm sur la route St, près de la boîîte aux lettres'" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "par exemple. 'Ce nid de poule existe depuis deux mois et…'" @@ -5356,6 +5424,16 @@ msgstr "aucun" msgid "not the council's responsibility" msgstr "pas la responsabilité de l'administration" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Connectez-vous ou créez un compte" + +#: templates/web/base/auth/create.html:13 +#, fuzzy +msgid "or sign in" +msgstr "Nouveaux problèmes pour %s" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5392,12 +5470,12 @@ msgstr "déconnexion" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "l'ID de base de données de l’administration auquel est associer cet utilisateur, par ex.2217 pour Versailles." -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "L'administration locale" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5413,11 +5491,11 @@ msgstr "Ce type de problème local" msgid "today" msgstr "aujourd'hui" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "mettre à jour" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "mises à jour" @@ -5433,11 +5511,11 @@ msgstr "l'utilisateur est de la même administration que le problème - %d" msgid "user is problem owner" msgstr "L'utilisateur est propriétaire du problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "utilisateur ne figurant pas dans la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "utilisateur supprimé de la liste d’abus" @@ -5606,3 +5684,33 @@ msgid "report" msgid_plural "reports" msgstr[0] "rapport" msgstr[1] "rapports" + +#~ msgid "No let me sign in by email" +#~ msgstr "Non, laissez-moi m'authentifier par email :" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "Non, laissez-moi m’authentifier par email or texte" + +#~ msgid "Edit other users' details" +#~ msgstr "Modifier les détails des autres utilisateurs" + +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Entrez un code postal britannique, le nom de la rue et de la région ou le nom du bien" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Se souvenir de moi sur cet ordinateur" + +#~ msgid "Now to submit your report…" +#~ msgstr "Maintenant pour envoyer votre rapport…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Maintenant pour envoyer votre mise à jour…" + +#~ msgid "Private details" +#~ msgstr "détails privés" + +#~ 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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte." diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index d656483886b..6dbf2f6e137 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: 2018-09-06 20:57+0000\n" "Last-Translator: Yaron Shahrabani , 2018\n" "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n" @@ -22,13 +22,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "וגם" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -160,7 +160,7 @@ msgstr "(לא קיים עוד)" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(רשות)" @@ -178,9 +178,9 @@ msgstr "(נשלח לשניהם)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- נא לבחור קטגוריה --" @@ -209,7 +209,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -218,31 +218,22 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -251,12 +242,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "כן יש לי ססמה" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "כיצד לדווח על תקלה" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -316,9 +310,9 @@ msgstr "הוספת מספר טלפון" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "הוספה לרשימה מקוצרת" @@ -328,16 +322,15 @@ msgstr "הוספה לרשימה מקוצרת" msgid "Add user" msgstr "הוספת משתמש" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "הוספה/עריכה של קטגוריות תקלות" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "הוספה/עריכה של עדיפויות מענה" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "הוספה/עריכה של תבניות תגובה" @@ -345,7 +338,7 @@ msgstr "הוספה/עריכה של תבניות תגובה" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -365,7 +358,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "להודיע לי על עדכונים עתידיים" @@ -432,33 +426,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "אלמוני" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "משתמש אלמוני" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "אלמוני:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "משתמש אחר" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "לבטל את ההעלאה הזאת?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "להמשיך?" @@ -495,7 +491,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -528,6 +524,10 @@ msgstr "מענה אוטומטי:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "קטגוריות זמינות" @@ -540,12 +540,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "חזרה" @@ -558,10 +558,8 @@ msgid "Ban user" msgstr "חסימת משתמש" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -598,7 +596,6 @@ msgid "Can't see the map? Skip this step" msgstr "אין לך אפשרות לצפות במפה? ניתן לדלג על שלב זה" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -630,7 +627,7 @@ msgstr "קטגוריה" msgid "Category and State" msgstr "קטגוריה ומדינה" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -640,6 +637,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -693,7 +691,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -721,6 +719,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -733,7 +735,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -762,18 +764,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "קוד" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -787,8 +788,7 @@ msgstr "אישור" msgid "Confirm account" msgstr "אישור חשבון" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -807,7 +807,7 @@ msgstr "אישור" msgid "Confirmed" msgstr "אושר" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -818,16 +818,20 @@ msgstr "אושר:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "יצירת קשר" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "יצירת קשר עם הצוות" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -837,12 +841,12 @@ msgstr "" msgid "Coordinates:" msgstr "נקודות ציון:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "לא ניתן למצוא את המשתמש" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "לא ניתן לחפש את המיקום" @@ -877,6 +881,11 @@ msgstr "יצירה" msgid "Create a report" msgstr "יצירת דוח" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "כניסה או יצירת חשבון" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -886,18 +895,15 @@ msgstr "יצירת קטגוריה" msgid "Create priority" msgstr "יצירת עדיפות" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -915,7 +921,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -939,7 +945,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -967,6 +973,10 @@ msgstr "בררת מחדל" msgid "Default priority" msgstr "עדיפות בררת מחד" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "סוג המפגע" @@ -975,7 +985,7 @@ msgstr "סוג המפגע" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -987,8 +997,8 @@ msgstr "מחיקת תבנית" msgid "Deleted" msgstr "נמחק" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1004,17 +1014,18 @@ msgstr "תיאור" msgid "Description:" msgstr "תיאור:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "פרטים" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1046,8 +1057,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "התעלמות משינויים" @@ -1056,11 +1067,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1072,7 +1079,7 @@ msgstr "" msgid "Don’t know" msgstr "לא ידוע לי" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "לא בא לך על טפסים?" @@ -1080,7 +1087,7 @@ msgstr "לא בא לך על טפסים?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1121,33 +1128,36 @@ msgstr "עריכה" msgid "Edit body details" msgstr "ערוך פרטי גוף" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "ערוך פרטי גוף" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "עריכת דוחות" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "העדכונים שלך" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1180,20 +1190,20 @@ msgstr "עורך" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "דוא״ל" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "כתובת דוא״ל" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "כתובת דוא״ל (רשות)" @@ -1205,6 +1215,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "כתובת דוא״ל אומתה:" @@ -1281,10 +1299,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1334,11 +1348,11 @@ msgstr "קטגוריה קיימת" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "הרחבת המפה" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "הסבר מה לא תקין" @@ -1380,6 +1394,8 @@ msgstr "שדות נוספים" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "נתונים נוספים:" @@ -1401,6 +1417,11 @@ msgstr "שליחת ההודעה נכשלה" msgid "Fields" msgstr "שדות" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1478,17 +1499,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "הססמה שלך" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1546,7 +1572,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1609,7 +1635,7 @@ msgstr "" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "הסתרת הדוח כולו" @@ -1632,11 +1658,11 @@ msgstr "הסתרת השם שלי בדוח זה" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "הסתרת נעצים" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "להסתיר את העדכון לחלוטין?" @@ -1661,7 +1687,7 @@ msgstr "בית" msgid "How to report a problem" msgstr "כיצד לדווח על תקלה" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "איך לשלוח דיווחים מוצלחים" @@ -1721,7 +1747,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1831,7 +1857,7 @@ msgstr "חקירת דוח" msgid "Inspection required" msgstr "נדרשת חקירה" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "הנחיית קבלני ביצוע לתיקון תקלות" @@ -1851,8 +1877,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1864,13 +1890,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1910,6 +1929,7 @@ msgstr "עדכון אחרון:" msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1935,7 +1955,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "בטעינה…" @@ -1961,23 +1981,22 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "כניסה עם פייסבוק" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "כניסה עם טוויטר" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "כניסה עם דוא״ל" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1989,7 +2008,7 @@ msgstr "" msgid "Look up" msgstr "חיפוש" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1997,7 +2016,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2005,7 +2024,7 @@ msgstr "" msgid "Manual order" msgstr "סדר ידני" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2017,11 +2036,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "הודעה" @@ -2041,24 +2060,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2067,6 +2087,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2092,9 +2117,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "שם" @@ -2107,6 +2132,11 @@ msgstr "שם" msgid "Name:" msgstr "שם:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "ניווט לבעיה הזאת" @@ -2173,6 +2203,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "ססמה חדשה:" @@ -2257,11 +2289,17 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +msgid "Next:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2274,6 +2312,11 @@ msgstr "" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "החשבון שלך" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2282,7 +2325,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2315,7 +2358,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2387,16 +2430,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2405,15 +2438,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "אישור" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2465,6 +2498,14 @@ msgstr "פירוט Open311" msgid "Options" msgstr "אפשרויות" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2473,15 +2514,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2517,15 +2558,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "ססמה (רשות)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "קישור קבוע" @@ -2542,16 +2581,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "מספר טלפון" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "מספר טלפון (רשות)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2562,12 +2606,14 @@ msgstr "" msgid "Phone:" msgstr "טלפון:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2581,7 +2627,7 @@ msgstr "טלפון:" msgid "Photo" msgstr "תמונה" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "נדרשת תמונה." @@ -2589,12 +2635,12 @@ msgstr "נדרשת תמונה." msgid "Photo required" msgstr "נדרשת תמונה" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2615,7 +2661,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "הצבת נעץ על מפה" @@ -2635,7 +2681,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2644,15 +2690,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "נא לבחור קטגוריה" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2674,12 +2720,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "נא לכתוב הודעה" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2687,8 +2733,8 @@ msgstr "נא לכתוב הודעה" msgid "Please enter a mobile number" msgstr "נא להקליד מספר טלפון" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "נא להזין שם" @@ -2698,22 +2744,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "נא להקליד ססמה" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "נא להקליד נושא" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "נא להקליד כתובת דוא״ל תקנית" @@ -2722,13 +2768,13 @@ msgstr "נא להקליד כתובת דוא״ל תקנית" msgid "Please enter a valid email address" msgstr "נא להקליד כתובת דוא״ל תקנית" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "נא להקליד כתובת דוא״ל או טלפון תקניים" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" @@ -2738,39 +2784,39 @@ msgstr "" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2797,8 +2843,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2810,7 +2856,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2824,11 +2870,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2861,15 +2907,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2877,9 +2923,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2887,19 +2931,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2934,14 +2978,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2964,7 +3004,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2973,7 +3013,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2998,7 +3037,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3023,26 +3062,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3111,7 +3149,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3136,7 +3174,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3180,9 +3218,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3214,14 +3252,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3231,13 +3269,13 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3264,8 +3302,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3274,8 +3312,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3284,31 +3322,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3319,7 +3357,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3328,17 +3366,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3359,7 +3402,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3419,20 +3462,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3444,15 +3487,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3463,7 +3506,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3477,8 +3520,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3493,7 +3536,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3533,13 +3576,12 @@ msgstr "" msgid "Security" msgstr "אבטחה" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "הצגת מדיניות הפרטיות שלנו" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3569,7 +3611,7 @@ msgstr "לבחור מספר מחלקות?" msgid "Select:" msgstr "בחירה:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "שליחה" @@ -3586,11 +3628,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3622,9 +3664,9 @@ msgid "Share" msgstr "שיתוף" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3632,19 +3674,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "להציג תמונה?" @@ -3656,7 +3698,7 @@ msgstr "הצגת כל העדכונים" msgid "Show my name publicly" msgstr "הצגת השם שלי לקהל הרחב" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "להציג את השם לקהל הרחב?" @@ -3668,17 +3710,17 @@ msgstr "" msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "הצגת תמונה" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "הצגת נעצים" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "הצגת שם המדווח" @@ -3686,20 +3728,20 @@ msgstr "הצגת שם המדווח" msgid "Show reports in your area" msgstr "הצגת דיווחים באזור שלך" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "כניסה" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3708,6 +3750,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "כניסה או יצירת חשבון" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "הגדרת ססמה" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3750,15 +3797,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3768,7 +3815,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3811,13 +3858,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3836,14 +3883,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3872,7 +3918,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3880,21 +3926,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3944,8 +3991,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3979,18 +4025,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4001,6 +4051,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4034,7 +4085,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4048,7 +4099,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4061,27 +4111,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4221,7 +4271,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4238,7 +4288,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4255,14 +4305,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4270,10 +4323,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4298,15 +4360,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4337,10 +4390,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4379,7 +4432,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4395,7 +4448,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4411,7 +4464,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4495,7 +4547,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4505,7 +4557,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4541,7 +4593,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "לא ידוע" @@ -4549,18 +4601,18 @@ msgstr "לא ידוע" msgid "Unknown alert type" msgstr "סוג ההתרעה אינו מוכר" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "שגיאה לא ידועה" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "מזהה התקלה לא ידוע" @@ -4578,7 +4630,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "עדכון" @@ -4586,11 +4638,11 @@ msgstr "עדכון" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4630,22 +4682,22 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4656,7 +4708,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4710,26 +4762,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4753,10 +4805,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4801,6 +4851,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4831,7 +4885,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4892,7 +4946,7 @@ msgstr "באילו תקלות מעניין אותך להתעדכן?" msgid "Which report is it a duplicate of?" msgstr "הדיווח הזה הוא כפיל של איזה דיווח?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4920,17 +4974,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "מיקום שגוי? עליך פשוט ללחוץ שוב על המפה." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4944,11 +4996,11 @@ msgstr "מיקום שגוי? עליך פשוט ללחוץ שוב על המפה." msgid "Yes" msgstr "כן" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4956,11 +5008,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4977,7 +5029,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -4999,11 +5051,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5011,7 +5063,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5089,11 +5141,11 @@ msgid "Your account" msgstr "החשבון שלך" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "כתובת הדוא״ל שלך" @@ -5102,9 +5154,9 @@ msgstr "כתובת הדוא״ל שלך" msgid "Your email address" msgstr "כתובת הדוא״ל שלך" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "כתובת הדוא״ל או מספר הנייד שלך" @@ -5112,9 +5164,7 @@ msgstr "כתובת הדוא״ל או מספר הנייד שלך" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "השם שלך" @@ -5130,13 +5180,13 @@ msgstr "השם שלך מוסתר בכל הדיווחים והעדכונים של msgid "Your name has been hidden." msgstr "השם שלך הוסתר." -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "הדיווחים הבלתי מקוונים שלך" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "הססמה שלך" @@ -5145,15 +5195,15 @@ msgstr "הססמה שלך" msgid "Your password has been changed" msgstr "הססמה שלך הוחלפה" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "על הססמה שלך להכיל %d תווים או יותר." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "מס׳ הטלפון שלך" @@ -5174,7 +5224,12 @@ msgstr "הרשימה המקוצרת שלך" msgid "Your token has been generated" msgstr "האסימון שלך נוצר" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "העדכונים שלך" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "העדכון שלך נשמר באופן בלתי מקוון להגשה בעת חידוש החיבור לאינטרנט." @@ -5186,8 +5241,8 @@ msgstr "העדכונים שלך" msgid "Your verification code is %s" msgstr "קוד האימות שלך הוא %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "עצמך" @@ -5205,13 +5260,15 @@ msgid "all" msgstr "הכול" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5237,7 +5294,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5275,6 +5332,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "כניסה או יצירת חשבון" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5311,12 +5377,12 @@ msgstr "יציאה" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5332,11 +5398,11 @@ msgstr "סוג זה של בעיה מקומית" msgid "today" msgstr "היום" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "עדכון" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "עדכונים" @@ -5352,11 +5418,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5571,3 +5637,6 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "מיקום שגוי? עליך פשוט ללחוץ שוב על המפה." diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index a4904721c24..cf871f481af 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Vlejd , 2017\n" "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "(više ne postoji)" msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(nije obavezno)" @@ -175,9 +175,9 @@ msgstr "(poslano na obje adrese)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(također omogućavamo pretplate na RSS izvore za probleme unutar %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Izaberite kategoriju --" @@ -210,7 +210,7 @@ msgstr "

Broj prijava, akcija i općih statistika za

%s

" msgid " %s reports %s" msgstr " %s prijave %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s spremljeno." @@ -219,31 +219,22 @@ msgstr "%s spremljeno." msgid "%s live problems" msgstr "%s postojeći problemi" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Ne - Potvrdite svoju prijavu e-mailom" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "Ne - Potvrdite svoju putem e-maila ili SMS poruke." -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "No Potvrdi moje ažuriranje e-mailom" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "Ne - Želim ažurirati svoju prijavu putem e-maila ili SMS poruke." -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Ne prijavite se e-mailom" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "Ne - Želim se prijaviti u sustav putem e-maila ili SMS poruke." - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Pažnja: Ovaj prijavak je poslan nadležnima na rješavanje. Naknadne izmjene neće biti automatski proslijeđene. " @@ -252,12 +243,15 @@ msgstr "Pažnja: Ovaj prijavak je poslan nadležnima na rješav msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Pažnja: Ovaj prijavak još nije poslan nadležnima na rješavanje. Naknadne izmjene možda neće biti automatski proslijeđene. " -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Da Imam svoju lozinku." +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Ukratko opišite svoj problem:" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Uključite dvo-stupanjsku provjeru za prijavu u sustav" @@ -317,9 +311,9 @@ msgstr "Dodajte telefonski broj" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -329,16 +323,15 @@ msgstr "" msgid "Add user" msgstr "Dodajte korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Dodajte ili uredite kategorije problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Dodajte ili uredite prioritete za odgovor" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Dodajte ili uredite predloške za odgovor" @@ -346,7 +339,7 @@ msgstr "Dodajte ili uredite predloške za odgovor" msgid "Added %s" msgstr "Dodano %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -366,7 +359,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Javi mi buduće promjene" @@ -433,33 +427,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Ažuriranjem je ovaj problem evidentiran kao popravljen." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonimno" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Anonimni korisnik" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonimno:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Drugi korisnik" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Jeste li sigurni da želite otkazati ovo slanje?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Jeste li sigurni?" @@ -496,7 +492,7 @@ msgstr "Dodijelite vanjskom tijelu:" msgid "Assign to subdivision:" msgstr "Dodijelite radnoj jedinici:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Pridodajte korisnike određenom području:" @@ -529,6 +525,10 @@ msgstr "Automatski odgovor:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Dostupne kategorije" @@ -541,12 +541,12 @@ msgstr "Prosječno vrijeme između dojave i rješenja problema (za posljednjih 1 msgid "Avoid personal information and vehicle number plates" msgstr "Izbjegavajte objavu osobnih informacija i registarske tablice vozila" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Čeka odluku moderatora" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Povratak" @@ -559,10 +559,8 @@ msgid "Ban user" msgstr "Zabranite korisniku pristup" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -599,7 +597,6 @@ msgid "Can't see the map? Skip this step" msgstr "Ne možete vidjeti mapu? Preskoči ovaj korak" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -631,7 +628,7 @@ msgstr "Kategorija" msgid "Category and State" msgstr "Kategorija i stanje" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategorija promijenjena iz \"%s\" u \"%s\"" @@ -641,6 +638,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -699,7 +697,7 @@ msgstr "Odaberite ime kategorije koje ima smisla za javnost (\"rupa na cesti\", msgid "Choose another" msgstr "Odaberite iduće" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Izbrišite preuzete podatke (offline data)" @@ -727,6 +725,10 @@ msgstr "Kliknite na poveznicu u e-mailu koji smo Vam poslali kako biste se prija msgid "Click the link in that email to sign in." msgstr "Kliknite na poveznicu u e-mailu koji smo Vam poslali kako biste se prijavili u sustav." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -739,7 +741,7 @@ msgstr "Kliknite na poveznicu u e-mailu koji smo Vam poslali kako biste se prija msgid "Closed" msgstr "Zatvorene" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" @@ -769,18 +771,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Kod / šifra (code)" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "Umanjite prikaz karte" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguracija" @@ -794,8 +795,7 @@ msgstr "Potvrdi" msgid "Confirm account" msgstr "Potvrdi račun" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Provjerite svoj e-mail pretinac i postavite novu lozinku." @@ -814,7 +814,7 @@ msgstr "Potvrda" msgid "Confirmed" msgstr "Potvrđeno" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -825,16 +825,20 @@ msgstr "Potvrđeno:" msgid "Contact %s" msgstr "Kontaktirajte %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontaktiraj nas" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontaktiraj tim" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -844,12 +848,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinate" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Nepoznati korisnik" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Nismo mogli pronaći lokaciju" @@ -884,6 +888,11 @@ msgstr "Izradite" msgid "Create a report" msgstr "Kreiraj izvješće" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Prijavite se ili kreirajte korisnički račun" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -893,18 +902,15 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "Izradite prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "Izradite izvještaj ili ažurirajte problem kao anonimni korisnik" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Izradite izvještaj ili ažurirajte problem kao tijelo javne vlasti" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Izradite izvještaj ili ažurirajte problem u ime korisnika" @@ -922,7 +928,7 @@ msgstr "Kreirano" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -946,7 +952,7 @@ msgstr "Trenutno grupirano prema %s" msgid "Currently no bodies have been created." msgstr "Trenutno nema izrađenih profila tijela javnih vlasti." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Ne možemo kontaktirati mušteriju" @@ -974,6 +980,11 @@ msgstr "Zadano" msgid "Default priority" msgstr "Zadani prioritet" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Izradite izvještaj ili ažurirajte problem kao tijelo javne vlasti" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Vrsta nepravilnosti" @@ -983,7 +994,7 @@ msgstr "Vrsta nepravilnosti" msgid "Delete" msgstr "Izbrisano" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -995,8 +1006,8 @@ msgstr "Izbrišite predložak" msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Opišite zašto ste odlučili moderirati ovo" @@ -1012,17 +1023,18 @@ msgstr "Opis" msgid "Description:" msgstr "Opis" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "Detaljni opis ograničen je na %dznakova." #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalji" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1054,8 +1066,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Odbacite izmjene" @@ -1064,11 +1076,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Nemojte slati e-mail obavijesti o komentarima autoru prijave" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Imate li svoju lozinku?" @@ -1080,7 +1088,7 @@ msgstr "Želite li automatski prijaviti nepravilnost?" msgid "Don’t know" msgstr "Ne’znam" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Ne dopadaju Vam se obrasci?" @@ -1088,7 +1096,7 @@ msgstr "Ne dopadaju Vam se obrasci?" msgid "Down one" msgstr "Jedan manje" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Povucite i postavite fotografije ovamo ili kliknite za slanje sa svog računala" @@ -1132,33 +1140,36 @@ msgstr "Uredi" msgid "Edit body details" msgstr "Uredite podatke o tijelu javne vlasti" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Uredite podatke o drugim korisnicima" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Uredite ovlaštenja drugih korisnika" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Uredite kategoriju kojoj pripada prijava" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Moderirajte detalje prijave" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Uredite razinu prioriteta ove prijave" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Uredite prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Vaša ažuriranja" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1191,20 +1202,20 @@ msgstr "Urednik" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-mail" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Uredite adresu" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "E-mail adresa (neobavezno)" @@ -1216,6 +1227,15 @@ msgstr "Izrađeno automatsko obavještavanje e-mailom" msgid "Email alert deleted" msgstr "Izbrisano automatsko obavještavanje e-mailom" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Kliknite na poveznicu u e-mailu koji smo Vam poslali kako biste se prijavili u sustav." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Potvrđena e-mail adresa:" @@ -1292,11 +1312,6 @@ msgstr "Unesite ime ulice" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Unesite obližnji poštanski broj ili ime ulice i kvarta" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Unesite obližnji poštanski broj ili ime ulice i kvarta" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1347,11 +1362,11 @@ msgstr "Postojeća kategorija" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Proširite prikaz karte" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Opišite što nije u redu:" @@ -1395,6 +1410,8 @@ msgstr "Dodatna polja" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Dodatni podaci:" @@ -1417,6 +1434,11 @@ msgstr "Slanje poruke nije uspjelo" msgid "Fields" msgstr "Polja" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1495,17 +1517,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Za više informacija, proučite kako FixMyStreet koristi MapIt." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Lozinka" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Zaboravili ste šifru?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Proslijeđeno vanjskom tijelu." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Proslijeđeno vanjskom tijelu." @@ -1563,7 +1590,7 @@ msgstr "Idi" msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Odobri pristup adminu" @@ -1628,7 +1655,7 @@ msgstr "Skriveno" msgid "Hide all reports and updates" msgstr "Sakriti sve prijave i novosti" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Sakriti cijelu prijavu" @@ -1651,11 +1678,11 @@ msgstr "Sakrijte svoje ime u ovoj prijavi" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Sakrij pinove" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Posve sakriti ažuriranje novosti?" @@ -1680,7 +1707,7 @@ msgstr "" msgid "How to report a problem" msgstr "Kako prijaviti problem:" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Kako sastaviti što uspješniju prijavu" @@ -1740,7 +1767,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Ako više tijela javne vlasti ima nadležnost na istom prostoru, @PopraviKv.art spaja iste kategorije u jednu stavku na izborniku. Budite sigurni da koristite isti naziv kategorije u tijelima javne vlasti ako želite da se to dogodi." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1852,7 +1879,7 @@ msgstr "Provjerite prijavu" msgid "Inspection required" msgstr "Potrebna provjera" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Izdajte nalog izvođačima da riješe prijavljene probleme" @@ -1872,8 +1899,8 @@ msgstr "Nevažeća odgovorna_vrijednost agencije %s" msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Neispravna lokacija. Nova lokacija treba biti unutar područja pokrivenosti tijela javne vlasti." @@ -1885,13 +1912,6 @@ msgstr "Obično je najbrži način provjeriti što piše u Često msgid "It’s on its way to the council right now." msgstr "Upravo je na putu prema tijelu javne vlasti." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Ostanite prijavljeni na ovom računalu" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1931,6 +1951,7 @@ msgstr "Posljednje ažuriranje" msgid "Last update:" msgstr "Posljednje ažuriranje:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1956,7 +1977,7 @@ msgstr "Izlistaj sve prijavljene probleme" msgid "Loading reports…" msgstr "Dohvaćanje prijava iz baze..." -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Dohvaćanje..." @@ -1982,23 +2003,22 @@ msgstr "Lokalna upozorenja" msgid "Locate the problem on a map of the area" msgstr "Precizno locirajte problem na karti područja" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Prijavite se Facebook računom" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Prijavite se Twitter računom" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Prijavite se e-mail računom" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Prijavite se e-mailom ili SMS-om" @@ -2010,7 +2030,7 @@ msgstr "Odjavite se s cijele stranice" msgid "Look up" msgstr "Potražite" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "KARTA !!!" @@ -2018,7 +2038,7 @@ msgstr "KARTA !!!" msgid "Make anonymous on all reports and updates" msgstr "Anonimizirajte korisnika !!! kod svih prijava i ažuriranja novosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2026,7 +2046,7 @@ msgstr "" msgid "Manual order" msgstr "Ručni poredak" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Karta" @@ -2038,11 +2058,11 @@ msgstr "Označite kao poslano" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označite korisnike na čije ponašanje želite obratiti pažnju." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Poruka" @@ -2062,24 +2082,25 @@ msgstr "Nedostajuća tijela:" msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderirajte" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Moderirajte detalje prijave" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderirajte ovu prijavu" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderirajte ovo ažuriranje novosti" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Moderirao/la %s u %s" @@ -2088,6 +2109,12 @@ msgstr "Moderirao/la %s u %s" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Razlog moderiranja:" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2113,9 +2140,9 @@ msgstr "Najviše komentara" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Ime" @@ -2128,6 +2155,12 @@ msgstr "Ime" msgid "Name:" msgstr "Ime:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Prijave su ograničene na broj od %s znakova duljine. Molimo da skratite svoju prijavu." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Pogledajte ovaj problem" @@ -2196,6 +2229,8 @@ msgid "New note to DM:" msgstr "Nova poruka za DM-a:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nova lozinka:" @@ -2281,11 +2316,18 @@ msgstr "Najnovije" msgid "Next" msgstr "Sljedeće" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Sljedeće" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2298,6 +2340,11 @@ msgstr "Sljedeće" msgid "No" msgstr "Ne" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Vaš profil" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Bez područja" @@ -2306,7 +2353,7 @@ msgstr "Bez područja" msgid "No body" msgstr "Nema tijela javne vlasti" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nije odabrano odgovorno tijelo" @@ -2339,7 +2386,7 @@ msgstr "Nisu zabilježeni nadzori u navedenom periodu." msgid "No reports to show on map, here are some nearby:" msgstr "Nema prijava za prikazati na karti, no evo nekih u blizini:" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Nisu pronađeni traženi rezultati !!!" @@ -2411,16 +2458,6 @@ msgstr "Bilješke od SDM-a za DM-a" msgid "Notice" msgstr "Bilješka" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Pošaljite svoje ažuriranje…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Broj prijavljenih problema u svakoj kategoriji, unutar posljenjih 7 dana" @@ -2429,15 +2466,15 @@ msgstr "Broj prijavljenih problema u svakoj kategoriji, unutar posljenjih 7 dana msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Broj problema u pojedinoj samoupravi, u posljednjih 7 dana" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Preuzeti podaci su izbrisani" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "Preuzeti podaci su sačuvani" @@ -2489,6 +2526,14 @@ msgstr "Open311 specifikacija" msgid "Options" msgstr "Postavke" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "Ili se pretplatite na RSS izvor" @@ -2497,15 +2542,15 @@ msgstr "Ili se pretplatite na RSS izvor" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2541,15 +2586,13 @@ msgstr "" msgid "Partial" msgstr "Djelomično" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Lozinka (neobvezno)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Stalna poveznica (permalink)" @@ -2567,16 +2610,22 @@ msgid "Phone Reporter:" msgstr "Telefonski prijavitelj" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Broj telefona" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Prijave su ograničene na broj od %s znakova duljine. Molimo da skratite svoju prijavu." + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Provjeren broj telefona:" @@ -2587,12 +2636,14 @@ msgstr "Provjeren broj telefona:" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2606,7 +2657,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Fotografija" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Potrebna je fotografija" @@ -2614,12 +2665,12 @@ msgstr "Potrebna je fotografija" msgid "Photo required" msgstr "Potrebna je fotografija" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2640,7 +2691,7 @@ msgid "Pick your ward" msgstr "Odaberite svoju jedinicu lokalne samouprave" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Postavite zastavicu na kartu" @@ -2660,7 +2711,7 @@ msgstr "Provjeri lozinku i pokušaj ponovno" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2669,15 +2720,15 @@ msgid "Please check your phone number is correct" msgstr "Molimo da provjerite je li ispravno unesen broj telefona" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Izaberite kategoriju" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Molimo Vas da odaberete neku rjeđe korištenu lozinku koju je teže \"hakirati\"" @@ -2702,12 +2753,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Molimo Vas da budete pristojni; vrijeđanje službenika u tijelu javne vlasti nanosi štetu svim budućim korisnicima ovog sustava." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Unesite poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2715,8 +2766,8 @@ msgstr "Unesite poruku" msgid "Please enter a mobile number" msgstr "Molimo da ostavite broj telefona" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Molimo da unesete ime" @@ -2726,22 +2777,22 @@ msgstr "Molimo da unesete ime ovog tijela javne vlasti" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Unesite lozinku" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Unesite predmet (naslov)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Unesite valjanu e-mail adresu" @@ -2750,13 +2801,13 @@ msgstr "Unesite valjanu e-mail adresu" msgid "Please enter a valid email address" msgstr "Unesite valjanu e-mail adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Molimo da unesete valjanu e-mail adresu ili broj telefona" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Unesite detalje" @@ -2766,39 +2817,39 @@ msgstr "Unesite detalje" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Unesite svoju e-mail adresu" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Unesite svoje ime" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Unesite svoje ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Molimo da ostavite svoj broj telefona" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Unesite svoje prezime" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Unesite svoju titulu" @@ -2825,8 +2876,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "Molimo da provjerite sastoji li se Vaša lozinka od najmanje %dznakova" @@ -2838,7 +2889,7 @@ msgstr "Napominjemo da se ažuriranja ne šalju odgovornom tijelu." msgid "Please note your report has not yet been sent." msgstr "Molimo da imate na umu da Vaša prijava još nije poslana." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Napominjemo da vaša prijava još nije poslana. Izaberite kategoriju i navedite dodatne informacije u nastavku te zatim potvrdite." @@ -2852,11 +2903,11 @@ msgstr "Molimo da imate na umu da Vaša prijava još nije objavljena%s (%s) at %s" msgstr "Objavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Objavio %s na %s" @@ -2964,14 +3013,10 @@ msgstr "Privatnost i kolačići" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privatno" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Privatni podaci" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2994,7 +3039,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s" msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." @@ -3003,7 +3048,6 @@ msgid "Problem state change based on survey results" msgstr "Stanje problema izmijenjeno na temelju rezultata ankete" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -3028,7 +3072,7 @@ msgstr "Problemi nedavno prijavljeni kao popravljeni na Popravi.to" msgid "Problems within %.1fkm of %s" msgstr "Problemi unutar radijusa %.1f km od %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3053,26 +3097,26 @@ msgstr "Problemi unutar %s, %s" msgid "Property address:" msgstr "Adresa objekta:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Ažuriranje" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Pošaljite novosti kao: " -#: templates/web/base/auth/general.html:124 -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 "Ne morate se registrirati imenom i lozinkom, ali to će Vam omogućiti da lakše prijavljujete probleme, dostavljate novosti i uređujete svoje prijave." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Javni detalji:" @@ -3141,7 +3185,7 @@ msgstr "RSS izvor za %s, unutar %s JLS" msgid "RSS feed of nearby problems" msgstr "RSS izvor za okolne probleme" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3166,7 +3210,7 @@ msgstr "RSS izvor za novosti u vezi ovog problema" msgid "Receive email when updates are left on this problem." msgstr "Primite e-mail s ažuriranjima ovog problema" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Pristiglo kod %s malo kasnije" @@ -3211,9 +3255,9 @@ msgstr "Ukloni oznaku" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3245,14 +3289,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Prijavite problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3263,14 +3307,14 @@ msgstr "Prijavite problem" msgid "Report abuse" msgstr "Prijavite zloupotrebu" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Prijavite problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Prijavite kao " @@ -3298,8 +3342,8 @@ msgstr "Prijavite, pregledajte ili raspravljajte o lokalnim problemima" msgid "Report, view, or discuss local problems" msgstr "Prijavite, pregledajte ili raspravljajte o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" @@ -3308,8 +3352,8 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" @@ -3318,31 +3362,31 @@ msgstr "Prijavio %s za %s" msgid "Reported by:" msgstr "Prijava od strane: " -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Prijavljeno u kategoriji %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" @@ -3353,7 +3397,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3362,17 +3406,23 @@ msgstr "Prijavljivanje problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Prijave" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Prijave su ograničene na broj od %s znakova duljine. Molimo da skratite svoju prijavu." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Prijave su ograničene na broj od %s znakova duljine. Molimo da skratite svoju prijavu." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Prijave koje čekaju odobrenje" @@ -3393,7 +3443,7 @@ msgstr "Prijave u blizini %s su poslane različitim tijelima javne vlasti, ovisn msgid "Reports published" msgstr "Prijave objavljene" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "Prijave sačuvane offline" @@ -3453,20 +3503,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3478,15 +3528,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3497,7 +3547,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3511,8 +3561,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3527,7 +3577,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3567,13 +3617,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3604,7 +3653,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3622,11 +3671,11 @@ msgstr "Prijavite se e-mail računom" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Pošalji %s %s naknadno" @@ -3658,9 +3707,9 @@ msgid "Share" msgstr "Podijeli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3668,19 +3717,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3692,7 +3741,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3705,17 +3754,17 @@ msgstr "" msgid "Show older reports" msgstr "Vaše prijave" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Prikaži pinove" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3723,20 +3772,20 @@ msgstr "" msgid "Show reports in your area" msgstr "Prikaz prijava u Vašoj okolini" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Prijavite se" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3745,6 +3794,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Prijavite se ili kreirajte korisnički račun" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Unesite lozinku" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3787,15 +3841,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Žao nam je, ne možemo pronaći tu lokaciju." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3805,7 +3859,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3848,13 +3902,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Stanje" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3873,14 +3927,13 @@ msgid "State:" msgstr "Stanje:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3910,7 +3963,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3918,21 +3971,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Predmet" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Predmet:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Pošalji" @@ -3983,8 +4037,7 @@ msgid "Summarise your changes" msgstr "Ukratko opišite unesene izmjene" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4018,18 +4071,22 @@ msgstr "Super-korisnici imaju ovlasti da poduzimaju sve radnje u administratorsk msgid "Survey Results" msgstr "Rezultati ispitivanja" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Predlošci" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4040,6 +4097,7 @@ msgstr "Tekst samo verzija" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4073,7 +4131,7 @@ msgstr "Hvala na učitavanju slike. Sada trebamo locirati problem pa Vas molimo 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 "Hvala, drago nam je čuti da je Vaš problem riješen! Htjeli bismo Vass još samo upitati jeste li do sada prijavljivali problem odgovornom tijelu?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno." @@ -4087,7 +4145,6 @@ msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Žao nam je, poštanski broj nije prepoznat." @@ -4100,27 +4157,27 @@ msgstr "Ovaj problem ima oznaku da je poslan nadležnom tijelu na postupanje." msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Ovaj izvještaj se ne može pregledati na %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "Taj korisnik se odjavio iz sustava." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "Osobni podaci tog korisnika su anonimizirani u svim prijavama i ažuriranjima." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "Osobni podaci tog korisnika su uklonjeni." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "Prijave i ažuriranja od strane tog korisnika su označene kao sakrivene." @@ -4262,7 +4319,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Taj korisnik se odjavio iz sustava." @@ -4280,7 +4337,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nemamo Vaših prijava za prikaz." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "Već postoji predložak za automatsko odgovaranje za ovu kategoriju ili stanje." @@ -4297,14 +4354,18 @@ msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte po 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Pojavio se neki problem u vezi s Vašim podacima za prijavu. Ako se ne možete prisjetiti svoje lozinke, ili ju niti nemate, molimo Vas da popunite ‘No’ dio obrasca." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno." @@ -4312,10 +4373,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Došlo je do problema pri ažuriranju. Detalje pogledajte u nastavku." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Ove prijave će biti poslane na postupanje nadležnom tijelu javne vlasti, ali neće biti vidljive ostalim korisnicima." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Ove prijave neće biti vidljive ostalim korisnicima." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4341,15 +4413,6 @@ msgstr "Ove prijave će biti vidljive ostalim korisnicima, sukladno našim %s
and also published online for others to see, in accordance with our privacy policy." msgstr "Ove prijave će biti poslane %s te javno vidljive ostalim korisnicima, sukladno našim pravilima privatnosti." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Ove prijave će biti poslane na postupanje nadležnom tijelu javne vlasti, ali neće biti vidljive ostalim korisnicima." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Ove prijave neće biti vidljive ostalim korisnicima." - #: 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." @@ -4380,10 +4443,10 @@ msgstr "Kako korisnik nije kategorizirao problem, ovaj e-mail je automatski posl 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 ako problem ne ulazi u Vašu nadležnost ili nam se povratno javite kako bismo u svom sustavu mogli ispravno kategorizirati prijavu." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Potrebna informacija" @@ -4422,7 +4485,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4438,7 +4501,7 @@ msgstr "Prijava je trenutno označena kao popravljena." msgid "This report is currently marked as open." msgstr "Prijava je trenutno označena kao otvorena." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Prijava je trenutno označena kao otvorena." @@ -4455,7 +4518,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -4539,7 +4601,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4549,7 +4611,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4585,7 +4647,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrđeno" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Nepoznato" @@ -4593,18 +4655,18 @@ msgstr "Nepoznato" msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Nepoznat IB problema" @@ -4623,7 +4685,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ažuriranje" @@ -4631,11 +4693,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" @@ -4675,22 +4737,22 @@ msgstr "Status ažuriranja" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Ažurirano!" @@ -4701,7 +4763,7 @@ msgstr "Ažurirano!" msgid "Updates" msgstr "Ažuriranja" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4756,26 +4818,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "Korisnik je dodan na popis zloupotreba." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Korisnik označen" @@ -4799,10 +4861,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Korisnici" @@ -4848,6 +4908,10 @@ msgstr "Pregled prijava za ward" msgid "View wards" msgstr "Pregled prijava za ward" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4878,7 +4942,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4939,7 +5003,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4968,17 +5032,15 @@ msgstr "Želite li za 4 tjedna primiti još jedan upitnik koji bi Vas podsjetio msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Podsjećamo, pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini poruku teško čitljivom." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Pogrešna lokacija? Samo opet kliknite na kartu." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4992,11 +5054,11 @@ msgstr "Pogrešna lokacija? Samo opet kliknite na kartu." msgid "Yes" msgstr "Da" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5004,11 +5066,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5025,7 +5087,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5047,11 +5109,11 @@ msgstr "Možete nam pomoći u pronalaženju kontakt e-mail adresa za lokalne pro msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5059,7 +5121,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Već ste ogovorili na upitnik. Ako imate nekih pitanja, molimo da namse javite, ilipregledate problem koji vas zanima.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5137,11 +5199,11 @@ msgid "Your account" msgstr "Vaš profil" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Vaša e-mail adresa:" @@ -5150,9 +5212,9 @@ msgstr "Vaša e-mail adresa:" msgid "Your email address" msgstr "Vaša e-mail adresa" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5160,9 +5222,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Vaše informacije će se koristiti isključivo u skladu s našim pravilima o privatnosti" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ime" @@ -5178,13 +5238,13 @@ msgstr "Vaše ime je sakriveno u svim Vašim prijavama i poslanim novostima" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Lozinka" @@ -5193,15 +5253,15 @@ msgstr "Lozinka" msgid "Your password has been changed" msgstr "Vaša lozinka je promijenjena" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Vaš broj telefona" @@ -5222,7 +5282,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Vaša ažuriranja" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5234,8 +5299,8 @@ msgstr "Vaša ažuriranja" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5254,13 +5319,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5287,7 +5354,7 @@ msgstr "npr. ‘%s’ ili‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "npr. rupa na na križanju Slavonske i Marohnićeve" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Ova rupa je tu mjesecima..." @@ -5326,6 +5393,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Prijavite se ili kreirajte korisnički račun" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5362,12 +5438,12 @@ msgstr "odjavite se" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "lokalno odgovorno tijelo" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5383,11 +5459,11 @@ msgstr "ovaj tip " msgid "today" msgstr "danas" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5403,11 +5479,11 @@ msgstr "Korisnik je iz istog područja kao i problem - %d" msgid "user is problem owner" msgstr "korisnik je vlasnik problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5600,11 +5676,36 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "Enter a password" -#~ msgstr "Unesite lozinku" +#~ msgid "No let me sign in by email" +#~ msgstr "Ne prijavite se e-mailom" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "Ne - Želim se prijaviti u sustav putem e-maila ili SMS poruke." + +#~ msgid "Edit other users' details" +#~ msgstr "Uredite podatke o drugim korisnicima" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Unesite obližnji poštanski broj ili ime ulice i kvarta" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Ostanite prijavljeni na ovom računalu" + +#~ msgid "Now to submit your report…" +#~ msgstr "Podnesite svoju prijavu…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Pošaljite svoje ažuriranje…" + +#~ msgid "Private details" +#~ msgstr "Privatni podaci" + +#~ 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 "Ne morate se registrirati imenom i lozinkom, ali to će Vam omogućiti da lakše prijavljujete probleme, dostavljate novosti i uređujete svoje prijave." -#~ msgid "Moderation reason:" -#~ msgstr "Razlog moderiranja:" +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Pogrešna lokacija? Samo opet kliknite na kartu." #~ msgid "New" #~ msgstr "Novo" diff --git a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po index 272eaa15594..f242de99dec 100644 --- a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hu_HU.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gábor Auth , 2018\n" "Language-Team: Hungarian (Hungary) (https://www.transifex.com/mysociety/teams/12067/hu_HU/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " és " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "(nem létezik többé)" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcionális)" @@ -174,9 +174,9 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Válassz kategóriát --" @@ -205,7 +205,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s elmentve." @@ -214,31 +214,22 @@ msgstr "%s elmentve." msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -247,12 +238,14 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Igen van jelszavam" +#: templates/web/base/report/new/form_user.html:8 +msgid "About the problem" +msgstr "" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Kétfaktoros azonosítás aktiválása" @@ -312,9 +305,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -324,16 +317,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -341,7 +333,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -361,7 +353,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -428,33 +421,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonymous" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -491,7 +486,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -524,6 +519,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -536,12 +535,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Vissza" @@ -554,10 +553,8 @@ msgid "Ban user" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -594,7 +591,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -626,7 +622,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -636,6 +632,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -689,7 +686,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -717,6 +714,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -729,7 +730,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -758,18 +759,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -783,8 +783,7 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -803,7 +802,7 @@ msgstr "" msgid "Confirmed" msgstr "" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -814,16 +813,20 @@ msgstr "" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -833,12 +836,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -873,6 +876,10 @@ msgstr "" msgid "Create a report" msgstr "" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +msgid "Create an account" +msgstr "" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -882,18 +889,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -911,7 +915,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -935,7 +939,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -963,6 +967,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -971,7 +979,7 @@ msgstr "" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -983,8 +991,8 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1000,17 +1008,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1042,8 +1051,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1052,11 +1061,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1068,7 +1073,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1076,7 +1081,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1117,33 +1122,34 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +msgid "Edit report details" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +msgid "Edit your update" +msgstr "" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1176,20 +1182,20 @@ msgstr "" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1201,6 +1207,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1277,10 +1291,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1330,11 +1340,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1376,6 +1386,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1397,6 +1409,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1474,17 +1491,21 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +msgid "Forgot password" +msgstr "" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1542,7 +1563,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1605,7 +1626,7 @@ msgstr "" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1628,11 +1649,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1657,7 +1678,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1717,7 +1738,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1827,7 +1848,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1847,8 +1868,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1860,13 +1881,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1906,6 +1920,7 @@ msgstr "" msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1931,7 +1946,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1957,23 +1972,22 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1985,7 +1999,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1993,7 +2007,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2001,7 +2015,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2013,11 +2027,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -2037,24 +2051,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2063,6 +2078,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2088,9 +2108,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -2103,6 +2123,11 @@ msgstr "" msgid "Name:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2169,6 +2194,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2253,11 +2280,17 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +msgid "Next:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2270,6 +2303,10 @@ msgstr "" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +msgid "No account?" +msgstr "" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2278,7 +2315,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2311,7 +2348,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2383,16 +2420,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2401,15 +2428,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2461,6 +2488,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2469,15 +2504,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2513,15 +2548,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2538,16 +2571,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2558,12 +2596,14 @@ msgstr "" msgid "Phone:" msgstr "" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2577,7 +2617,7 @@ msgstr "" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2585,12 +2625,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2611,7 +2651,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2631,7 +2671,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2640,15 +2680,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2670,12 +2710,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2683,8 +2723,8 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2694,22 +2734,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "" @@ -2718,13 +2758,13 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" @@ -2734,39 +2774,39 @@ msgstr "" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2793,8 +2833,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2806,7 +2846,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2820,11 +2860,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2857,15 +2897,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2873,9 +2913,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2883,19 +2921,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2930,14 +2968,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2960,7 +2994,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2969,7 +3003,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2994,7 +3027,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3019,26 +3052,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3107,7 +3139,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3132,7 +3164,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3176,9 +3208,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3210,14 +3242,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3227,13 +3259,13 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3260,8 +3292,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3270,8 +3302,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3280,31 +3312,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3315,7 +3347,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3324,17 +3356,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3355,7 +3392,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3415,20 +3452,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3440,15 +3477,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3459,7 +3496,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3473,8 +3510,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3489,7 +3526,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3529,13 +3566,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3565,7 +3601,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3582,11 +3618,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3618,9 +3654,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3628,19 +3664,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3652,7 +3688,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3664,17 +3700,17 @@ msgstr "" msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3682,20 +3718,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3704,6 +3740,10 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +msgid "Sign in with a password" +msgstr "" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3746,15 +3786,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3764,7 +3804,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3807,13 +3847,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3832,14 +3872,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3868,7 +3907,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3876,21 +3915,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3940,8 +3980,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3975,18 +4014,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3997,6 +4040,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4030,7 +4074,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4044,7 +4088,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4057,27 +4100,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4217,7 +4260,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4234,7 +4277,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4251,14 +4294,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4266,10 +4312,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4294,15 +4349,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4333,10 +4379,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4375,7 +4421,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4391,7 +4437,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4407,7 +4453,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4491,7 +4536,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4501,7 +4546,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4537,7 +4582,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4545,18 +4590,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4574,7 +4619,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4582,11 +4627,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4626,22 +4671,22 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4652,7 +4697,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4706,26 +4751,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4749,10 +4794,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4797,6 +4840,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4827,7 +4874,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4888,7 +4935,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4916,17 +4963,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4940,11 +4985,11 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4952,11 +4997,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4973,7 +5018,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -4995,11 +5040,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5007,7 +5052,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5085,11 +5130,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5098,9 +5143,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5108,9 +5153,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5126,13 +5169,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5141,15 +5184,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5170,7 +5213,11 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +msgid "Your update" +msgstr "" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5182,8 +5229,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5201,13 +5248,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5234,7 +5283,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "tenyérnyi kátyú a Kossuth utcában a postaláda mellett" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5272,6 +5321,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5308,12 +5365,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5329,11 +5386,11 @@ msgstr "" msgid "today" msgstr "ma" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5349,11 +5406,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" diff --git a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po index a97507ae4fc..19dbe0878d7 100644 --- a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/id_ID.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gengo Projects Team , 2017\n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/mysociety/teams/12067/id_ID/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "dan" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -164,7 +164,7 @@ msgstr "(tidak ada lagi)" msgid "(not sent to council)" msgstr "(tidak dikirim ke dewan)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opsional)" @@ -184,9 +184,9 @@ msgstr "(dikirim ke dua-duanya)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Umpan RSS dari masalah dalam %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" @@ -220,7 +220,7 @@ msgstr "

Laporan, Statistik, dan Tindakan untuk

%s

" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s disimpan." @@ -229,34 +229,24 @@ msgstr "%s disimpan." msgid "%s live problems" msgstr "%s masalah yang sedang berlangsung" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Tidak Biarkan saya mengonfirmasikan laporan saya melalui surel" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Tidak Biarkan saya mengonfirmasikan laporan saya melalui surel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Tidak Biarkan saya mengonfirmasikan pembaruan saya melalui surel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Tidak Biarkan saya mengonfirmasikan pembaruan saya melalui surel" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Tidak biarkan saya masuk dengan surel" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Tidak biarkan saya masuk dengan surel" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Catatan: Laporan ini telah diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan." @@ -265,12 +255,15 @@ msgstr "Catatan: Laporan ini telah diteruskan untuk ditindaki. msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Catatan: Laporan ini belum diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ya Saya punya kata sandi" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Buat ringkasan masalah" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -336,9 +329,9 @@ msgstr "(Tidak ada nomor telepon)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Tambahkan ke daftar pendek" @@ -348,16 +341,15 @@ msgstr "Tambahkan ke daftar pendek" msgid "Add user" msgstr "Tambahkan pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Tambah/sunting kategori masalah" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Tambah/sunting prioritas tanggapan" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Tambah/sunting template tanggapan" @@ -365,7 +357,7 @@ msgstr "Tambah/sunting template tanggapan" msgid "Added %s" msgstr "%s ditambahkan" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Menambahkan laporan ini ke daftar pendek Anda akan menghapusnya dari daftar pendek %s." @@ -385,7 +377,8 @@ msgstr "Peringatan %d dibuat untuk %s, tipe %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Peringatan %d dinonaktifkan (dibuat %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Beri tahu saya tentang pembaruan mendatang" @@ -453,34 +446,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Satu pembaruan menandai masalah ini sebagai diatasi." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonim" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonim" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonim:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Pengguna lain" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Apakah Anda yakin ingin membatalkan unggahan ini?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Apakah Anda yakin?" @@ -517,7 +512,7 @@ msgstr "Tetapkan ke badan eksternal:" msgid "Assign to subdivision:" msgstr "Tetapkan ke subdivisi:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Tetapkan pengguna pada area" @@ -551,6 +546,10 @@ msgstr "Tanggapan otomatis:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Kategori yang tersedia" @@ -563,12 +562,12 @@ msgstr "Waktu rata-rata antara pelaporan masalah dan penyelesaian masalah, 100 l msgid "Avoid personal information and vehicle number plates" msgstr "Hindari informasi pribadi dan pelat nomor kendaraan" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Menunggu moderasi" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Kembali" @@ -582,10 +581,8 @@ msgid "Ban user" msgstr "Tandai pengguna" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -622,7 +619,6 @@ msgid "Can't see the map? Skip this step" msgstr "Tidak dapat melihat peta? Lewati langkah ini" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -655,7 +651,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori diubah dari ‘%s’ menjadi ‘%s’" @@ -665,6 +661,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Tingkat perbaikan kategori untuk masalah > 4 minggu lamanya" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -729,7 +726,7 @@ msgstr "" msgid "Choose another" msgstr "Pilih lainnya" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Hapus data offline" @@ -758,6 +755,10 @@ msgstr "Klik tautan pada surel konfirmasi kami untuk masuk." msgid "Click the link in that email to sign in." msgstr "Klik tautan pada surel konfirmasi kami untuk masuk." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -770,7 +771,7 @@ msgstr "Klik tautan pada surel konfirmasi kami untuk masuk." msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Ditutup oleh dewan" @@ -800,18 +801,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "Ciutkan peta" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -825,8 +825,7 @@ msgstr "Konfirmasikan" msgid "Confirm account" msgstr "Konfirmasikan akun" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Sebaliknya, konfirmasikan melalui surel dan berikan kata sandi yang baru. Saat Anda memberikan konfirmasi, kata sandi Anda akan diperbarui." @@ -845,7 +844,7 @@ msgstr "Konfirmasi" msgid "Confirmed" msgstr "Dikonfirmasi" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -856,16 +855,20 @@ msgstr "Dikonfirmasi:" msgid "Contact %s" msgstr "Hubungi %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Hubungi Kami" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Hubungi tim" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -875,12 +878,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Tidak dapat menemukan pengguna" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Tidak dapat menemukan lokasi" @@ -916,6 +919,11 @@ msgstr "Dibuat" msgid "Create a report" msgstr "Buat laporan" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Masuk atau buat akun" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -925,19 +933,16 @@ msgstr "Buat kategori" msgid "Create priority" msgstr "Buat prioritas" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Buat laporan/pembaruan mewakili pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Buat laporan/pembaruan sebagai dewan" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Buat laporan/pembaruan mewakili pengguna" @@ -955,7 +960,7 @@ msgstr "Dibuat" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -981,7 +986,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Saat ini belum ada badan dibuat." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Pelanggan tidak dapat dihubungi" @@ -1010,6 +1015,11 @@ msgstr "" msgid "Default priority" msgstr "Buat prioritas" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Buat laporan/pembaruan sebagai dewan" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Tipe kerusakan" @@ -1019,7 +1029,7 @@ msgstr "Tipe kerusakan" msgid "Delete" msgstr "Dihapus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1031,8 +1041,8 @@ msgstr "Hapus template" msgid "Deleted" msgstr "Dihapus" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Jelaskan mengapa Anda memoderasi ini" @@ -1048,17 +1058,18 @@ msgstr "Deskripsi" msgid "Description:" msgstr "Deskripsi:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detail" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1090,8 +1101,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Buang perubahan" @@ -1100,11 +1111,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Jangan kirimkan surel peringatan atas komentar yang diambil ke pembuat masalah" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Apakah Anda punya kata sandi %s?" @@ -1116,7 +1123,7 @@ msgstr "Apakah Anda ingin melaporkan kerusakan secara otomatis?" msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Tidak suka formulir?" @@ -1124,7 +1131,7 @@ msgstr "Tidak suka formulir?" msgid "Down one" msgstr "Turun satu tingkat" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Tarik dan lepaskan foto di sini atau klik untuk mengunggah" @@ -1168,33 +1175,36 @@ msgstr "Sunting" msgid "Edit body details" msgstr "Sunting detail badan" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Sunting detail pengguna lain" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Sunting perizinan pengguna lain" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Sunting kategori laporan" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Detail laporan moderasi" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Sunting prioritas laporan" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Sunting laporan" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Pembaruan Anda" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1227,20 +1237,20 @@ msgstr "Penyunting" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Surel" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Alamat surel" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Alamat surel" @@ -1253,6 +1263,15 @@ msgstr "Surel peringatan dibuat" msgid "Email alert deleted" msgstr "Surel peringatan dihapus" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Klik tautan pada surel konfirmasi kami untuk masuk." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1342,11 +1361,6 @@ msgstr "Masukkan sebuah nama jalan di Zurich" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Masukkan kode pos UK, atau nama jalan dan kawasan di sekitar" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Masukkan kode pos UK, atau nama jalan dan kawasan di sekitar" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1397,11 +1411,11 @@ msgstr "Kategori yang ada" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Perluas peta" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Jelaskan apa yang salah" @@ -1446,6 +1460,8 @@ msgstr "Detail tambahan:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Data tambahan:" @@ -1468,6 +1484,11 @@ msgstr "Gagal mengirim pesan" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1545,17 +1566,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Untuk informasi lebih lanjut, lihat Bagaimana FixMyStreet menggunakan Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Kata sandi Anda" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Lupa kata sandi Anda?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Diteruskan ke badan eksternal" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Meneruskan permohonan ke badan eksternal" @@ -1613,7 +1639,7 @@ msgstr "Mulai" msgid "Going to send questionnaire?" msgstr "Akan mengirim kuesioner?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Berikan izin akses untuk admin" @@ -1681,7 +1707,7 @@ msgstr "Tersembunyi" msgid "Hide all reports and updates" msgstr "Laporan dan pengguna ditandai" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Sembunyikan seluruh laporan" @@ -1704,11 +1730,11 @@ msgstr "Sembunyikan nama saya dalam laporan ini" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Sembunyikan pin" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Sembunyikan seluruh pembaruan?" @@ -1733,7 +1759,7 @@ msgstr "Beranda" msgid "How to report a problem" msgstr "Cara melaporkan masalah" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Cara mengirimkan laporan yang sukses" @@ -1797,7 +1823,7 @@ msgstr "" "Jika dua badan atau lebih melayani lokasi yang sama, FixMyStreet menggabungkan kategori yang identik menjadi satu entri pada\n" "menu. Pastikan Anda menggunakan nama kategori yang sama pada badan jika Anda ingin menggabungkannya." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1922,7 +1948,7 @@ msgstr "Inspeksi laporan" msgid "Inspection required" msgstr "Diperlukan inspeksi" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instruksikan kontraktor untuk mengatasi masalah" @@ -1942,8 +1968,8 @@ msgstr "Nilai agency_responsible keliru %s" msgid "Invalid format %s specified." msgstr "Format %s yang disebutkan keliru." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Lokasi keliru. Lokasi baru harus dicakup oleh dewan yang sama." @@ -1955,13 +1981,6 @@ msgstr "Biasanya, cara yang tercepat adalah dengan memeriksa TJU msgid "It’s on its way to the council right now." msgstr "Sedang dikirimkan ke dewan saat ini." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Buat saya tetap masuk di komputer ini" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -2001,6 +2020,7 @@ msgstr "Pembaruan terakhir:" msgid "Last update:" msgstr "Pembaruan terakhir:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2027,7 +2047,7 @@ msgstr "Tampilkan semua masalah yang dilaporkan" msgid "Loading reports…" msgstr "Sunting laporan" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Memuat..." @@ -2053,23 +2073,22 @@ msgstr "Peringatan lokal" msgid "Locate the problem on a map of the area" msgstr "Lacak masalah pada peta area" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Masuk dengan Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Masuk dengan Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Masuk dengan surel" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 #, fuzzy msgid "Log in with email/text" msgstr "Masuk dengan surel" @@ -2082,7 +2101,7 @@ msgstr "" msgid "Look up" msgstr "Cari" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "PETA" @@ -2091,7 +2110,7 @@ msgstr "PETA" msgid "Make anonymous on all reports and updates" msgstr "Nama Anda telah disembunyikan pada semua laporan dan pembaruan Anda." -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Kelola daftar pendek" @@ -2099,7 +2118,7 @@ msgstr "Kelola daftar pendek" msgid "Manual order" msgstr "Permintaan manual" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Peta" @@ -2111,11 +2130,11 @@ msgstr "Tandai sebagai dikirim" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Tandai pengguna yang perilakunya ingin Anda pantau." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "Detail masalah penggelembungan" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Pesan" @@ -2135,24 +2154,25 @@ msgstr "Badan tidak ditemukan:" msgid "Missing jurisdiction_id" msgstr "jurisdiction_id tidak ditemukan" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderasi" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Detail laporan moderasi" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderasi laporan ini" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderasi pembaruan ini" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Dimoderasi oleh %s pada %s" @@ -2161,6 +2181,12 @@ msgstr "Dimoderasi oleh %s pada %s" msgid "Moderated by division within one working day" msgstr "Dimoderasi oleh divisi dalam satu hari kerja" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Alasan moderasi:" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2186,9 +2212,9 @@ msgstr "Komentar terbanyak" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nama" @@ -2201,6 +2227,12 @@ msgstr "Nama" msgid "Name:" msgstr "Nama:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Panjang pembaruan dibatasi hingga %s karakter. Mohon persingkat pembaruan Anda." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Beralih ke masalah ini" @@ -2271,6 +2303,8 @@ msgid "New note to DM:" msgstr "Catatan baru untuk DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Kata sandi baru:" @@ -2357,11 +2391,18 @@ msgstr "Terbaru" msgid "Next" msgstr "Selanjutnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Selanjutnya" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2374,6 +2415,11 @@ msgstr "Selanjutnya" msgid "No" msgstr "Tidak" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Akun Anda" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Tidak ada area" @@ -2382,7 +2428,7 @@ msgstr "Tidak ada area" msgid "No body" msgstr "Tidak ada badan" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Tidak ada dewan dipilih" @@ -2415,7 +2461,7 @@ msgstr "Tidak dilakukan inspeksi pada kisaran tanggal yang dipilih." msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Tidak ada hasil dikembalikan" @@ -2495,16 +2541,6 @@ msgstr "Catatan dari SDM ke DM" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Sekarang saatnya memasukkan laporan Anda…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Sekarang untuk memasukkan pembaruan Anda…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhir." @@ -2514,15 +2550,15 @@ msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhi msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhir." -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Oke" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Data offline dihapus" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "Data pembaruan offline disimpan" @@ -2575,6 +2611,14 @@ msgstr "Spesifikasi Open311" msgid "Options" msgstr "opsional" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2583,15 +2627,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2628,15 +2672,13 @@ msgstr "Induk" msgid "Partial" msgstr "Parsial" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Kata sandi (opsional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink:" @@ -2655,16 +2697,22 @@ msgid "Phone Reporter:" msgstr "Dilaporkan:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Nomor telepon" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Nomor telepon (opsional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Panjang laporan dibatasi hingga %s karakter. Mohon persingkat laporan Anda" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2676,12 +2724,14 @@ msgstr "Dilaporkan:" msgid "Phone:" msgstr "Telepon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2695,7 +2745,7 @@ msgstr "Telepon:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto diperlukan." @@ -2703,12 +2753,12 @@ msgstr "Foto diperlukan." msgid "Photo required" msgstr "Foto diperlukan" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2730,7 +2780,7 @@ msgid "Pick your ward" msgstr "Pilih dewan Anda" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Pasang pin di peta" @@ -2750,7 +2800,7 @@ msgstr "Silakan periksa kata sandi dan coba lagi" msgid "Please check your email address is correct" msgstr "Silakan periksa apakah alamat surel Anda benar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2760,15 +2810,15 @@ msgid "Please check your phone number is correct" msgstr "Silakan periksa apakah alamat surel Anda benar" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Silakan pilih kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2793,12 +2843,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Mohon untuk tidak menggunakan bahasa yang kasar — menggunakan bahasa yang kasar terhadap dewan Anda akan menurunkan mutu layanan bagi semua pengguna." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Silakan masukkan pesan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2807,8 +2857,8 @@ msgstr "Silakan masukkan pesan" msgid "Please enter a mobile number" msgstr "Silakan masukkan nomor telepon Anda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Silakan masukkan nama baru" @@ -2818,22 +2868,22 @@ msgstr "Silakan masukkan nama untuk badan ini" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Silakan masukkan kata sandi" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Silakan masukkan subjek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Silakan masukkan surel yang valid" @@ -2842,14 +2892,14 @@ msgstr "Silakan masukkan surel yang valid" msgid "Please enter a valid email address" msgstr "Silakan masukkan alamat surel yang valid" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Silakan masukkan nomor telepon Anda" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Silakan masukkan detail" @@ -2859,39 +2909,39 @@ msgstr "Silakan masukkan detail" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Silakan masukkan surel Anda" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Silakan masukkan nama depan Anda" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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 "Silakan masukkan nama lengkap Anda, dewan membutuhkan informasi ini – jika Anda tidak ingin nama Anda ditampilkan di situs, hapus centang pada kotak di bawah" #: perllib/FixMyStreet/App/Controller/Contact.pm:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Silakan masukkan nama Anda" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Silakan masukkan nomor telepon Anda" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Silakan masukkan nama kedua Anda" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Silakan masukkan sapaan Anda" @@ -2918,8 +2968,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Mohon beri tahukan apakah Anda ingin menerima kuesioner lainnya" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2931,7 +2981,7 @@ msgstr "Harap perhatikan bahwa pembaruan tidak dikirimkan ke dewan." msgid "Please note your report has not yet been sent." msgstr "Harap perhatikan bahwa laporan Anda belum terkirim." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Harap perhatikan bahwa laporan Anda belum terkirim. Pilih sebuah kategori dan tambahkan informasi lebih lanjut di bawah, lalu kirimkan." @@ -2945,12 +2995,12 @@ msgstr "Harap perhatikan bahwa pembaruan Anda belum terkirim." msgid "Please note:" msgstr "Harap perhatikan:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Mohon berikan pembaruan publik untuk laporan ini." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Mohon berikan pembaruan publik untuk laporan ini." @@ -2983,15 +3033,15 @@ msgstr "Silakan pilih tipe peringatan yang Anda inginkan" msgid "Please state whether or not the problem has been fixed" msgstr "Mohon beri tahu apakah masalah telah diatasi atau belum" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Mohon untuk hanya mengunggah gambar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2999,9 +3049,7 @@ msgstr "" msgid "Please write a message" msgstr "Silakan tuliskan pesan" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Kirim" @@ -3010,19 +3058,19 @@ msgstr "Kirim" msgid "Postcode or street name and area" msgstr "Masukkan kode pos, atau nama jalan dan kawasan di sekitar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Dikirim secara anonim pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Dikirim oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Dikirim oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Dikirim oleh %s pada %s" @@ -3057,14 +3105,10 @@ msgstr "Privasi dan kuki" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Pribadi" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Detail pribadi" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Masalah" @@ -3087,7 +3131,7 @@ msgstr "Masalah %s dikirim ke dewan %s" msgid "Problem breakdown by state" msgstr "Uraian masalah berdasarkan wilayah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Masalah ditandai terbuka." @@ -3096,7 +3140,6 @@ msgid "Problem state change based on survey results" msgstr "Perubahan wilayah masalah berdasarkan hasil survei" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Masalah" @@ -3123,7 +3166,7 @@ msgstr "Masalah yang baru-baru ini dilaporkan diatasi di FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Masalah dalam jarak %.1fkm dari lokasi ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3149,26 +3192,26 @@ msgstr "Masalah dalam %s, %s" msgid "Property address:" msgstr "Alamat properti:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Berikan pembaruan" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Berikan pembaruan sebagai" -#: templates/web/base/auth/general.html:124 -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 "Memberikan nama dan kata sandi adalah opsional, tetapi dengan begitu Anda akan lebih mudah melaporkan masalah, menambahkan pembaruan, dan mengelola laporan Anda." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Memberikan kata sandi adalah opsional, tetapi dengan begitu Anda akan lebih mudah melaporkan masalah, menambahkan pembaruan, dan mengelola laporan Anda." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Memberikan kata sandi adalah opsional, tetapi dengan begitu Anda akan lebih mudah melaporkan masalah, menambahkan pembaruan, dan mengelola laporan Anda." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Detail publik" @@ -3237,7 +3280,7 @@ msgstr "Umpan RSS dari %s, di kelurahan %s" msgid "RSS feed of nearby problems" msgstr "Umpan RSS dari masalah di sekitar" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3262,7 +3305,7 @@ msgstr "Umpan RSS dari pembaruan terhadap masalah ini" msgid "Receive email when updates are left on this problem." msgstr "Terima surel saat pembaruan ditambahkan pada masalah ini." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Diterima oleh %s beberapa saat kemudian" @@ -3309,9 +3352,9 @@ msgstr "Hapus tanda" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Hapus dari daftar pendek" @@ -3343,14 +3386,14 @@ msgid "Report ID:" msgstr "ID Laporan:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Laporkan masalah" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3361,14 +3404,14 @@ msgstr "Laporkan masalah" msgid "Report abuse" msgstr "Laporkan penyalahgunaan" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Laporkan masalah" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Laporkan sebagai" @@ -3396,8 +3439,8 @@ msgstr "Laporkan, tampilkan, atau diskusikan masalah lokal" msgid "Report, view, or discuss local problems" msgstr "Laporkan, tampilkan, atau diskusikan masalah lokal" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Dilaporkan secara anonim pada %s" @@ -3406,8 +3449,8 @@ msgstr "Dilaporkan secara anonim pada %s" msgid "Reported before" msgstr "Telah dilaporkan sebelumnya" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Dilaporkan oleh %s pada %s" @@ -3416,31 +3459,31 @@ msgstr "Dilaporkan oleh %s pada %s" msgid "Reported by:" msgstr "Dilaporkan oleh:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Dilaporkan dalam kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Dilaporkan dalam kategori %s secara anonim pada %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Dilaporkan dalam kategori %s oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Dilaporkan melalui %s secara anonim pada %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Dilaporkan melalui %s oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Dilaporkan melalui %s dalam kategori %s secara anonim pada %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Dilaporkan melalui %s dalam kategori %s oleh %s pada %s" @@ -3451,7 +3494,7 @@ msgstr "Dilaporkan:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3460,17 +3503,23 @@ msgstr "Melaporkan masalah" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Laporan" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Panjang laporan dibatasi hingga %s karakter. Mohon persingkat laporan Anda" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Panjang laporan dibatasi hingga %s karakter. Mohon persingkat laporan Anda" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Laporan menunggu persetujuan" @@ -3492,7 +3541,7 @@ msgstr "" msgid "Reports published" msgstr "Laporan diterbitkan" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "Laporan disimpan secara offline." @@ -3555,20 +3604,20 @@ msgstr "Template Tanggapan" msgid "Response Templates for %s" msgstr "Template Tanggapan untuk %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Kembalikan ke awal" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Kembalikan ke teks awal" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Kembalikan ke judul awal" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Tempat yang benar?" @@ -3580,15 +3629,15 @@ msgstr "Operator jalan untuk jalan bernama ini (diambil dari tipe dan nomor refe msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operator jalan untuk jalan bernama ini (dari OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Putar Kiri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3599,7 +3648,7 @@ msgstr "Putar Kanan" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Memutar foto ini akan membuang perubahan yang belum disimpan pada laporan." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" @@ -3613,8 +3662,8 @@ msgstr "Simpan + tutup sebagai duplikat" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3629,7 +3678,7 @@ msgid "Save with a public update" msgstr "Simpan dengan pembaruan publik" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "Bagikan laporan offline" @@ -3669,13 +3718,12 @@ msgstr "Tidak ditemukan pengguna." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Lihat kebijakan privasi kami." -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "Lihat detail pengguna untuk laporan yang dibuat sebagai dewan" @@ -3706,7 +3754,7 @@ msgstr "" msgid "Select:" msgstr "Pilih:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Kirim" @@ -3724,11 +3772,11 @@ msgstr "Masuk dengan surel" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Laporan dikirim kembali" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Dikirimkan ke %s %s kemudian" @@ -3761,9 +3809,9 @@ msgid "Share" msgstr "Bagikan" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Daftar Pendek" @@ -3771,19 +3819,19 @@ msgstr "Daftar Pendek" msgid "Shortlist all visible" msgstr "Tampilkan semua dalam daftar pendek" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Dimasukkan ke daftar pendek" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Dimasukkan ke daftar pendek oleh %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Tampilkan Foto?" @@ -3795,7 +3843,7 @@ msgstr "Tampilkan semua pembaruan" msgid "Show my name publicly" msgstr "Tampilkan nama saya ke publik" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Tampilkan nama ke publik?" @@ -3809,17 +3857,17 @@ msgstr "Tampilkan yang lama" msgid "Show older reports" msgstr "Cari laporan" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Tampilkan foto" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Tampilkan pin" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "Tampilkan nama pelapor" @@ -3827,20 +3875,20 @@ msgstr "Tampilkan nama pelapor" msgid "Show reports in your area" msgstr "Tampilkan laporan di area Anda" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Masuk" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Sebaliknya, masuk dengan surel dan berikan kata sandi baru. Saat Anda mengeklik tautan di surel Anda, kata sandi Anda akan diperbarui." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 #, fuzzy msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Sebaliknya, masuk dengan surel dan berikan kata sandi baru. Saat Anda mengeklik tautan di surel Anda, kata sandi Anda akan diperbarui." @@ -3850,6 +3898,11 @@ msgstr "Sebaliknya, masuk dengan surel dan berikan kata sandi baru. Saat Anda me msgid "Sign in or create an account" msgstr "Masuk atau buat akun" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Masukkan kata sandi" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3895,15 +3948,15 @@ msgstr "Maaf, itu bukan tautan yang valid" msgid "Sorry, there has been an error confirming your problem." msgstr "Maaf, terjadi kesalahan saat mengonfirmasikan masalah Anda." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Maaf, kami tidak dapat menemukan lokasi tersebut." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Maaf, kami tidak dapat memasukkan Anda ke akun. Silakan isi formulir di bawah ini." @@ -3913,7 +3966,7 @@ msgstr "Maaf, kami tidak dapat memasukkan Anda ke akun. Silakan isi formulir di msgid "Sorry, we could not parse that location. Please try again." msgstr "Maaf, kami tidak dapat mengurai lokasi tersebut. Silakan coba lagi." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Maaf, kami tidak dapat menyimpan gambar Anda, silakan coba lagi." @@ -3959,13 +4012,13 @@ msgstr "Tanggal Mulai:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Wilayah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3985,15 +4038,14 @@ msgid "State:" msgstr "Wilayah:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Wilayah" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4023,7 +4075,7 @@ msgstr "Tampilan Jalan" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Subkategori: %s" @@ -4032,21 +4084,22 @@ msgstr "Subkategori: %s" msgid "Subdivision/Body" msgstr "Subdivisi/Badan" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Subjek" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Subjek:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Masukkan" @@ -4098,8 +4151,7 @@ msgid "Summarise your changes" msgstr "Buat ringkasan tentang perubahan Anda" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4134,18 +4186,22 @@ msgstr "Pengguna Super memiliki izin untuk melakukan semua tindakan%s and also published online for others to see, in accordance with our privacy policy." msgstr "Ini akan dikirimkan kepada %s dan juga diterbitkan secara online untuk dilihat oleh orang lain, sesuai dengan kebijakan privasi kami." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Ini akan dikirimkan kepada dewan, tetapi tidak akan ditampilkan secara online." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Ini tidak akan pernah ditampilkan secara online." - #: 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 "Implementasi API sedang dalam pengerjaan dan belum stabil. Ini akan berubah tanpa pemberitahuan sebelumnya di masa mendatang." @@ -4519,10 +4581,10 @@ msgstr "Surel ini telah dikirimkan kepada kedua dewan yang mencakup lokasi masal 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 "Surel ini telah dikirimkan kepada beberapa dewan yang mencakup lokasi masalah, karena kategori yang dipilih tersedia untuk semua dewan ini; silakan abaikan jika Anda bukan dewan yang tepat untuk menangani masalah ini." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Informasi ini diperlukan" @@ -4561,7 +4623,7 @@ msgstr "Laporan ini adalah duplikat. Silakan tambahkan pembaruan pada laporan as #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggu moderasi." @@ -4577,7 +4639,7 @@ msgstr "Laporan ini saat ini ditandai sebagai diatasi." msgid "This report is currently marked as open." msgstr "Laporan ini saat ini ditandai sebagai terbuka." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Laporan ini saat ini ditandai sebagai terbuka." @@ -4594,7 +4656,6 @@ msgid "Time spent (in minutes):" msgstr "Waktu yang dihabiskan (dalam menit):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kronologi" @@ -4678,7 +4739,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "Dipercaya oleh badan:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Dipercaya membuat laporan yang tidak perlu diinspeksi" @@ -4688,7 +4749,7 @@ msgstr "Dipercaya:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Coba lagi" @@ -4724,7 +4785,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Belum dikonfirmasi" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Tidak diketahui" @@ -4732,18 +4793,18 @@ msgstr "Tidak diketahui" msgid "Unknown alert type" msgstr "Tipe peringatan tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Kesalahan tidak diketahui" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" @@ -4762,7 +4823,7 @@ msgstr "Naik satu tingkat" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Pembaruan" @@ -4770,11 +4831,11 @@ msgstr "Pembaruan" msgid "Update %s created for problem %d; by %s" msgstr "Pembaruan %s dibuat untuk masalah %d; oleh %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Pembaruan di bawah ini ditambahkan secara anonim pada %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Pembaruan di bawah ini ditambahkan oleh %s pada %s" @@ -4814,24 +4875,24 @@ msgstr "Perbarui status" msgid "Updated" msgstr "Diperbarui" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Dikirim oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Dikirim oleh %s pada %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Diperbarui!" @@ -4842,7 +4903,7 @@ msgstr "Diperbarui!" msgid "Updates" msgstr "Pembaruan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Panjang pembaruan dibatasi hingga %s karakter. Mohon persingkat pembaruan Anda." @@ -4904,28 +4965,28 @@ msgstr "ID Pengguna untuk dikaitkan dengan komentar yang diambil" msgid "User Import" msgstr "%s laporan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Surel ditambahkan ke daftar penyalahgunaan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Surel sudah ada di daftar penyalahgunaan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Tanda pada pengguna dihapus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Pengguna ditandai" @@ -4951,10 +5012,8 @@ msgid "User:" msgstr "Pengguna" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Pengguna" @@ -5002,6 +5061,10 @@ msgstr "Tampilkan laporan berdasarkan kelurahan" msgid "View wards" msgstr "area lainnya:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5033,7 +5096,7 @@ msgstr "Kami menemukan lebih dari satu hasil yang cocok untuk referensi masalah msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5095,7 +5158,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "Duplikat dari laporan yang manakah ini?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Wah, kawan! Tiga foto sudah cukup." @@ -5123,17 +5186,15 @@ msgstr "Inginkah Anda menerima kuesioner lain dalam 4 minggu, mengingatkan Anda msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit dibaca, begitu juga dengan kurangnya tanda baca." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Lokasi salah? Cukup klik lagi di peta." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5147,11 +5208,11 @@ msgstr "Lokasi salah? Cukup klik lagi di peta." msgid "Yes" msgstr "Ya" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Anda mengeluhkan bahwa laporan masalah ini dimoderasi meskipun tidak perlu:" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Anda sedang offline" @@ -5159,11 +5220,11 @@ msgstr "Anda sedang offline" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Anda melaporkan laporan masalah berikut ini karena menggunakan kata-kata kasar, berisi informasi pribadi, atau yang serupa:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Anda melaporkan pembaruan berikut ini karena menggunakan kata-kata kasar, berisi informasi pribadi, atau yang serupa;" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Anda dapat menampilkan masalah di situs ini." @@ -5181,7 +5242,7 @@ msgstr "Anda dapat menambahkan surel pengguna yang melanggar aturan ke daftar pe msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Anda dapat menghubungi dukungan teknis di %s" @@ -5206,11 +5267,11 @@ msgstr "Anda dapat membantu kami dengan menemukan alamat surel kontak untuk masa msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Anda dapat menandai sebuah badan sebagai dihapus jika Anda tidak ingin badan ini aktif di situs." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Anda menolak; mohon isi kotak di atas" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "Anda punya %s yang disimpan untuk dikirim." @@ -5218,7 +5279,7 @@ msgstr "Anda punya %s yang disimpan untuk d msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Anda sudah menjawab kuesioner ini. Jika Anda punya pertanyaan, silakan hubungi kami, atau tampilkan masalah Anda.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Anda sudah melampirkan foto pada laporan ini. Harap perhatikan bahwa Anda dapat melampirkan maksimal 3 foto pada laporan ini (jika Anda mencoba untuk mengunggah lebih banyak, foto terlama akan dihapus)." @@ -5302,11 +5363,11 @@ msgid "Your account" msgstr "Akun Anda" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Surel Anda" @@ -5315,9 +5376,9 @@ msgstr "Surel Anda" msgid "Your email address" msgstr "Alamat surel Anda" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Alamat surel Anda" @@ -5326,9 +5387,7 @@ msgstr "Alamat surel Anda" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Informasi Anda hanya akan digunakan sesuai dengan kebijakan privasi kami" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Nama Anda" @@ -5344,13 +5403,13 @@ msgstr "Nama Anda telah disembunyikan pada semua laporan dan pembaruan Anda." msgid "Your name has been hidden." msgstr "Nama Anda telah disembunyikan" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "Laporan offline Anda" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Kata sandi Anda" @@ -5359,15 +5418,15 @@ msgstr "Kata sandi Anda" msgid "Your password has been changed" msgstr "Kata sandi Anda telah diubah" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Nomor telepon Anda" @@ -5389,7 +5448,12 @@ msgstr "Daftar pendek Anda" msgid "Your token has been generated" msgstr "Nama Anda telah disembunyikan" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Pembaruan Anda" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "Pembaruan Anda telah disimpan secara offline untuk dikirim saat Anda kembali online." @@ -5401,8 +5465,8 @@ msgstr "Pembaruan Anda" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Anda" @@ -5421,13 +5485,15 @@ msgid "all" msgstr "semua" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5454,7 +5520,7 @@ msgstr "mis. ‘%s’ atau ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Lubang jalan sebesar 10 inci di Jalan Contoh, dekat kotak pos" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Lubang jalan ini sudah berada di sini selama dua bulan dan..." @@ -5494,6 +5560,15 @@ msgstr "tidak ada" msgid "not the council's responsibility" msgstr "ditandai sebagai bukan tanggung jawab dewan" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Masuk atau buat akun" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5530,12 +5605,12 @@ msgstr "keluar" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "dewan lokal" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "tidak ada pin ditampilkan karena pengguna tidak menggunakan peta" @@ -5552,11 +5627,11 @@ msgstr "tipe masalah lokal ini" msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "pembaruan" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "pembaruan" @@ -5572,12 +5647,12 @@ msgstr "pengguna dari dewan yang sama dengan masalah - %d" msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Surel sudah ada di daftar penyalahgunaan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Hapus dari daftar pendek" @@ -5725,11 +5800,37 @@ msgid "report" msgid_plural "reports" msgstr[0] "laporan" -#~ msgid "Enter a password" -#~ msgstr "Masukkan kata sandi" +#~ msgid "No let me sign in by email" +#~ msgstr "Tidak biarkan saya masuk dengan surel" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Tidak biarkan saya masuk dengan surel" + +#~ msgid "Edit other users' details" +#~ msgstr "Sunting detail pengguna lain" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Masukkan kode pos UK, atau nama jalan dan kawasan di sekitar" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Buat saya tetap masuk di komputer ini" + +#~ msgid "Now to submit your report…" +#~ msgstr "Sekarang saatnya memasukkan laporan Anda…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Sekarang untuk memasukkan pembaruan Anda…" + +#~ msgid "Private details" +#~ msgstr "Detail pribadi" + +#~ 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 "Memberikan nama dan kata sandi adalah opsional, tetapi dengan begitu Anda akan lebih mudah melaporkan masalah, menambahkan pembaruan, dan mengelola laporan Anda." -#~ msgid "Moderation reason:" -#~ msgstr "Alasan moderasi:" +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Lokasi salah? Cukup klik lagi di peta." #, fuzzy #~ msgid "New" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 5215eea0d97..d0e1cd82bc6 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Sebastiano Pistore , 2018\n" "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "(non esiste più)" msgid "(not sent to council)" msgstr "(non inviato al Comune)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opzionale)" @@ -175,9 +175,9 @@ msgstr "(inviato ad entrambi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" @@ -206,7 +206,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s salvati." @@ -215,31 +215,22 @@ msgstr "%s salvati." msgid "%s live problems" msgstr "%s problemi in tempo reale" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "No Lasciami confermare la mia segnalazione via email" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "No Lasciami confermare il mio aggiornamento via email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "No lasciami entrare con l'email" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -248,12 +239,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Si Ho già la password" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Segnala un problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Attiva l'autenticazione a due fattori" @@ -313,9 +307,9 @@ msgstr "Aggiungi numero telefonico" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -325,16 +319,15 @@ msgstr "" msgid "Add user" msgstr "Aggiungi un'utente" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Aggiungi/modifica categorie di problemi" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Aggiungi/modifica priorità risposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -342,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "Aggiunti %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -362,7 +355,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Avvisami su futuri aggiornamenti" @@ -429,33 +423,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Un aggiornamento ha riportato questo problema come risolto." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonimo" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Utente anonimo" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonimo:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Sei sicuro?" @@ -492,7 +488,7 @@ msgstr "Assegna ad un corpo esterno:" msgid "Assign to subdivision:" msgstr "Assegna ad una subdivisione:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -525,6 +521,10 @@ msgstr "Risposta automatica:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Categorie disponibili" @@ -537,12 +537,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "In attesa di moderazione" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Indietro" @@ -555,10 +555,8 @@ msgid "Ban user" msgstr "Segnala utente" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -595,7 +593,6 @@ msgid "Can't see the map? Skip this step" msgstr "Non riesci a vedere la mappa? Salta questo passaggio" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -627,7 +624,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -637,6 +634,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -690,7 +688,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Cancella dati offline" @@ -718,6 +716,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -730,7 +732,7 @@ msgstr "" msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Chiuso dal comune" @@ -760,18 +762,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Codice" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" @@ -785,8 +786,7 @@ msgstr "Conferma" msgid "Confirm account" msgstr "Conferma l'account" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -805,7 +805,7 @@ msgstr "Conferma" msgid "Confirmed" msgstr "Confermato" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -816,16 +816,20 @@ msgstr "Confermato:" msgid "Contact %s" msgstr "Contatta %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contattaci" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contatta il team" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -835,12 +839,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Non posso trovare l'utente" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Non posso trovare l'area desiderata" @@ -875,6 +879,11 @@ msgstr "Creare" msgid "Create a report" msgstr "Crea una segnalazione" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Entra o crea un nuovo account" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -884,18 +893,15 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "Crea una priorità" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +919,7 @@ msgstr "Creato" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -937,7 +943,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -965,6 +971,10 @@ msgstr "Default" msgid "Default priority" msgstr "Priorità predefinita" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -974,7 +984,7 @@ msgstr "" msgid "Delete" msgstr "Eliminato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -986,8 +996,8 @@ msgstr "" msgid "Deleted" msgstr "Eliminato" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1003,17 +1013,18 @@ msgstr "Descrizione" msgid "Description:" msgstr "Descrizione:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "Le informazioni dettagliate sono limitate a %d caratteri." #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Dettagli" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1045,8 +1056,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Non salvare modifiche" @@ -1055,11 +1066,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Possiedi una password per accedere a %s?" @@ -1071,7 +1078,7 @@ msgstr "" msgid "Don’t know" msgstr "Non lo so" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1079,7 +1086,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1120,34 +1127,36 @@ msgstr "Modifica" msgid "Edit body details" msgstr "Modifica dettagli corpo" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Modifica dettagli corpo" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Modifica dettagli corpo" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Modifica segnalazioni" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Modifica aggiornamento %d" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1180,20 +1189,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Indirizzo email" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "Indirizzo email (opzionale)" @@ -1205,6 +1214,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Email verificata:" @@ -1281,11 +1298,6 @@ msgstr "" 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à " -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una città " - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1336,11 +1348,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Ingrandisci mappa" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Spiega la natura del problema" @@ -1382,6 +1394,8 @@ msgstr "Campi extra" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Dati extra:" @@ -1404,6 +1418,11 @@ msgstr "Invio messaggio non riuscito" msgid "Fields" msgstr "Campi" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1481,17 +1500,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Tua password" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Hai dimenticato la tua password?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1549,7 +1573,7 @@ msgstr "Vai" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1612,7 +1636,7 @@ msgstr "Campo non visibile" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Rendi non visibile tutta segnalazione" @@ -1635,11 +1659,11 @@ msgstr "Nascondi il mio nome in questa segnalazione" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1664,7 +1688,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Come segnalare un problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" @@ -1724,7 +1748,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1835,7 +1859,7 @@ msgstr "" msgid "Inspection required" msgstr "Richiesta ispezione" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1855,8 +1879,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1868,13 +1892,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Lasciami loggato su questo computer" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1914,6 +1931,7 @@ msgstr "Ultimo aggiornamento:" msgid "Last update:" msgstr "Ultimo aggiornamento:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1939,7 +1957,7 @@ msgstr "Lista di tutti i problemi segnalati" msgid "Loading reports…" msgstr "Caricamento segnalazioni in corso..." -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Caricamento in corso..." @@ -1965,23 +1983,22 @@ msgstr "Segnalazioni locali" msgid "Locate the problem on a map of the area" msgstr "Localizza il problema nella mappa della zona" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Login via Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Login via Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Login tramite email" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Login tramite email/testo" @@ -1993,7 +2010,7 @@ msgstr "Logout di tutte le sessioni" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAPPA" @@ -2001,7 +2018,7 @@ msgstr "MAPPA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2009,7 +2026,7 @@ msgstr "" msgid "Manual order" msgstr "Ordinamento manuale" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Mappa" @@ -2021,11 +2038,11 @@ msgstr "Segna come inviato" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Messaggio" @@ -2045,24 +2062,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2071,6 +2089,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2096,9 +2119,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nome" @@ -2111,6 +2134,12 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Le informazioni dettagliate sono limitate a %d caratteri." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2177,6 +2206,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nuova password:" @@ -2262,11 +2293,18 @@ msgstr "Più recenti" msgid "Next" msgstr "Prossimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Prossimo" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2279,6 +2317,11 @@ msgstr "Prossimo" msgid "No" msgstr "No" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Conferma l'account" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Nessun'area" @@ -2287,7 +2330,7 @@ msgstr "Nessun'area" msgid "No body" msgstr "Nessun corpo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nessun comune selezionato" @@ -2320,7 +2363,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Nessun risultato ritornato" @@ -2392,16 +2435,6 @@ msgstr "" msgid "Notice" msgstr "Avviso" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Ora per inserire il tuo aggiornamento…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2410,15 +2443,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2470,6 +2503,14 @@ msgstr "" msgid "Options" msgstr "Opzioni" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2478,15 +2519,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2522,15 +2563,13 @@ msgstr "Parente" msgid "Partial" msgstr "Parziale" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Password (opzionale)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2548,16 +2587,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numero di telefono" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Numero di telefono (opzionale)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Telefono verificato:" @@ -2568,12 +2612,14 @@ msgstr "Telefono verificato:" msgid "Phone:" msgstr "Telefono:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2587,7 +2633,7 @@ msgstr "Telefono:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Fotografia richiesta." @@ -2595,12 +2641,12 @@ msgstr "Fotografia richiesta." msgid "Photo required" msgstr "Fotografia richiesta" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2621,7 +2667,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Inserisci il cursore sulla mappa" @@ -2641,7 +2687,7 @@ msgstr "Per favore controlla la password e prova ancora" msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2650,15 +2696,15 @@ msgid "Please check your phone number is correct" msgstr "Assicurati che il tuo numero di telefono sia esatto" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Per favore scegli una categoria" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2680,12 +2726,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Per favore non abusarne — abusandone il comune svaluterà il servizio per tutti gli utenti." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2693,8 +2739,8 @@ msgstr "Per favore inserisci un messaggio" msgid "Please enter a mobile number" msgstr "Inserisci un numero di cellulare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Inserire un nome" @@ -2704,22 +2750,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Per favore inserisci la password" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Per favore inserire un email valida" @@ -2728,13 +2774,13 @@ msgstr "Per favore inserire un email valida" msgid "Please enter a valid email address" msgstr "Per favore inserire un indirizzo email valido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Inserire un numero di telefono oppure un'email valida" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " @@ -2744,39 +2790,39 @@ msgstr "Per favore inserire qualche dettaglio " #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Per favore inserisci la tua email" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Per favore inserisci il tuo nome" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Per favore inserisci il tuo numero di telefono" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Per favore inserisci il tuo cognome" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Per favore inserisci il tuo titolo" @@ -2803,8 +2849,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2816,7 +2862,7 @@ msgstr "Gli aggiornamenti non verranno inviati al comune." msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "La tua segnalazione non è stata inviata. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala." @@ -2830,11 +2876,11 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2867,15 +2913,15 @@ msgstr "Per favore seleziona il tipo di avvertimento che desideri" msgid "Please state whether or not the problem has been fixed" msgstr "Si prega di indicare se il problema è stato risolto" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Invia un'unica fotografia" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2883,9 +2929,7 @@ msgstr "" msgid "Please write a message" msgstr "Per favore scrivi un messaggio" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Posta" @@ -2894,19 +2938,19 @@ msgstr "Posta" msgid "Postcode or street name and area" msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'area" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postato anonimamente al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postato da %s al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postato da %s (%s) al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postato da %s al %s" @@ -2941,14 +2985,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privato" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -2971,7 +3011,7 @@ msgstr "Problema %s inviato al comune %s" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema marcato come aperto." @@ -2980,7 +3020,6 @@ msgid "Problem state change based on survey results" msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -3005,7 +3044,7 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemi entro %.1fkm da %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3030,26 +3069,26 @@ msgstr "" msgid "Property address:" msgstr "L'indirizzo della proprietà:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3118,7 +3157,7 @@ msgstr "RSS feed di %s, dentro al quartiere %s " msgid "RSS feed of nearby problems" msgstr "RSS feed dei problemi vicino" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3143,7 +3182,7 @@ msgstr "RSS feed degli aggiornamenti su questa segnalazione" msgid "Receive email when updates are left on this problem." msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3187,9 +3226,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3221,14 +3260,14 @@ msgid "Report ID:" msgstr "ID segnalazione:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Segnala un problema" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Segnala un problema qui" @@ -3238,13 +3277,13 @@ msgstr "Segnala un problema qui" msgid "Report abuse" msgstr "Segnala un abuso" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "Segnala un ulteriore problema qui" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3272,8 +3311,8 @@ msgstr "Segnala, conosci e discuti sui problemi della tua città " msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Segnalato anonimamente al %s" @@ -3282,8 +3321,8 @@ msgstr "Segnalato anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Segnalato da %s al %s" @@ -3292,31 +3331,31 @@ msgstr "Segnalato da %s al %s" msgid "Reported by:" msgstr "Segnalato da:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Segnalato via %s in modo anonimo il %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Segnalato via %s da %s il %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3327,7 +3366,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3336,17 +3375,22 @@ msgstr "Stai segnalando un problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Segnalazioni" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Segnalazioni in attesa di approvazione" @@ -3367,7 +3411,7 @@ msgstr "" msgid "Reports published" msgstr "Segnalazioni pubblicate" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "Segnalazioni salvate offline." @@ -3427,20 +3471,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Torna all'originale" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "E' il posto giusto?" @@ -3452,15 +3496,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Ruota a sinistra" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3471,7 +3515,7 @@ msgstr "Ruota a destra" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3485,8 +3529,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3501,7 +3545,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3541,13 +3585,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3577,7 +3620,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3595,11 +3638,11 @@ msgstr "Login tramite email" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3631,9 +3674,9 @@ msgid "Share" msgstr "Condividi" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3641,19 +3684,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3665,7 +3708,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3678,17 +3721,17 @@ msgstr "" msgid "Show older reports" msgstr "Ricerca segnalazioni" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3696,20 +3739,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Entra" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3718,6 +3761,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Entra o crea un nuovo account" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Inserisci una password" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3760,15 +3808,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Ci scusiamo, non possiamo trovare questa zona." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3778,7 +3826,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3821,13 +3869,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Stato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3846,14 +3894,13 @@ msgid "State:" msgstr "Stato:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3883,7 +3930,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Sottocategoria" @@ -3891,21 +3938,22 @@ msgstr "Sottocategoria" msgid "Subdivision/Body" msgstr "Sottodivisione/Corpo" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Soggetto" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Soggetto:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Invia" @@ -3956,8 +4004,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3991,18 +4038,22 @@ msgstr "" msgid "Survey Results" msgstr "Risultati sondaggio" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testo" @@ -4013,6 +4064,7 @@ msgstr "Solo versione testuale" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4046,7 +4098,7 @@ msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizz 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 "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4060,7 +4112,6 @@ msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovar #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4073,27 +4124,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "La segnalazione non può essere vista su %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Quella segnalazione è stata rimossa da FixMyStreet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4233,7 +4284,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Per favore inserire un email valida" @@ -4251,7 +4302,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4268,14 +4319,18 @@ msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." @@ -4283,10 +4338,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4311,15 +4375,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4350,10 +4405,10 @@ msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona d 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -4392,7 +4447,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4408,7 +4463,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4424,7 +4479,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4508,7 +4562,7 @@ msgstr "Traduzioni" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4518,7 +4572,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Prova ancora" @@ -4554,7 +4608,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Non confermato" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Sconosciuto" @@ -4562,18 +4616,18 @@ msgstr "Sconosciuto" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Errore sconosciuto" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4592,7 +4646,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4600,11 +4654,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4644,22 +4698,22 @@ msgstr "" msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Aggiornato!" @@ -4670,7 +4724,7 @@ msgstr "Aggiornato!" msgid "Updates" msgstr "Aggiornamenti" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4726,26 +4780,26 @@ msgstr "" msgid "User Import" msgstr "%s segnalazione" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4769,10 +4823,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Utenti" @@ -4817,6 +4869,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4847,7 +4903,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4908,7 +4964,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4936,17 +4992,15 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4960,11 +5014,11 @@ msgstr "" msgid "Yes" msgstr "Si" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4972,11 +5026,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4993,7 +5047,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5015,11 +5069,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Hai rifiutato; Per favore riempi il box qui sopra " -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5027,7 +5081,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5105,11 +5159,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "La tua email" @@ -5118,9 +5172,9 @@ msgstr "La tua email" msgid "Your email address" msgstr "Tuo indirizzo email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5128,9 +5182,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Il tuo nome" @@ -5146,13 +5198,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Tua password" @@ -5161,15 +5213,15 @@ msgstr "Tua password" msgid "Your password has been changed" msgstr "La tua password è stata cambiata" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Il tuo numero di telefono" @@ -5190,7 +5242,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Il tuo nome" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5202,8 +5259,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5221,13 +5278,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5253,7 +5312,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5291,6 +5350,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Entra o crea un nuovo account" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5327,12 +5395,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5348,11 +5416,11 @@ msgstr "" msgid "today" msgstr "oggi" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5368,11 +5436,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5542,8 +5610,25 @@ msgid_plural "reports" msgstr[0] "segnalazione" msgstr[1] "segnalazioni" -#~ msgid "Enter a password" -#~ msgstr "Inserisci una password" +#~ msgid "No let me sign in by email" +#~ msgstr "No lasciami entrare con l'email" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Modifica dettagli corpo" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una città " + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Lasciami loggato su questo computer" + +#~ msgid "Now to submit your report…" +#~ msgstr "Ora per inserire la tua segnalazione…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Ora per inserire il tuo aggiornamento…" #~ msgid "Password:" #~ msgstr "Password:" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index c20bb08d1fc..acf2360bd83 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "ir" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(neišsiųsta tarybai)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(pasirinktinai)" @@ -177,9 +177,9 @@ msgstr "(išsiųsta į abu)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Išsirinktite kategorija --" @@ -212,7 +212,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -221,34 +221,24 @@ msgstr "" msgid "%s live problems" msgstr "%s Problemos tiesiogiai" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Ne Leisti patvirtinti mano pranešimą el. paštu" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Ne Leisti patvirtinti mano pranešimą el. paštu" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Ne Leisti patvirtinti mano atnaujinimą el. paštu" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Ne Leisti patvirtinti mano atnaujinimą el. paštu" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Ne leisti man prisijungti el. paštu" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Ne leisti man prisijungti el. paštu" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Pastaba: Šis pranešimas jau išsiūstas vykdymui. Bet kokie pakeitimai nebus perduoti." @@ -257,12 +247,15 @@ msgstr "Pastaba: Šis pranešimas jau išsiūstas vykdymui. Bet msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Pastaba: Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Taip Aš turiu slaptažodį" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Kaip pranešti apie problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -328,9 +321,9 @@ msgstr "(Nėra telefono numerio)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Įdėti į trumpajį sąrašą" @@ -340,16 +333,15 @@ msgstr "Įdėti į trumpajį sąrašą" msgid "Add user" msgstr "Pridėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Pridėti/redaguoti problemų kategorijas" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Pridėti/redaguoti atsakymų prioritetus" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Pridėti/redaguoti atsakymo šablonus" @@ -357,7 +349,7 @@ msgstr "Pridėti/redaguoti atsakymo šablonus" msgid "Added %s" msgstr "Pridėta %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -377,7 +369,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Įspėti mane apie atnaujinimus" @@ -445,34 +438,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Atnaujinimas - Problema sutvarkyta" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anoniminis" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anoniminis" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anoniminis:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -509,7 +504,7 @@ msgstr "Priskirti išoriniai institucijai:" msgid "Assign to subdivision:" msgstr "Priskirti padaliniui:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -543,6 +538,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -555,12 +554,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Laukiama " -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Atgal" @@ -574,10 +573,8 @@ msgid "Ban user" msgstr "Pažymėti vartotoją" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -614,7 +611,6 @@ msgid "Can't see the map? Skip this step" msgstr "Nematote žemėlapio? Praleiskite šitą žingsnį" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -647,7 +643,7 @@ msgstr "Kategorija" msgid "Category and State" msgstr "Kategorija" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -657,6 +653,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -720,7 +717,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -748,6 +745,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -760,7 +761,7 @@ msgstr "" msgid "Closed" msgstr "Uždaryta" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Uždaryta " @@ -790,18 +791,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" @@ -815,8 +815,7 @@ msgstr "Patvirtinti" msgid "Confirm account" msgstr "Patvirtinti paskyrą" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -835,7 +834,7 @@ msgstr "Patvirtinimas" msgid "Confirmed" msgstr "Patvirtinta" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -846,16 +845,20 @@ msgstr "Patvirtinta:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Susiekite su Mumis" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Susisiekite su komanda" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -865,12 +868,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Vartotojas nerastas" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Vieta nenustatyta" @@ -906,6 +909,11 @@ msgstr "Sukurta" msgid "Create a report" msgstr "Sukurti pranešimą" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Sukurti pranešimą" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -915,18 +923,15 @@ msgstr "Sukurti kategoriją" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -944,7 +949,7 @@ msgstr "Sukurta" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -970,7 +975,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Šiuo metu ne viena institucija nėra sukurta." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -998,6 +1003,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1007,7 +1016,7 @@ msgstr "" msgid "Delete" msgstr "Ištrinta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1019,8 +1028,8 @@ msgstr "Pašalinti šabloną" msgid "Deleted" msgstr "Ištrinta" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1036,17 +1045,18 @@ msgstr "Aprašymas" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Išsamiau" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1078,8 +1088,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1088,11 +1098,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1104,7 +1110,7 @@ msgstr "" msgid "Don’t know" msgstr "Don’t nežinau" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Nepatinka anketos?" @@ -1112,7 +1118,7 @@ msgstr "Nepatinka anketos?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1156,34 +1162,36 @@ msgstr "Redaguoti" msgid "Edit body details" msgstr "Redaguoti institucijos informaciją" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Redaguoti institucijos informaciją" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Redaguoti institucijos informaciją" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Atnaujinimo redagavimas %d" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1216,20 +1224,20 @@ msgstr "Redaktorius" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "El. paštas" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Slaptažodis (nebūtina)" @@ -1242,6 +1250,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1331,11 +1347,6 @@ msgstr "Įveskite Zürich gatvės pavadinimą" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1386,11 +1397,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1433,6 +1444,8 @@ msgstr "Papildoma informacija:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Papildoma informacija:" @@ -1455,6 +1468,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1532,17 +1550,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Daugiau informacijos rasite How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Pamiršote slaptažodį?" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Pamiršote slaptažodį?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1600,7 +1623,7 @@ msgstr "Pirmyn" msgid "Going to send questionnaire?" msgstr "Ar ruošiates išsiųsti klausimyną?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1666,7 +1689,7 @@ msgstr "Paslėpta" msgid "Hide all reports and updates" msgstr "Flagged reports and users" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1689,11 +1712,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Paslėpti smeigtukus" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1718,7 +1741,7 @@ msgstr "Pradžia" msgid "How to report a problem" msgstr "Kaip pranešti apie problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Kaip išsiųsti sėkminga pranešimą" @@ -1782,7 +1805,7 @@ msgstr "" "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." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1903,7 +1926,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1923,8 +1946,8 @@ msgstr "Invalid agency_responsible value %s" msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1936,13 +1959,6 @@ msgstr "Patikrinkite mūsų D.U.K gal atsakymas yra ten." msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Palikti mane prisijungusi su šiuo komputeriu" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1982,6 +1998,7 @@ msgstr "Paskutinis atnaujinimas:" msgid "Last update:" msgstr "Last update:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2007,7 +2024,7 @@ msgstr "Pateikti visas praneštas problemas" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Kraunama..." @@ -2033,23 +2050,22 @@ msgstr "Vietiniai pranešimai" msgid "Locate the problem on a map of the area" msgstr "Nustatytį problemos vietą žemėlapyje" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2061,7 +2077,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAP" @@ -2069,7 +2085,7 @@ msgstr "MAP" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2077,7 +2093,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Žemėlapis" @@ -2089,11 +2105,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Mark users whose behaviour you want to keep a check on as flagged." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Žinutė" @@ -2113,24 +2129,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Missing jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2139,6 +2156,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Moderated by division within one working day" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2164,9 +2186,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Vardas" @@ -2179,6 +2201,11 @@ msgstr "Vardas" msgid "Name:" msgstr "Vardas:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2247,6 +2274,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2333,11 +2362,18 @@ msgstr "" msgid "Next" msgstr "Kitas" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Kitas" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2350,6 +2386,11 @@ msgstr "Kitas" msgid "No" msgstr "Ne" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Patvirtinti paskyrą" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2358,7 +2399,7 @@ msgstr "" msgid "No body" msgstr "Nėra institucijos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nepasirinkta savivaldybė" @@ -2391,7 +2432,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Jokių rezultatų" @@ -2469,16 +2510,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Dabar patvirtinti jūsų update…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2487,15 +2518,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Gerai" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2547,6 +2578,14 @@ msgstr "Open311 specification" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2555,15 +2594,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2600,15 +2639,13 @@ msgstr "Parent" msgid "Partial" msgstr "Dalinis" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Slaptažodis (nebūtina)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2626,16 +2663,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefono numeris" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefono numeris (nebūtina)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2646,12 +2688,14 @@ msgstr "" msgid "Phone:" msgstr "Telefonas:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2665,7 +2709,7 @@ msgstr "Telefonas:" msgid "Photo" msgstr "Nuotrauka" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2673,12 +2717,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2699,7 +2743,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Padėkite smeigtuką ant žemėlapio" @@ -2719,7 +2763,7 @@ msgstr "Prašome patikrinti slaptažodžius ir pabandykite dar kartą" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2729,15 +2773,15 @@ msgid "Please check your phone number is correct" msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Prašome pasirinkti kategoriją" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2759,12 +2803,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Prašome neįžeidinėti — įžeidinėjimai nuvertina paslaugą visiems vartotojams." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Prašome įvesti žinutę" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2773,8 +2817,8 @@ msgstr "Prašome įvesti žinutę" msgid "Please enter a mobile number" msgstr "Prašome įvesti savo telefono numerį" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2784,22 +2828,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Prašome įvesti slaptažodį" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Prašome įvesti temą" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Prašome įvesti galiojantį el. paštą" @@ -2808,14 +2852,14 @@ msgstr "Prašome įvesti galiojantį el. paštą" msgid "Please enter a valid email address" msgstr "Prašome įvesti galiojantį el. pašto adresą" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Prašome įvesti savo telefono numerį" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Prašome įvesti daugiau informacijos" @@ -2825,39 +2869,39 @@ msgstr "Prašome įvesti daugiau informacijos" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Prašome įvesti savo el. paštą" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Prašome įvesti savo vardą" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Prašome įvesti savo vardą" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Prašome įvesti savo telefono numerį" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Prašome įvesti savo pavardę" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Prašome įvesti savo vardą" @@ -2884,8 +2928,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Prašome nurodyti, ar norite gauti kitą klausimyną." -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2897,7 +2941,7 @@ msgstr "Atkreipkite dėmesį, kad naujinimai nėra siunčiama savivaldybei." msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Atkreipkite dėmesį, kad jūsų pranešimas dar nėra išsiųstas. Pasirinkite kategorija ir pridėkite išsamesnę informacija, tada patvirtinkite." @@ -2911,12 +2955,12 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dėmėsį:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2949,15 +2993,15 @@ msgstr "Prašome pasirinkti pageidaujama įspėjimo tipą" msgid "Please state whether or not the problem has been fixed" msgstr "Prašome nurodyti, ar problema buvo sutvarkyta" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2965,9 +3009,7 @@ msgstr "" msgid "Please write a message" msgstr "Prašome įvesti žinutę" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Įkelti" @@ -2976,19 +3018,19 @@ msgstr "Įkelti" msgid "Postcode or street name and area" msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Pateikta anonimiškai %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -3023,14 +3065,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privatus" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3053,7 +3091,7 @@ msgstr "Problema %s išsiųsta savivaldybei %s" msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybės" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema pažymėta kaip atidaryta" @@ -3062,7 +3100,6 @@ msgid "Problem state change based on survey results" msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemos" @@ -3089,7 +3126,7 @@ msgstr "Neseniai praneštos problemos FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemos %.1fkm atstumu aplink šią vietovę" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3115,26 +3152,26 @@ msgstr "" msgid "Property address:" msgstr "Nuosavybės adresas:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Pateikti naujinimą" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3203,7 +3240,7 @@ msgstr "RSS srautas %s, viduje %s rajono" msgid "RSS feed of nearby problems" msgstr "Šalia esančių problemų RSS srautas" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3228,7 +3265,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3273,9 +3310,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3307,14 +3344,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3325,14 +3362,14 @@ msgstr "Kaip pranešti apie problema" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Kaip pranešti apie problema" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3360,8 +3397,8 @@ msgstr "Praneškite, pamatykite arba diskutuokite apie vietines problemas" msgid "Report, view, or discuss local problems" msgstr "Praneškite, pamatykite arba diskutuokite apie vietines problemas" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3370,8 +3407,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3380,31 +3417,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3415,7 +3452,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3424,17 +3461,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3455,7 +3497,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3516,20 +3558,20 @@ msgstr "Atsakymo Šablonai" msgid "Response Templates for %s" msgstr "%s Atsakymo Šablonai" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3541,15 +3583,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3560,7 +3602,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3574,8 +3616,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3590,7 +3632,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3630,13 +3672,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3667,7 +3708,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3684,11 +3725,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3721,9 +3762,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3731,19 +3772,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3755,7 +3796,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3768,17 +3809,17 @@ msgstr "" msgid "Show older reports" msgstr "Visi pranešimai" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3786,20 +3827,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3808,6 +3849,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Įveskite slaptažodį" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3850,15 +3896,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3868,7 +3914,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3911,13 +3957,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3936,14 +3982,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3973,7 +4018,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Kategorija" @@ -3982,21 +4027,22 @@ msgstr "Kategorija" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -4046,8 +4092,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4081,18 +4126,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Šablonas «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Šablonai" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4103,6 +4152,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4136,7 +4186,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4150,7 +4200,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4163,27 +4212,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4323,7 +4372,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Prašome įvesti galiojantį el. paštą" @@ -4341,7 +4390,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4358,14 +4407,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4373,10 +4425,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4401,15 +4462,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4440,10 +4492,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4482,7 +4534,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4498,7 +4550,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Flagged reports and users" @@ -4515,7 +4567,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4599,7 +4650,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4609,7 +4660,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4645,7 +4696,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4653,18 +4704,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4682,7 +4733,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4690,11 +4741,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4734,24 +4785,24 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Pastaba: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Pastaba: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4762,7 +4813,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4817,28 +4868,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "El. paštas jau yra piktnaudžiavimo sąraše" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4863,10 +4914,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4914,6 +4963,10 @@ msgstr "" msgid "View wards" msgstr "Kita" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4944,7 +4997,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5005,7 +5058,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5033,17 +5086,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5057,11 +5108,11 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5069,11 +5120,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5090,7 +5141,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5112,11 +5163,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5124,7 +5175,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5206,11 +5257,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5219,9 +5270,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5229,9 +5280,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5247,13 +5296,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5262,15 +5311,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5291,7 +5340,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Jokių kitų atnaujinimai" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5303,8 +5357,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5323,13 +5377,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5355,7 +5411,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5393,6 +5449,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5429,12 +5493,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5450,11 +5514,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5470,12 +5534,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "El. paštas jau yra piktnaudžiavimo sąraše" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" @@ -5692,8 +5756,32 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Įveskite slaptažodį" +#~ msgid "No let me sign in by email" +#~ msgstr "Ne leisti man prisijungti el. paštu" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Ne leisti man prisijungti el. paštu" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Redaguoti institucijos informaciją" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Palikti mane prisijungusi su šiuo komputeriu" + +#~ msgid "Now to submit your report…" +#~ msgstr "Dabar patvirtinti jūsų report…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Dabar patvirtinti jūsų update…" + +#~ 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." #~ msgid "Password:" #~ msgstr "Slaptažodis:" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index e5516de9adb..1fd5f39561e 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " dan " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(tidak diwajibkan)" @@ -178,9 +178,9 @@ msgstr "(hantar kepada kedua-dua)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Feed RSS untuk masalah dalam %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" @@ -213,7 +213,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -222,34 +222,24 @@ msgstr "" msgid "%s live problems" msgstr "%s masalah" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Tidak Benarkan aku mengesahkan laporanku dengan emel" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Tidak Benarkan aku mengesahkan laporanku dengan emel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Tidak Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Tidak Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Tidak benarkan aku log masuk dengan emel" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Tidak benarkan aku log masuk dengan emel" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -258,12 +248,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ya Aku ada kata laluan" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Bagaimana melaporkan masalah" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -326,9 +319,9 @@ msgstr "Nombor telefon anda" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -338,16 +331,15 @@ msgstr "" msgid "Add user" msgstr "Tambah pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -355,7 +347,7 @@ msgstr "" msgid "Added %s" msgstr "%s telah ditambahi" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -375,7 +367,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Maklumkan aku sebarang kemas kini masa depan" @@ -443,34 +436,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Ada kemas kini menanda masalah ini sebagai diselesai." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Tanpa nama" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Tanpa nama" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Tanpa Nama:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -507,7 +502,7 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -541,6 +536,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -553,12 +552,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Mengunggu penyederhanaan" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Balik" @@ -572,10 +571,8 @@ msgid "Ban user" msgstr "Tanda pengguna" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -612,7 +609,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -645,7 +641,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -655,6 +651,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -709,7 +706,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -737,6 +734,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -749,7 +750,7 @@ msgstr "" msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Ditutup oleh majlis" @@ -779,18 +780,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -804,8 +804,7 @@ msgstr "Sah" msgid "Confirm account" msgstr "Mengesahkan Akaun" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -824,7 +823,7 @@ msgstr "Pengesahan" msgid "Confirmed" msgstr "Disahkan" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -835,16 +834,20 @@ msgstr "Disahkan:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Menghubungi Kita" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Menghubungi pasukan" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -854,12 +857,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Tidak dapat mencari lokasi" @@ -895,6 +898,11 @@ msgstr "Diwujudkan" msgid "Create a report" msgstr "Laporan baru" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Log masuk atau daftarkan akaun" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -904,18 +912,15 @@ msgstr "Kategori baru" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -933,7 +938,7 @@ msgstr "Diwujudkan" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -959,7 +964,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Belum ada badan wujud pada masa kini." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -987,6 +992,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -996,7 +1005,7 @@ msgstr "" msgid "Delete" msgstr "Dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1008,8 +1017,8 @@ msgstr "" msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1025,17 +1034,18 @@ msgstr "Huraian" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Perincian" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1067,8 +1077,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1077,11 +1087,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1093,7 +1099,7 @@ msgstr "" msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1101,7 +1107,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1142,34 +1148,36 @@ msgstr "Menyunting" msgid "Edit body details" msgstr "Edit perincian badah" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Edit perincian badah" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Edit perincian badah" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Kemas kini anda" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1202,20 +1210,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Emel" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Kata Laluan (tidah diwajibkan)" @@ -1228,6 +1236,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1305,11 +1321,6 @@ msgstr "Masukkan nama jalan Zürich" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1360,11 +1371,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1407,6 +1418,8 @@ msgstr "Data tambahan:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Data tambahan:" @@ -1429,6 +1442,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1506,17 +1524,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Untuk maklumat lanjut, lihat Bagaimana FixMyStreet mengguna Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Kata laluan anda" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Terlupai kata laluan anda?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1574,7 +1597,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1642,7 +1665,7 @@ msgstr "Tersembunyi" msgid "Hide all reports and updates" msgstr "Laporan dan pengguna ditanda" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1665,11 +1688,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Sembunyikan pin" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1694,7 +1717,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Bagaimana melaporkan masalah" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" @@ -1754,7 +1777,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1864,7 +1887,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1884,8 +1907,8 @@ msgstr "Nilai agency_responsible %s salah" msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1897,13 +1920,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Teruskan log masuk aku dalam komputer ini" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1943,6 +1959,7 @@ msgstr "Kemas kini terakhir:" msgid "Last update:" msgstr "Kemas kini terakhir:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1969,7 +1986,7 @@ msgstr "Senaraikan semua laporan masalah" msgid "Loading reports…" msgstr "Laporan anda" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Loading..." @@ -1995,23 +2012,22 @@ msgstr "Pemberitahuan tempatan" msgid "Locate the problem on a map of the area" msgstr "Mengesan masalah dalam kawasan atas peta" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2023,7 +2039,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "PETA" @@ -2031,7 +2047,7 @@ msgstr "PETA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2039,7 +2055,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2051,11 +2067,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Pesanan" @@ -2075,24 +2091,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2101,6 +2118,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2126,9 +2148,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nama" @@ -2141,6 +2163,11 @@ msgstr "Nama" msgid "Name:" msgstr "Nama:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2207,6 +2234,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2293,11 +2322,18 @@ msgstr "" msgid "Next" msgstr "Seterusnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Seterusnya" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2310,6 +2346,11 @@ msgstr "Seterusnya" msgid "No" msgstr "Tidak" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Mengesahkan Akaun" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2318,7 +2359,7 @@ msgstr "" msgid "No body" msgstr "Tiada badan" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Tiada majlis dipilihi" @@ -2351,7 +2392,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Tiada keputusan." @@ -2423,16 +2464,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Hantarkan kemas kini anda sekarang…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2441,15 +2472,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2501,6 +2532,14 @@ msgstr "Spesifikasi Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2509,15 +2548,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2554,15 +2593,13 @@ msgstr "Induk" msgid "Partial" msgstr "Separa" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2580,16 +2617,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Nombor telefon" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Nombor telefon (tidak diwajibkan)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2600,12 +2642,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2619,7 +2663,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2627,12 +2671,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2653,7 +2697,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Letakkan pin atas peta" @@ -2673,7 +2717,7 @@ msgstr "Sila periksa kata laluan dan cuba lagi" msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2683,15 +2727,15 @@ msgid "Please check your phone number is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Sila pilihkan kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2713,12 +2757,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2727,8 +2771,8 @@ msgstr "Sila masukkan pesanan" msgid "Please enter a mobile number" msgstr "Sila masukkan nombor telefon anda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2738,22 +2782,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Sila masukkan kata laluan" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Silah masukkan emel yang benar" @@ -2762,14 +2806,14 @@ msgstr "Silah masukkan emel yang benar" msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Sila masukkan nombor telefon anda" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Sila masukkan perincian" @@ -2779,39 +2823,39 @@ msgstr "Sila masukkan perincian" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Sila masukkan emel anda" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Sila masukkan nama anda" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Sila masukkan nombor telefon anda" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Sila masukkan nama kedua anda" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Sila masukkan tajuk anda" @@ -2838,8 +2882,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2851,7 +2895,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2865,11 +2909,11 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2902,15 +2946,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2918,9 +2962,7 @@ msgstr "" msgid "Please write a message" msgstr "Sila tuliskan pesanan" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Post" @@ -2929,19 +2971,19 @@ msgstr "Post" msgid "Postcode or street name and area" msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Post tanpa nama pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Dipostkan oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Dipostkan oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Dipostkan oleh %s pada %s" @@ -2976,14 +3018,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Peribadi" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Masalah" @@ -3006,7 +3044,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -3015,7 +3053,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Masalah-masalah" @@ -3042,7 +3079,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of %s" msgstr "Masalah dalam %.1fkm dalam lokasi ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3068,26 +3105,25 @@ msgstr "" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Sediakan kemas kini" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3156,7 +3192,7 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3181,7 +3217,7 @@ msgstr "Feed RSS untuk kemas kini bagi masalah ini" msgid "Receive email when updates are left on this problem." msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3226,9 +3262,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3260,14 +3296,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3278,14 +3314,14 @@ msgstr "Bagaimana melaporkan masalah" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Bagaimana melaporkan masalah" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3312,8 +3348,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3322,8 +3358,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3332,31 +3368,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3367,7 +3403,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3376,17 +3412,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3407,7 +3448,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3468,20 +3509,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3493,15 +3534,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3512,7 +3553,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3526,8 +3567,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3542,7 +3583,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3582,13 +3623,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3619,7 +3659,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3636,11 +3676,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" @@ -3673,9 +3713,9 @@ msgid "Share" msgstr "Kongsi" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3683,19 +3723,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3707,7 +3747,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3721,17 +3761,17 @@ msgstr "Tunjukkan lama" msgid "Show older reports" msgstr "Laporan anda" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3739,20 +3779,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Log masuk" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3761,6 +3801,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Log masuk atau daftarkan akaun" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Masukkan kata laluan" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3803,15 +3848,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3821,7 +3866,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3865,13 +3910,13 @@ msgstr "Tarikh bermula:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3890,15 +3935,14 @@ msgid "State:" msgstr "Negeri:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Negeri" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3928,7 +3972,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Subkategori: %s" @@ -3937,21 +3981,22 @@ msgstr "Subkategori: %s" msgid "Subdivision/Body" msgstr "Bahagian bawah/Badan" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Tajuk" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Tajuk:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Hantar" @@ -4003,8 +4048,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4039,18 +4083,22 @@ msgstr "" msgid "Survey Results" msgstr "Hasil Kajian" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Teks" @@ -4061,6 +4109,7 @@ msgstr "Versi teks sahaja" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4094,7 +4143,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4108,7 +4157,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4121,28 +4169,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Anda telah dilog keluarkan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4282,7 +4330,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Anda telah dilog keluarkan" @@ -4300,7 +4348,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4317,14 +4365,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4332,10 +4383,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4360,15 +4420,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4399,10 +4450,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4441,7 +4492,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." @@ -4457,7 +4508,7 @@ msgstr "Laporan ini ditanda sebagai diselesai sekarang." msgid "This report is currently marked as open." msgstr "Laporan ini ditanda sebagai terbuka sekarang." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Laporan ini ditanda sebagai terbuka sekarang." @@ -4474,7 +4525,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -4558,7 +4608,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4568,7 +4618,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Cuba lagi" @@ -4604,7 +4654,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Belum dipastikan" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Tidak diketahui" @@ -4612,18 +4662,18 @@ msgstr "Tidak diketahui" msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Ralat tidak diketahui" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" @@ -4642,7 +4692,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Kemas kini" @@ -4650,11 +4700,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" @@ -4694,24 +4744,24 @@ msgstr "Status kemas kini" msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Dipostkan oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Dipostkan oleh %s pada %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Dikemas kinikan!" @@ -4722,7 +4772,7 @@ msgstr "Dikemas kinikan!" msgid "Updates" msgstr "Kemas kini" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4777,28 +4827,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Emel telah dalam senarai penyalahguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Pengguna ditanda" @@ -4824,10 +4874,8 @@ msgid "User:" msgstr "Pengguna" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Pengguna" @@ -4875,6 +4923,10 @@ msgstr "Melihat laporan dengan kawasan pentadbiran" msgid "View wards" msgstr "kawasan lain:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4905,7 +4957,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4967,7 +5019,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4995,17 +5047,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5019,11 +5069,11 @@ msgstr "" msgid "Yes" msgstr "Ya" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5031,11 +5081,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5052,7 +5102,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5074,11 +5124,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Anda menolak; sila isikan kotak di atas" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5086,7 +5136,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5171,11 +5221,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emel Anda" @@ -5184,9 +5234,9 @@ msgstr "Emel Anda" msgid "Your email address" msgstr "Alamat emel anda" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Alamat emel anda" @@ -5195,9 +5245,7 @@ msgstr "Alamat emel anda" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Maklumat anda akan digunakan mengikuti dasar privasi kita" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Nama anda" @@ -5213,13 +5261,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Kata laluan anda" @@ -5228,15 +5276,15 @@ msgstr "Kata laluan anda" msgid "Your password has been changed" msgstr "Kata laluan anda telah diubahi" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Nombor telefon anda" @@ -5258,7 +5306,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Kata laluan anda telah diubahi" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Kemas kini anda" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5270,8 +5323,8 @@ msgstr "Kemas kini anda" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5289,13 +5342,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5321,7 +5376,7 @@ msgstr "seperti ‘%s’ atau ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5360,6 +5415,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "ditanda sebagai bukan tanggungjawab majlis" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Log masuk atau daftarkan akaun" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5396,12 +5460,12 @@ msgstr "log keluar" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "majlis tempatan" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" @@ -5418,11 +5482,11 @@ msgstr "jenis masalah tempatan ini" msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5438,12 +5502,12 @@ msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d" msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Emel telah dalam senarai penyalahguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" @@ -5591,8 +5655,26 @@ msgid "report" msgid_plural "reports" msgstr[0] "" -#~ msgid "Enter a password" -#~ msgstr "Masukkan kata laluan" +#~ msgid "No let me sign in by email" +#~ msgstr "Tidak benarkan aku log masuk dengan emel" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Tidak benarkan aku log masuk dengan emel" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Edit perincian badah" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Teruskan log masuk aku dalam komputer ini" + +#~ msgid "Now to submit your update…" +#~ msgstr "Hantarkan kemas kini anda sekarang…" #~ msgid "Password:" #~ msgstr "Kata Laluan:" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index 102b7d342c7..6b3e16a63c6 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "ႏွင့္" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(ေကာင္စီသို႔မပို႔ပါ)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)" @@ -178,9 +178,9 @@ msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)" msgid "(we also have RSS feeds for problems within %s)" msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --" @@ -210,7 +210,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -219,34 +219,24 @@ msgstr "" msgid "%s live problems" msgstr " %s ဘ၀ျပႆနာမ်ား" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -255,12 +245,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "ဟုတ္ကဲ့ ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -323,9 +316,9 @@ msgstr "သင္၏ ဖုန္းနံပါတ္" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -335,16 +328,15 @@ msgstr "" msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -352,7 +344,7 @@ msgstr "" msgid "Added %s" msgstr "%sကိုထည့္ျပီးျပီ" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -372,7 +364,8 @@ msgstr "Parameters %s/%s ၊ အမ်ိဳးအစား %s ၊ %s အတြ msgid "Alert %d disabled (created %s)" msgstr "အသိေပးခ်က္%dကိုပိတ္ထားသည္(%sကိုဖန္တီးျပီး)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္းကၽြႏ္ုပ္ကိုအသိေပးမည္" @@ -440,34 +433,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "ေျဖရွင္းထားသည့္ ျပႆနာကို အမွတ္အသားျပဳလုပ္ထားသည္။" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "အမည္မသိ" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "အမည္မသိ" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "အမည္မသိ-" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -504,7 +499,7 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ msgid "Assign to subdivision:" msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -538,6 +533,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -550,12 +549,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "ေနာက္သို႔" @@ -569,10 +568,8 @@ msgid "Ban user" msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -609,7 +606,6 @@ msgid "Can't see the map? Skip this step" msgstr "ေျမပံုကိုမျမင္ဘူးလား။ ဒီအဆင့္ကိုေက်ာ္မည္ " #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -642,7 +638,7 @@ msgstr "အမ်ိဳးအစား" msgid "Category and State" msgstr "အမ်ိဳးအစား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -652,6 +648,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -706,7 +703,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -734,6 +731,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -746,7 +747,7 @@ msgstr "" msgid "Closed" msgstr "ပိတ္မည္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "ေကာင္စီမွပိတ္ထားသည္" @@ -776,18 +777,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သတ္မွတ္ျခင္း" @@ -801,8 +801,7 @@ msgstr "အတည္ျပဳမည္" msgid "Confirm account" msgstr "အေကာင့္ကိုအတည္ျပဳမည္" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -821,7 +820,7 @@ msgstr "အတည္ျပဳျခင္း" msgid "Confirmed" msgstr "အတည္ျပဳခဲ့သည္" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -832,16 +831,20 @@ msgstr "အတည္ျပဳခဲ့ခ်ိန္-" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "ကၽြႏ္ုပ္တို႔ႏွင့္ဆက္သြယ္ပါ" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -851,12 +854,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "တည္ေနရာကိုရွာမေတြ႕ပါ" @@ -892,6 +895,11 @@ msgstr "ဖန္တီးမည္" msgid "Create a report" msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီးမည္" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "ဝင္ရန္ သို႔မဟုတ္ အေကာင့္တစ္ခု ဖန္တီးရန္" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -901,18 +909,15 @@ msgstr "အမ်ိဳးအစားဖန္တီးမည္" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -930,7 +935,7 @@ msgstr "ဖန္တီးမည္" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -956,7 +961,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမဖန္တီးရေသးပါ" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -984,6 +989,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -993,7 +1002,7 @@ msgstr "" msgid "Delete" msgstr "ဖ်က္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1005,8 +1014,8 @@ msgstr "" msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1022,17 +1031,18 @@ msgstr "ေဖာ္ျပခ်က္" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "အေသးစိတ္အခ်က္အလက္" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1064,8 +1074,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1074,11 +1084,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1090,7 +1096,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1098,7 +1104,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1139,34 +1145,36 @@ msgstr "ျပင္ဆင္မည္" msgid "Edit body details" msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1199,20 +1207,20 @@ msgstr "အယ္ဒီတာ" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "အီးေမးလ္" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)" @@ -1225,6 +1233,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1302,11 +1318,6 @@ msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ" msgid "Enter a nearby UK postcode, or street name and area" msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1357,11 +1368,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1404,6 +1415,8 @@ msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" @@ -1426,6 +1439,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1503,17 +1521,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "သင္၏ စကားဝွက္" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "သင္၏စကား၀ွက္ေမ့သြားျပီလား။" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1571,7 +1594,7 @@ msgstr "သြားမည္" msgid "Going to send questionnaire?" msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1639,7 +1662,7 @@ msgstr "ေဖ်ာက္ထားေသာ" msgid "Hide all reports and updates" msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1662,11 +1685,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1691,7 +1714,7 @@ msgstr "ပင္မ" msgid "How to report a problem" msgstr "ျပႆနာကိုဘယ္လိုအစီရင္ခံစာတင္မလဲ။" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္ခံစာကိုဘယ္လိုပို႔မလဲ" @@ -1751,7 +1774,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1861,7 +1884,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1881,8 +1904,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1894,13 +1917,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "ဒီကြန္ျပဴတာမွာ၀င္ေနေအာင္ျပဳလုပ္မည္" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1940,6 +1956,7 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္ msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1966,7 +1983,7 @@ msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆန msgid "Loading reports…" msgstr "သင္၏ အစီရင္ခံစာမ်ား" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "ဖြင့္ေနသည္" @@ -1992,23 +2009,22 @@ msgstr "ေဒသတြင္းအသိေပးခ်က္" msgid "Locate the problem on a map of the area" msgstr "ဧရိယာ၏ေျမပံုတစ္ခုတြင္ျပႆနာကိုေနရာသတ္မွတ္မည္" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2020,7 +2036,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "ေျမပံု" @@ -2028,7 +2044,7 @@ msgstr "ေျမပံု" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2036,7 +2052,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2048,11 +2064,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "စာ" @@ -2072,24 +2088,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2098,6 +2115,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2123,9 +2145,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "အမည္" @@ -2138,6 +2160,11 @@ msgstr "အမည္" msgid "Name:" msgstr "အမည္-" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2204,6 +2231,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2290,11 +2319,18 @@ msgstr "" msgid "Next" msgstr "ေနာက္သို႔" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "ေနာက္သို႔" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2307,6 +2343,11 @@ msgstr "ေနာက္သို႔" msgid "No" msgstr "မရွိပါ" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "အေကာင့္ကိုအတည္ျပဳမည္" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2315,7 +2356,7 @@ msgstr "" msgid "No body" msgstr "စာကိုယ္မရွိ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ" @@ -2348,7 +2389,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "ရလဒ္မေတြ႕ပါ" @@ -2420,16 +2461,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "ယခုသင္၏အစီရင္ခံစာကိုသြင္းႏိုင္ပါျပီ …" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2438,15 +2469,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "အိုေက" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2498,6 +2529,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2506,15 +2545,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2551,15 +2590,13 @@ msgstr "ပင္မ" msgid "Partial" msgstr "တစ္၀က္" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "အျမဲတမ္းလင့္ခ္" @@ -2577,16 +2614,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "ဖုန္းနံပါတ္" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2597,12 +2639,14 @@ msgstr "" msgid "Phone:" msgstr "ဖုန္း-" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2616,7 +2660,7 @@ msgstr "ဖုန္း-" msgid "Photo" msgstr "ဓာတ္ပံု" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2624,12 +2668,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2650,7 +2694,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္" @@ -2670,7 +2714,7 @@ msgstr "စကား၀ွက္ကိုျပန္စစ္ေဆးျပီ msgid "Please check your email address is correct" msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2680,15 +2724,15 @@ msgid "Please check your phone number is correct" msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2710,12 +2754,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2724,8 +2768,8 @@ msgstr "စာတစ္ခုရိုက္ထည့္ပါ" msgid "Please enter a mobile number" msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2735,22 +2779,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရိုက္ထည့္ပါ" @@ -2759,14 +2803,14 @@ msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရ msgid "Please enter a valid email address" msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" @@ -2776,39 +2820,39 @@ msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကို #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "သင္၏အီးေမးလ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "သင္၏ဒုတိယအမည္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "သင္၏ေခါင္းစဥ္ကိုရိုက္ထည့္ပါ" @@ -2835,8 +2879,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2848,7 +2892,7 @@ msgstr "အသစ္မြမ္းမံမႈမ်ားသည္ေကာင msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2862,12 +2906,12 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2900,15 +2944,15 @@ msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္ msgid "Please state whether or not the problem has been fixed" msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2916,9 +2960,7 @@ msgstr "" msgid "Please write a message" msgstr "စာတစ္ေၾကာင္းေရးပါ" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "တင္မည္" @@ -2927,19 +2969,19 @@ msgstr "တင္မည္" msgid "Postcode or street name and area" msgstr "အနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "%s မွာ %s မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "%s မွာ %s(%s)မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "%s မွာ %sမွတင္ခဲ့သည္" @@ -2974,14 +3016,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "ကိုယ္ပိုင္" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "ျပႆနာ" @@ -3004,7 +3042,7 @@ msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပိ msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "ျပႆနာကို ဖြင့္ထားသည္" @@ -3013,7 +3051,6 @@ msgid "Problem state change based on survey results" msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ အေျခအေန ေျပာင္းလဲသည္။" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "ျပႆနာမ်ား" @@ -3039,7 +3076,7 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3065,26 +3102,26 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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 မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3153,7 +3190,7 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ msgid "RSS feed of nearby problems" msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3178,7 +3215,7 @@ msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3223,9 +3260,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3257,14 +3294,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3275,14 +3312,14 @@ msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3310,8 +3347,8 @@ msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီ msgid "Report, view, or discuss local problems" msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3320,8 +3357,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3330,31 +3367,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3365,7 +3402,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3374,17 +3411,22 @@ msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခ #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3405,7 +3447,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3466,20 +3508,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3491,15 +3533,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကို လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3510,7 +3552,7 @@ msgstr "ညာဘက္ကို လွည့္ပါ" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3524,8 +3566,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3540,7 +3582,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3580,13 +3622,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3617,7 +3658,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3634,11 +3675,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3671,9 +3712,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3681,19 +3722,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3705,7 +3746,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3718,17 +3759,17 @@ msgstr "" msgid "Show older reports" msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3736,20 +3777,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "ဝင္ရန္" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3758,6 +3799,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "ဝင္ရန္ သို႔မဟုတ္ အေကာင့္တစ္ခု ဖန္တီးရန္" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "စကား၀ွက္ရိုက္ထည့္ပါ" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3800,15 +3846,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3818,7 +3864,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3861,13 +3907,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3887,14 +3933,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3924,7 +3969,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "အမ်ိဳးအစား" @@ -3933,21 +3978,22 @@ msgstr "အမ်ိဳးအစား" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3997,8 +4043,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4033,18 +4078,22 @@ msgstr "" msgid "Survey Results" msgstr "စစ္တမ္းရလဒ္" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "စာ" @@ -4055,6 +4104,7 @@ msgstr "စာဗားရွင္းသာ" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4088,7 +4138,7 @@ msgstr "" 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 "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ၿပီး ျဖစ္ေၾကာင္း ၾကားသိရ၍ ဝမ္းသာမိပါသည္။ သင့္အေနျဖင့္ ယခင္က ေကာင္စီထံ ျပႆနာတစ္ခုကို အစီရင္ခံတင္ျပဖူးပါသလား?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4102,7 +4152,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4115,28 +4164,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "ဒီအစီရင္ခံစာကို %s ေပၚတြင္မၾကည့္ႏိုင္ပါ" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4276,7 +4325,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ" @@ -4294,7 +4343,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4311,15 +4360,19 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "အီးေမးလ္ သို႔မဟုတ္ စကားဝွက္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ ျပန္လည္ ႀကိဳးစားပါ။" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "အီးေမးလ္ သို႔မဟုတ္ စကားဝွက္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ ျပန္လည္ ႀကိဳးစားပါ။" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "အီးေမးလ္ႏွင့္ လ်ွိဳ႕ဝွက္နံပါတ္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ သင္၏ လွ်ိဳ႕ဝွက္နံပါတ္ကို မမွတ္မိပါက သို႔မဟုတ္ မရိွေသးပါက ေလွ်က္လႊာ၏ \"အီးေမးလ္ျဖင့္ ဝင္ရန္\" ေနရာတြင္ ျဖည့္ပါ။" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4327,10 +4380,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4355,15 +4417,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4394,10 +4447,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္" @@ -4436,7 +4489,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္" @@ -4452,7 +4505,7 @@ msgstr "ဒီျပႆနာကိုေလာေလာဆယ္ေျဖရွ msgid "This report is currently marked as open." msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္" @@ -4469,7 +4522,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4553,7 +4605,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4563,7 +4615,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4599,7 +4651,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4607,18 +4659,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4636,7 +4688,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4644,11 +4696,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4688,24 +4740,24 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "%s မွာ %s(%s)မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "%s မွာ %sမွတင္ခဲ့သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4716,7 +4768,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4771,28 +4823,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း" @@ -4818,10 +4870,8 @@ msgid "User:" msgstr "အသံုးျပဳသူမ်ား" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" @@ -4869,6 +4919,10 @@ msgstr "" msgid "View wards" msgstr "အျခား ဧရိယာမ်ား" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4899,7 +4953,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4961,7 +5015,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4991,17 +5045,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5015,11 +5067,11 @@ msgstr "" msgid "Yes" msgstr "ဟုတ္သည္။" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5027,11 +5079,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေနရေၾကာင္း ျပန္လည္မြမ္းမံထားသည္ တို႔ကေဖာ္ျပေနၿပီး ထိုထဲတြင္ တစ္ကုိယ္ရည္ အခ်က္အလက္ သို႔မဟုတ္ တူညီသည့္ အခ်က္အလက္မ်ား ပါဝင္သည္။" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။" @@ -5049,7 +5101,7 @@ msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရ msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5071,11 +5123,11 @@ msgstr "သင့္အေနျဖင့္ ကၽြႏု္ပ္တို msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5086,7 +5138,7 @@ msgstr "" "မွာ သင့္ျပႆနာကို သြားေရာက္ ၾကည့္ရူႏိုင္ပါသည္။ \n" "\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5170,11 +5222,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "သင္၏ အီးေမးလ္" @@ -5183,9 +5235,9 @@ msgstr "သင္၏ အီးေမးလ္" msgid "Your email address" msgstr "သင္၏ အီးေမးလ္လိပ္စာ" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "သင္၏ အီးေမးလ္လိပ္စာ" @@ -5194,9 +5246,7 @@ msgstr "သင္၏ အီးေမးလ္လိပ္စာ" msgid "Your information will only be used in accordance with our privacy policy" msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽြႏု္ပ္တို႔၏ သီးသန္႔တည္ရွိမႈ ေပၚလစီ ႏွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္။" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "သင့္အမည္" @@ -5212,13 +5262,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "သင္၏ စကားဝွက္" @@ -5227,15 +5277,15 @@ msgstr "သင္၏ စကားဝွက္" msgid "Your password has been changed" msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "သင္၏ ဖုန္းနံပါတ္" @@ -5257,7 +5307,12 @@ msgstr "" msgid "Your token has been generated" msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5269,8 +5324,8 @@ msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈ msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5288,13 +5343,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5320,7 +5377,7 @@ msgstr "ဥပမာ ‘%s’ သို႔မဟုတ္ ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5359,6 +5416,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "ဝင္ရန္ သို႔မဟုတ္ အေကာင့္တစ္ခု ဖန္တီးရန္" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5395,12 +5461,12 @@ msgstr "ထြက္ရန္" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "ျပည္တြင္းေကာင္စီ" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပုံကို ပင္အပ္ျဖင့္ မေဖာ္ျပထားပါ" @@ -5417,11 +5483,11 @@ msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။" msgid "today" msgstr "ယေန႔" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5437,12 +5503,12 @@ msgstr "အသုံးျပဳသူသည္ တူညီသည့္ ေက msgid "user is problem owner" msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွင္ ျဖစ္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" @@ -5590,8 +5656,29 @@ msgid "report" msgid_plural "reports" msgstr[0] "" -#~ msgid "Enter a password" -#~ msgstr "စကား၀ွက္ရိုက္ထည့္ပါ" +#~ msgid "No let me sign in by email" +#~ msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "ဒီကြန္ျပဴတာမွာ၀င္ေနေအာင္ျပဳလုပ္မည္" + +#~ msgid "Now to submit your report…" +#~ msgstr "ယခုသင္၏အစီရင္ခံစာကိုသြင္းႏိုင္ပါျပီ …" + +#~ 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 မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" #~ msgid "Password:" #~ msgstr "စကား၀ွက္-" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index b8044ae9b1b..81ed1376de5 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: pere , 2017\n" "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -160,7 +160,7 @@ msgstr "(eksisterer ikke lenger)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(valgfritt)" @@ -179,9 +179,9 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(vi har også RSS-strømmer for problemer innenfor %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" @@ -211,7 +211,7 @@ msgstr "

Rapporter, statistikk og handlinger for

%s

" msgid " %s reports %s" msgstr " %s rapporter %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s lagret." @@ -220,31 +220,22 @@ msgstr "%s lagret." msgid "%s live problems" msgstr "%s aktive problemer" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Nei La meg bekrefte min rapport med e-post" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "Nei La meg bekrefte min rapport med e-post/melding" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Nei La meg bekrefte min oppdatering med e-post" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "Nei La meg bekrefte min oppdatering med e-post/melding" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Nei, la meg logge inn med e-post:" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "Nei, la meg logge inn med e-post eller melding" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Merk: Denne rapporten er sendt videre for å få noe til å skje. Ingen endringer sendes videre." @@ -253,12 +244,15 @@ msgstr "Merk: Denne rapporten er sendt videre for å få noe ti msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Merk: Denne rapporten har ikke blitt sent videre for handling. Det er ikke sikkert eventuelle endringer vil bli levert." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jeg har et passord" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Oppsummer problemet" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -318,9 +312,9 @@ msgstr "Legg til telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Legg i hurtiglisten" @@ -330,16 +324,15 @@ msgstr "Legg i hurtiglisten" msgid "Add user" msgstr "Legg til bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Legg til / endre problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Legg til / endre responsprioriteter" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Legg til / endre responsmaler" @@ -347,7 +340,7 @@ msgstr "Legg til / endre responsmaler" msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Ved å legge rapporten i hurtiglisten din vil fjerne den fra hurtiglisten til %s" @@ -367,7 +360,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -434,33 +428,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "En oppdatering markerte dette problemet som fikset." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Anonym bruker" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "En annen bruker" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Er du sikker på at du vil avbryte opplastingen?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Er du sikker?" @@ -497,7 +493,7 @@ msgstr "Tildel til ekstern administrasjon:" msgid "Assign to subdivision:" msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Tilordne brukere til områder" @@ -530,6 +526,10 @@ msgstr "Auto-svar:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Tilgjengelige kategorier" @@ -542,12 +542,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Unngå personlig informasjon og bilnummerskilt" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Avventer moderasjon" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Tilbake" @@ -560,10 +560,8 @@ msgid "Ban user" msgstr "Bannlys bruker" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -600,7 +598,6 @@ msgid "Can't see the map? Skip this step" msgstr "Hvis du ikke kan se kartet, hopp over dette steget." #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -632,7 +629,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori og tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori endret fra '%s' til '%s'" @@ -642,6 +639,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -700,7 +698,7 @@ msgstr "Velg et kategorinavn som gir mening for innbyggerne (f. msgid "Choose another" msgstr "Velg en annen" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Nullstill lokalt lagrede data" @@ -728,6 +726,10 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn." msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -740,7 +742,7 @@ msgstr "" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -770,18 +772,17 @@ msgid "Cobrand:" msgstr "Merkevaresamarbeid:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Kode" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" @@ -795,8 +796,7 @@ msgstr "Bekreft" msgid "Confirm account" msgstr "Bekreft konto" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Bekreft via e-post isteden, ved å oppgi et nytt passord da. Når du bekrefter vil passordet ditt bli oppdatert." @@ -815,7 +815,7 @@ msgstr "Bekreftelse" msgid "Confirmed" msgstr "Bekreftet" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -826,16 +826,20 @@ msgstr "Bekreftet:" msgid "Contact %s" msgstr "Kontakt %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -845,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kunne ikke finne bruker" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Klarte ikke finne posisjon" @@ -885,6 +889,11 @@ msgstr "" msgid "Create a report" msgstr "Lag en rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Logg inn eller opprett en konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -894,18 +903,15 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "Opprett prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Opprett rapporter/oppdateringer som myndigheten" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Opprett rapporter/oppdateringer på vegne av en bruker" @@ -923,7 +929,7 @@ msgstr "Opprettet" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -947,7 +953,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "I øyeblikket er ikke laget noen instanser." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kunden kan ikke kontaktes" @@ -975,6 +981,11 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Opprett rapporter/oppdateringer som myndigheten" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -984,7 +995,7 @@ msgstr "" msgid "Delete" msgstr "Slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -996,8 +1007,8 @@ msgstr "Slett mal" msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1013,17 +1024,18 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "Beskrivelse:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1055,8 +1067,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1065,11 +1077,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Ikke send epostvarsel på innhentede kommentarer til den som opprettet problemet" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Har du et %s-passord?" @@ -1081,7 +1089,7 @@ msgstr "" msgid "Don’t know" msgstr "Vet ikke" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Liker ikke skjemaer?" @@ -1089,7 +1097,7 @@ msgstr "Liker ikke skjemaer?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Dra og slipp bilder hit eller klikk for å laste opp" @@ -1133,33 +1141,36 @@ msgstr "Rediger" msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Endre andre brukeres detaljer" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Endre andre brukeres rettigheter" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Endre rapportkategori" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Moderer detaljer i rapprten" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Endre rapportprioritet" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Endre rapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Dine oppdateringer" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1192,20 +1203,20 @@ msgstr "Oppdatert av" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Epostadresse" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1217,6 +1228,14 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1303,11 +1322,6 @@ msgstr "Skriv inn et veinavn i Zürich" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1358,11 +1372,11 @@ msgstr "Eksisterende kategori" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Forklar hva som er galt" @@ -1406,6 +1420,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Ekstra data:" @@ -1428,6 +1444,11 @@ msgstr "Klarte ikke sende melding" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1505,17 +1526,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mer informasjon, se Hvordan FixMyStreet bruker Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ditt passord" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Glemt passordet ditt?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Tildelt til ekstern administrasjon" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Ønsket er sendt videre til ekstern administrasjon" @@ -1573,7 +1599,7 @@ msgstr "Fortsett" msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Gi tilgang til administratoren" @@ -1637,7 +1663,7 @@ msgstr "Skjul" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1660,11 +1686,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1689,7 +1715,7 @@ msgstr "Hjem" msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Hvordan sende inn rapporter som løses" @@ -1749,7 +1775,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Hvis to eller flere instanser er lokalisert på samme sted, kombinerer FiksGataMi identiske kategorier i en enkelt oppføring i menyen. Kontroller at du bruker samme kategorinavn for instansene, hvis dette er ønskelig." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1870,7 +1896,7 @@ msgstr "" msgid "Inspection required" msgstr "Trenger inspeksjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instruer underleverandør til å fikse problemer" @@ -1890,8 +1916,8 @@ msgstr "Ugyldig agency_responsible-verdi %s" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Ugyldig plassering. Ny plassering må være dekket av den samme administrasjonen." @@ -1903,13 +1929,6 @@ msgstr "Det er ofte raskest å sjekke FAQ-en vår og se om sv msgid "It’s on its way to the council right now." msgstr "Den er på tur mot myndigheten akkurat nå." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Husk min innlogging på denne datamaskinen" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1949,6 +1968,7 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1974,7 +1994,7 @@ msgstr "List alle rapporterte problemer" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Laster..." @@ -2000,23 +2020,22 @@ msgstr "Lokale varsler" msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2028,7 +2047,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "KART" @@ -2036,7 +2055,7 @@ msgstr "KART" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Administrer hurtigliste" @@ -2044,7 +2063,7 @@ msgstr "Administrer hurtigliste" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Kart" @@ -2056,11 +2075,11 @@ msgstr "Marker som sendt" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Merk brukere hvis adferd du ønsker å ha en sjekk på som flagget." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Melding" @@ -2080,24 +2099,25 @@ msgstr "Manglende administrasjoner:" msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderer" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Moderer detaljer i rapprten" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderer denne rapporten" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2106,6 +2126,12 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Moderert av avdeling innen en arbeidsdag" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Moderer denne rapporten" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2131,9 +2157,9 @@ msgstr "Mest kommentert" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Navn" @@ -2146,6 +2172,12 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Naviger til dette problemet" @@ -2214,6 +2246,8 @@ msgid "New note to DM:" msgstr "Nytt notat til DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nytt passord:" @@ -2299,11 +2333,18 @@ msgstr "Nyeste" msgid "Next" msgstr "Neste" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Neste" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2316,6 +2357,11 @@ msgstr "Neste" msgid "No" msgstr "Nei" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Din konto" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Intet område" @@ -2324,7 +2370,7 @@ msgstr "Intet område" msgid "No body" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -2357,7 +2403,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ingen resultater returnert" @@ -2438,16 +2484,6 @@ msgstr "Notater fra SDM til DM" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "På tide å registrere din oppdatering…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2456,15 +2492,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2516,6 +2552,14 @@ msgstr "Open311-spesifikasjon" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2524,15 +2568,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2568,15 +2612,13 @@ msgstr "Forelder" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Passord (valgfritt)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2594,16 +2636,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes." + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2614,12 +2662,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2633,7 +2683,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Bilde" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto er påkrevd." @@ -2641,12 +2691,12 @@ msgstr "Foto er påkrevd." msgid "Photo required" msgstr "Foto kreves" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2667,7 +2717,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Plasser tegnestiften på kartet" @@ -2687,7 +2737,7 @@ msgstr "Vennligst sjekk passordene og prøv igjen" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2696,15 +2746,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2729,12 +2779,12 @@ 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:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2742,8 +2792,8 @@ msgstr "Vennligst legg til en melding" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Vennligst skriv et navn" @@ -2753,22 +2803,22 @@ msgstr "Vennligst legg inn et navn for administrasjonen" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" @@ -2777,13 +2827,13 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" @@ -2793,39 +2843,39 @@ msgstr "Legg inn opplysninger om problemet" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Legg inn din e-post" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Legg inn ditt navn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Legg inn ditt telefonnummer." -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Vennligst tast inn ditt mellomnavn" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Vennligst legg inn din tittel" @@ -2854,8 +2904,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2867,7 +2917,7 @@ msgstr "Vær oppmerksom på at oppdateringer ikke blir videresendt til administr msgid "Please note your report has not yet been sent." msgstr "Merk at din rapport enda ikke har blitt sendt." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Merk at din rapport ennå ikke er sendtenda ikke har blitt sendt." msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Vennligst bidra med en offentlig oppdatering for denne rapporten." @@ -2918,15 +2968,15 @@ msgstr "Vennligst velg hvilken type varsel du ønsker" msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Vennligst last opp kun bilder" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2934,9 +2984,7 @@ msgstr "" msgid "Please write a message" msgstr "Skriv inn en melding" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Send inn" @@ -2945,19 +2993,19 @@ msgstr "Send inn" msgid "Postcode or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Lagt inn av %s %s" @@ -2992,14 +3040,10 @@ msgstr "Personvern og cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3022,7 +3066,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -3031,7 +3075,6 @@ msgid "Problem state change based on survey results" msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -3056,7 +3099,7 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3081,26 +3124,26 @@ msgstr "Problemer innenfor %s, %s" msgid "Property address:" msgstr "Eiendomsadresse:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Legg inn oppdatering som" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3169,7 +3212,7 @@ msgstr "RSS-strøm av %s, innenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3194,7 +3237,7 @@ msgstr "RSS-strøm med oppdateringer for dette problemet" msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Mottatt av %s øyeblikk senere" @@ -3239,9 +3282,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Fjern fra hurtiglisten" @@ -3273,14 +3316,14 @@ msgid "Report ID:" msgstr "Rapport-ID:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter et problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3291,14 +3334,14 @@ msgstr "Rapporter et problem" msgid "Report abuse" msgstr "Rapporter misbruk" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Rapporter et problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Rapporter som" @@ -3326,8 +3369,8 @@ msgstr "Rapporter, finn eller diskuter lokale problemer" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -3336,8 +3379,8 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3346,31 +3389,31 @@ msgstr "Publisert av %s %s" msgid "Reported by:" msgstr "Rapportert av:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3381,7 +3424,7 @@ msgstr "Rapportert:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3390,17 +3433,23 @@ msgstr "Legger til et problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Rapporter som venter på godkjenning" @@ -3421,7 +3470,7 @@ msgstr "" msgid "Reports published" msgstr "Publiserte rapporter" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3481,20 +3530,20 @@ msgstr "Responsmaler" msgid "Response Templates for %s" msgstr "Svarmaler for %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Riktig sted?" @@ -3506,15 +3555,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3525,7 +3574,7 @@ msgstr "Roter til høyre" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitt" @@ -3539,8 +3588,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3555,7 +3604,7 @@ msgid "Save with a public update" msgstr "Lagre med en offentlig oppdatering" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3595,13 +3644,12 @@ msgstr "Søket fant ingen brukere." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Se personvernreglene våre" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3632,7 +3680,7 @@ msgstr "" msgid "Select:" msgstr "Velg:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3649,11 +3697,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Rapport sendt tilbake" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3685,9 +3733,9 @@ msgid "Share" msgstr "Dele" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Hurtigliste" @@ -3695,19 +3743,19 @@ msgstr "Hurtigliste" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "I hurtiglisten" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "I hurtiglisten til %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3719,7 +3767,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3732,17 +3780,17 @@ msgstr "" msgid "Show older reports" msgstr "Søk i rapporter" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3750,20 +3798,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Logg inn" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Logg inn med epost i stedet, og oppgi et nytt passord. Når du besøker lenken du fikk i epost vil passordet ditt bli oppdatert." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3772,6 +3820,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Skriv inn et nytt passord" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3817,15 +3870,15 @@ msgstr "" 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Beklager, vi kunne ikke logge deg inn. Vennligst fyll in skjemaet nedenfor." @@ -3835,7 +3888,7 @@ msgstr "Beklager, vi kunne ikke logge deg inn. Vennligst fyll in skjemaet nedenf 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen." @@ -3878,13 +3931,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3903,14 +3956,13 @@ msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3940,7 +3992,7 @@ msgstr "Gatevisning" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3948,21 +4000,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "Underavdeling/administrasjon" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send inn" @@ -4013,8 +4066,7 @@ msgid "Summarise your changes" msgstr "Oppsummer dine endringer" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4048,18 +4100,22 @@ msgstr "Superbrukere har tilgang til å utføre alle handlinger msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Mal «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Maler" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4070,6 +4126,7 @@ msgstr "Tekst-versjon" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4103,7 +4160,7 @@ msgstr "Takk for at du lastet opp ditt bilde. Vi må nå plassere ditt problem, 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 "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å ha blitt lastet opp riktig (%s), prøv på nytt." @@ -4117,7 +4174,6 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." @@ -4130,27 +4186,27 @@ msgstr "Det problemer har blitt markert som sendt." msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Den rapporten kan ikke ses på %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4304,7 +4360,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Legg til en gyldig e-post" @@ -4324,7 +4380,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Det er ingen rapporter å vise." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4341,14 +4397,18 @@ msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere. 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Det var problemer med din oppdatering. Vær så snill å forsøke igjen." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 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." @@ -4356,10 +4416,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Disse vil bli sendt til administrasjonen, men vil aldri bli vist på nettsiden." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Disse vil aldri bli vist på nettsiden." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4389,15 +4460,6 @@ msgstr "Disse vil bli publisert på nettsiden tilgjengelig for andre, i samsvar msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "Disse vil bli sent til %s og vil også bli publisert på nettsiden tilgjengelig for andre, i samsvar med personvernreglene våre." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Disse vil bli sendt til administrasjonen, men vil aldri bli vist på nettsiden." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Disse vil aldri bli vist på nettsiden." - #: 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." @@ -4433,10 +4495,10 @@ msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker st 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -4475,7 +4537,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapporten avventer moderasjon" @@ -4491,7 +4553,7 @@ msgstr "Denne rapporten er for tiden markert som fikset." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Denne rapporten er for tiden markert som åpen." @@ -4508,7 +4570,6 @@ msgid "Time spent (in minutes):" msgstr "Tid brukt (i minutter):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4592,7 +4653,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "Klarert av administrasjoner:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Klarert til å lage rapporter som ikke må sjekkes" @@ -4602,7 +4663,7 @@ msgstr "Klarert:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Prøv igjen" @@ -4638,7 +4699,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ubekreftet" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Ukjent" @@ -4646,18 +4707,18 @@ msgstr "Ukjent" msgid "Unknown alert type" msgstr "Ukjent varsel-type" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Ukjent feil" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" @@ -4676,7 +4737,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Oppdatering" @@ -4684,11 +4745,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Oppdateringen under lagt inn anonymt %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" @@ -4728,22 +4789,22 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Oppdatert!" @@ -4754,7 +4815,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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." @@ -4809,26 +4870,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Bruker flagget" @@ -4852,10 +4913,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brukere" @@ -4901,6 +4960,10 @@ msgstr "Se rapport per bydel" msgid "View wards" msgstr "Se rapport per bydel" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4931,7 +4994,7 @@ msgstr "Vi fant mer enn et treff for problemreferansen:" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4992,7 +5055,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Oj oj, brems ned! Tre bilder er nok." @@ -5020,17 +5083,15 @@ msgstr "Kunne du tenke deg å motta en ny forespørsel om 4 uker, som minner deg msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Feil sted? Bare klikk på nytt i kartet." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5044,11 +5105,11 @@ msgstr "Feil sted? Bare klikk på nytt i kartet." msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5056,11 +5117,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Du kan lese om problemet på denne siden." @@ -5078,7 +5139,7 @@ msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket autom msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Du kan kontakte teknisk støtte via %s" @@ -5102,11 +5163,11 @@ msgstr "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den skal være aktiv på dette nettstedet." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Du avviste; vennligst fyll inn boksen ovenfor" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5114,7 +5175,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Du har allerede besvart dette spørreskjemaet. Hvis du har spørsmål, vennligst ta kontakt, eller se på ditt problem.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "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)." @@ -5194,11 +5255,11 @@ msgid "Your account" msgstr "Din konto" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" @@ -5207,9 +5268,9 @@ msgstr "Din e-post" msgid "Your email address" msgstr "Din e-postadresse" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5217,9 +5278,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre personvernsregler." -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ditt navn" @@ -5235,13 +5294,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ditt passord" @@ -5250,15 +5309,15 @@ msgstr "Ditt passord" msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -5279,7 +5338,12 @@ msgstr "Din hurtigliste" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Dine oppdateringer" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5291,8 +5355,8 @@ msgstr "Dine oppdateringer" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Deg" @@ -5311,13 +5375,15 @@ msgid "all" msgstr "alle" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5344,7 +5410,7 @@ msgstr "for eksempel «%s» eller «%s»" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "20 cm dypt hull i Eksempelveien, nær postboks" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Det har vært et hull i veien i to måneder og..." @@ -5383,6 +5449,15 @@ msgstr "ingen" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Logg inn eller opprett en konto" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5419,12 +5494,12 @@ msgstr "logg ut" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5440,11 +5515,11 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5460,11 +5535,11 @@ msgstr "bruker er fra samme administrasjon som problemet - %d" msgid "user is problem owner" msgstr "bruker er eier av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5634,8 +5709,33 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Skriv inn et nytt passord" +#~ msgid "No let me sign in by email" +#~ msgstr "Nei, la meg logge inn med e-post:" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "Nei, la meg logge inn med e-post eller melding" + +#~ msgid "Edit other users' details" +#~ msgstr "Endre andre brukeres detaljer" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Husk min innlogging på denne datamaskinen" + +#~ msgid "Now to submit your report…" +#~ msgstr "På tide å sende din rapport…" + +#~ msgid "Now to submit your update…" +#~ msgstr "På tide å registrere din oppdatering…" + +#~ 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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Feil sted? Bare klikk på nytt i kartet." #~ msgid "Password:" #~ msgstr "Passord:" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 7d9782a5c6d..57f7f460d6a 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "en" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(optioneel)" @@ -178,9 +178,9 @@ msgstr "(verstuurd naar beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" @@ -213,7 +213,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -222,34 +222,24 @@ msgstr "" msgid "%s live problems" msgstr "%s actieve problemen" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Nee Laat me mijn melding per e-mail bevestigen" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Nee Laat me mijn melding per e-mail bevestigen" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Nee Laat me mijn update per e-mail bevestigen" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Nee Laat me mijn update per e-mail bevestigen" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Nee Laat me inloggen per e-mail" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Nee Laat me inloggen per e-mail" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "N.B: Deze rapportage is verzonden opdat actie wordt ondernomen. Veranderingen worden daarom niet meer meegenomen." @@ -258,12 +248,15 @@ msgstr "N.B: Deze rapportage is verzonden opdat actie wordt ond msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "N.B:Deze rapportage is nog niet verzonden om actie te ondernemen. Veranderingen worden mogelijk niet doorgegeven." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "JaSkip this step" msgstr "Kan je de kaart niet zien? Sla deze stap over" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -647,7 +643,7 @@ msgstr "Categorie" msgid "Category and State" msgstr "Categorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categorie veranderd van '%s' in '%s'" @@ -657,6 +653,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -712,7 +709,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -741,6 +738,10 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen." msgid "Click the link in that email to sign in." msgstr "Klik op de link in onze bevestigingsemail om in te loggen." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -753,7 +754,7 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen." msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Gesloten door gemeente" @@ -783,18 +784,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuratie" @@ -808,8 +808,7 @@ msgstr "Bevestig" msgid "Confirm account" msgstr "Bevestig account" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -828,7 +827,7 @@ msgstr "Bevestiging" msgid "Confirmed" msgstr "Bevestigd" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -839,16 +838,20 @@ msgstr "Bevestigd:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contacteer ons" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Neem contact op met het team" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -858,12 +861,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -899,6 +902,11 @@ msgstr "Aangemaakt" msgid "Create a report" msgstr "Maak een melding" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Inloggen of maak een account" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -908,18 +916,15 @@ msgstr "Maak een categorie" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -937,7 +942,7 @@ msgstr "Aangemaakt" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -963,7 +968,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klant kan niet bereikt worden" @@ -991,6 +996,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1000,7 +1009,7 @@ msgstr "" msgid "Delete" msgstr "Verwijderd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1012,8 +1021,8 @@ msgstr "Verwijder sjabloon" msgid "Deleted" msgstr "Verwijderd" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1029,17 +1038,18 @@ msgstr "Beschrijving" msgid "Description:" msgstr "Beschrijving:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Details" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1071,8 +1081,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1081,11 +1091,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Zend bij eventueel commentaar geen email waarschuwingen naar degene die probleem aanmaakte" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Heb je een %s wachtwoord?" @@ -1097,7 +1103,7 @@ msgstr "" msgid "Don’t know" msgstr "Geen idee" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Hou je niet van formulieren?" @@ -1105,7 +1111,7 @@ msgstr "Hou je niet van formulieren?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Plaats de fotos hier om ze te verzenden" @@ -1146,34 +1152,36 @@ msgstr "Bewerk" msgid "Edit body details" msgstr "Wijzig openbaar lichaam details" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Wijzig openbaar lichaam details" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Wijzig openbaar lichaam details" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Jouw updates" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1206,20 +1214,20 @@ msgstr "Redacteur" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Wachtwoord (optioneel)" @@ -1232,6 +1240,15 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Klik op de link in onze bevestigingsemail om in te loggen." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1309,11 +1326,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1364,11 +1376,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1411,6 +1423,8 @@ msgstr "Extra info:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Extra info:" @@ -1433,6 +1447,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1510,17 +1529,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Jouw wachtwoord" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Wachtwoord vergeten?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1578,7 +1602,7 @@ msgstr "Gaan" msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1646,7 +1670,7 @@ msgstr "Verborgen" msgid "Hide all reports and updates" msgstr "Toon alle meldingen" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1669,11 +1693,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Verberg spelden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1698,7 +1722,7 @@ msgstr "" msgid "How to report a problem" msgstr "Hoe een melding maken" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1758,7 +1782,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1869,7 +1893,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1889,8 +1913,8 @@ msgstr "Ongeldige agency_responsible waarde %s" msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1902,13 +1926,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Hou me ingelogd op deze computer" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1948,6 +1965,7 @@ msgstr "Laatste update:" msgid "Last update:" msgstr "Laatste update:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1974,7 +1992,7 @@ msgstr "Toon alle meldingen" msgid "Loading reports…" msgstr "Gesloten meldingen" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Laden..." @@ -2000,23 +2018,22 @@ msgstr "Lokale melding" msgid "Locate the problem on a map of the area" msgstr "Vind het probleem op de kaart van de omgeving" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2028,7 +2045,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "Kaart" @@ -2036,7 +2053,7 @@ msgstr "Kaart" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2044,7 +2061,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Kaart" @@ -2056,11 +2073,11 @@ msgstr "Markeren als verzonden" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Bericht" @@ -2080,24 +2097,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2106,6 +2124,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2131,9 +2154,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Naam" @@ -2146,6 +2169,11 @@ msgstr "Naam" msgid "Name:" msgstr "Naam:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2214,6 +2242,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2300,11 +2330,18 @@ msgstr "" msgid "Next" msgstr "Volgende" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Volgende" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2317,6 +2354,11 @@ msgstr "Volgende" msgid "No" msgstr "Nee" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Bevestig account" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2325,7 +2367,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Geen gemeente geselecteerd" @@ -2358,7 +2400,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2430,16 +2472,6 @@ msgstr "" msgid "Notice" msgstr "" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Nu om je update te verzend…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2448,15 +2480,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2508,6 +2540,14 @@ msgstr "Open311 specificatie" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2516,15 +2556,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2561,15 +2601,13 @@ msgstr "" msgid "Partial" msgstr "Gedeeltelijk" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2588,16 +2626,21 @@ msgid "Phone Reporter:" msgstr "Gemeld:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2609,12 +2652,14 @@ msgstr "Gemeld:" msgid "Phone:" msgstr "Telefoonnummer:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2628,7 +2673,7 @@ msgstr "Telefoonnummer:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2636,12 +2681,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2662,7 +2707,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2682,7 +2727,7 @@ msgstr "Controleer de wachtwoorden en probeer opnieuw" msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2692,15 +2737,15 @@ msgid "Please check your phone number is correct" msgstr "Controleer of je e-mailadres klopt" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Kies een categorie" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2722,12 +2767,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2736,8 +2781,8 @@ msgstr "Geef bericht in" msgid "Please enter a mobile number" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2747,22 +2792,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Geef wachtwoord" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Geef een geldig e-mailadres" @@ -2771,14 +2816,14 @@ msgstr "Geef een geldig e-mailadres" msgid "Please enter a valid email address" msgstr "Geef een geldig e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Geef een geldig e-mailadres" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Geef details" @@ -2788,39 +2833,39 @@ msgstr "Geef details" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Geef je voornaam" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Geef je naam" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Geef je tweede naam" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Geef je titel" @@ -2847,8 +2892,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2860,7 +2905,7 @@ msgstr "Let op, updates worden niet aan de gemeente verzonden." msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Let op dat je melding nog niet is verzonden. Kies een categorie en vermeld verdere informatie hierbeneden en klik op insturen." @@ -2874,12 +2919,12 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Geef een reden op waarom je deze melding heropent" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2912,15 +2957,15 @@ msgstr "Kies de melding die je wilt" msgid "Please state whether or not the problem has been fixed" msgstr "Geef aan of het probleem is verholpen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2928,9 +2973,7 @@ msgstr "" msgid "Please write a message" msgstr "Schrijf een bericht" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Bericht" @@ -2939,19 +2982,19 @@ msgstr "Bericht" msgid "Postcode or street name and area" msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Anoniem geplaatst bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Geplaatst door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Geplaatst door %s (%s) bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Geplaatst door %s bij %s" @@ -2986,14 +3029,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privé" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Probleem" @@ -3016,7 +3055,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -3025,7 +3064,6 @@ msgid "Problem state change based on survey results" msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemen" @@ -3052,7 +3090,7 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3078,26 +3116,26 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Geef een update" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3166,7 +3204,7 @@ msgstr "RSS feed van %s, binnen wijk %s" msgid "RSS feed of nearby problems" msgstr "RSS feed van nabije problemen" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3191,7 +3229,7 @@ msgstr "RSS feed van updates voor dit probleem" msgid "Receive email when updates are left on this problem." msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3238,9 +3276,9 @@ msgstr "Verwijder markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3272,14 +3310,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Meld een probleem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3290,14 +3328,14 @@ msgstr "Meld een probleem" msgid "Report abuse" msgstr "Meld misbruik" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Meld een probleem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3325,8 +3363,8 @@ msgstr "Meld, bekijk of discussier over lokale problemen" msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" @@ -3335,8 +3373,8 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -3345,31 +3383,31 @@ msgstr "Gemeld door %s bij %s" msgid "Reported by:" msgstr "Gemeld door:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" @@ -3380,7 +3418,7 @@ msgstr "Gemeld:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3389,17 +3427,22 @@ msgstr "Meld een probleem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Meldingen" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3421,7 +3464,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3483,20 +3526,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3508,15 +3551,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3527,7 +3570,7 @@ msgstr "Rechtsom roteren" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3541,8 +3584,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3557,7 +3600,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3597,13 +3640,12 @@ msgstr "Geen gebruikers gevonden." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3634,7 +3676,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3651,11 +3693,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" @@ -3688,9 +3730,9 @@ msgid "Share" msgstr "Deel" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3698,19 +3740,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3722,7 +3764,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3736,17 +3778,17 @@ msgstr "Toon oud" msgid "Show older reports" msgstr "Meldingen zoeken" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Toon spelden" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3754,20 +3796,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Inloggen" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3776,6 +3818,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Inloggen of maak een account" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Geef wachtwoord " + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3818,15 +3865,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3836,7 +3883,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3880,13 +3927,13 @@ msgstr "Startdatum:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Staat" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3906,15 +3953,14 @@ msgid "State:" msgstr "Staat:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Staat" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3944,7 +3990,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Subcategorie: %s" @@ -3953,21 +3999,22 @@ msgstr "Subcategorie: %s" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Onderwerp" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Onderwerp:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Opslaan" @@ -4017,8 +4064,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4052,18 +4098,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4074,6 +4124,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4107,7 +4158,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4121,7 +4172,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "De postcode is niet geldig." @@ -4134,28 +4184,28 @@ msgstr "Het probleem is gemarkeerd als verzonden." msgid "That problem will now be resent." msgstr "Het probleem wordt opnieuw verzonden." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Je bent uitgelogd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4295,7 +4345,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Je bent uitgelogd" @@ -4313,7 +4363,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4330,15 +4380,19 @@ msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Er was een probleem met je update. Probeer het later nog eens." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Er was een probleem met je update. Probeer het later nog eens." @@ -4346,10 +4400,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Er was een probleem met je update. Zie beneden." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4374,15 +4437,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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." @@ -4413,10 +4467,10 @@ msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïn 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -4455,7 +4509,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4471,7 +4525,7 @@ msgstr "Deze melding is momenteel gemarkeerd als opgelost." msgid "This report is currently marked as open." msgstr "Deze melding is momenteel gemarkeerd als openstaand." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Deze melding is momenteel gemarkeerd als openstaand." @@ -4488,7 +4542,6 @@ msgid "Time spent (in minutes):" msgstr "Gespendeerde tijd (in minuten):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -4572,7 +4625,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4582,7 +4635,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Opnieuw proberen" @@ -4618,7 +4671,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4626,18 +4679,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4655,7 +4708,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4663,11 +4716,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4707,24 +4760,24 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Geplaatst door %s (%s) bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Geplaatst door %s bij %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4735,7 +4788,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4790,28 +4843,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Email staat al op zwarte lijst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4837,10 +4890,8 @@ msgid "User:" msgstr "Gebruikers" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Gebruikers" @@ -4888,6 +4939,10 @@ msgstr "" msgid "View wards" msgstr "Anders" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4918,7 +4973,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4979,7 +5034,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5007,17 +5062,15 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5031,11 +5084,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5043,11 +5096,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5064,7 +5117,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5086,11 +5139,11 @@ msgstr "Je kan ons helpen met het vinden van een e-mailadres voor lokale problem msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5098,7 +5151,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Je hebt deze vragenlijst al ingevuld. Als je vragen hebt kan je contact opnemen of je probleem bekijken.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5176,11 +5229,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Jouw e-mail" @@ -5189,9 +5242,9 @@ msgstr "Jouw e-mail" msgid "Your email address" msgstr "Jouw e-mailadres" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Jouw e-mailadres" @@ -5200,9 +5253,7 @@ msgstr "Jouw e-mailadres" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze privacy policy" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Jouw naam" @@ -5218,13 +5269,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Jouw wachtwoord" @@ -5233,15 +5284,15 @@ msgstr "Jouw wachtwoord" msgid "Your password has been changed" msgstr "Je wachtwoord is gewijzigd" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Je telefoonnummer" @@ -5263,7 +5314,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Je wachtwoord is gewijzigd" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Jouw updates" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5275,8 +5331,8 @@ msgstr "Jouw updates" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5295,13 +5351,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5328,7 +5386,7 @@ msgstr "bv. '%s' of '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Een 25 cm diep gat op voorbeeldstraat bij de brievenbus" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5366,6 +5424,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Inloggen of maak een account" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5402,12 +5469,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5423,11 +5490,11 @@ msgstr "" msgid "today" msgstr "vandaag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5443,12 +5510,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Email staat al op zwarte lijst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Email toegevoegd aan zwarte lijst" @@ -5619,8 +5686,29 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Geef wachtwoord " +#~ msgid "No let me sign in by email" +#~ msgstr "Nee Laat me inloggen per e-mail" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Nee Laat me inloggen per e-mail" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Wijzig openbaar lichaam details" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Hou me ingelogd op deze computer" + +#~ msgid "Now to submit your report…" +#~ msgstr "Nu om je melding te verzend…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Nu om je update te verzend…" #~ msgid "Password:" #~ msgstr "Wachtwoord:" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 842068deaea..6137b750590 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(valfritt)" @@ -178,9 +178,9 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" @@ -210,7 +210,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -219,31 +219,22 @@ msgstr "" msgid "%s live problems" msgstr "%s aktive problem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -252,12 +243,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, eg har eit passord" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Rapporter eit problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -319,9 +313,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -331,16 +325,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -348,7 +341,7 @@ msgstr "" msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -368,7 +361,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -436,34 +430,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonym" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -500,7 +496,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -533,6 +529,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -545,12 +545,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -564,10 +564,8 @@ msgid "Ban user" msgstr "Flagg brukar" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -604,7 +602,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -637,7 +634,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -647,6 +644,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -700,7 +698,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -728,6 +726,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -740,7 +742,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -770,18 +772,17 @@ msgid "Cobrand:" msgstr "Merkevaresamarbeid:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -795,8 +796,7 @@ msgstr "Stadfest" msgid "Confirm account" msgstr "Stadfest konto" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -815,7 +815,7 @@ msgstr "Stadfesting" msgid "Confirmed" msgstr "Stadfesta" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -826,16 +826,20 @@ msgstr "Stadfesta:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -845,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -886,6 +890,11 @@ msgstr "Oppretta" msgid "Create a report" msgstr "Lag ein rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Logg inn eller opprett ein konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -895,18 +904,15 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -924,7 +930,7 @@ msgstr "Oppretta" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -950,7 +956,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -978,6 +984,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -987,7 +997,7 @@ msgstr "" msgid "Delete" msgstr "Sletta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -999,8 +1009,8 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1016,17 +1026,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1058,8 +1069,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1068,11 +1079,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1084,7 +1091,7 @@ msgstr "" msgid "Don’t know" msgstr "Veit ikkje" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1092,7 +1099,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1133,34 +1140,36 @@ msgstr "Rediger" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Ver venleg og legg inn opplysningar om problemet" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Ver venleg og legg inn opplysningar om problemet" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Oppdateringane dine" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1193,20 +1202,20 @@ msgstr "Oppdatert av" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "E-post lagd til misbrukliste" @@ -1219,6 +1228,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1296,11 +1313,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1350,11 +1362,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1396,6 +1408,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1417,6 +1431,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1494,17 +1513,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Byt passord" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1562,7 +1586,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1630,7 +1654,7 @@ msgstr "Skjult" msgid "Hide all reports and updates" msgstr "Vis alle rapporterte problem" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1653,11 +1677,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1682,7 +1706,7 @@ msgstr "" msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1742,7 +1766,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1852,7 +1876,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1872,8 +1896,8 @@ msgstr "Ugyldig agency_responsible-verdi %s" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1885,13 +1909,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Hugs mi innlogging på denne datamaskina" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1931,6 +1948,7 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1957,7 +1975,7 @@ msgstr "Vis alle rapporterte problem" msgid "Loading reports…" msgstr "Oppdateringane dine" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Lastar …" @@ -1983,23 +2001,22 @@ msgstr "Lokale varsel" msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2011,7 +2028,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -2019,7 +2036,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2027,7 +2044,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2039,11 +2056,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -2063,24 +2080,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2089,6 +2107,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2114,9 +2137,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Namn" @@ -2129,6 +2152,11 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2195,6 +2223,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2280,11 +2310,18 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Tekst:" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2297,6 +2334,11 @@ msgstr "" msgid "No" msgstr "Nei" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Stadfest konto" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2305,7 +2347,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -2338,7 +2380,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2410,16 +2452,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2428,15 +2460,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2488,6 +2520,14 @@ msgstr "Open311-spesifikasjon" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2496,15 +2536,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2541,15 +2581,13 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2567,16 +2605,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2587,12 +2630,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2606,7 +2651,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2614,12 +2659,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2640,7 +2685,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2660,7 +2705,7 @@ msgstr "Ver venleg og sjekk passorda og prøv igjen" 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:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2670,15 +2715,15 @@ msgid "Please check your phone number is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2700,12 +2745,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2714,8 +2759,8 @@ msgstr "Ver venleg og skriv ei melding" msgid "Please enter a mobile number" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2725,22 +2770,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" @@ -2749,14 +2794,14 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Ver venleg og legg til ein gyldig e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2766,39 +2811,39 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2827,8 +2872,8 @@ 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" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2840,7 +2885,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Merk at rapporten din enno ikkje er send%s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Lagt inn av %s %s" @@ -2966,14 +3009,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2996,7 +3035,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -3005,7 +3044,6 @@ msgid "Problem state change based on survey results" msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -3032,7 +3070,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3058,26 +3096,26 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3146,7 +3184,7 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3171,7 +3209,7 @@ msgstr "RSS-straum med oppdateringar for dette problemet" msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3218,9 +3256,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3252,14 +3290,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3270,14 +3308,14 @@ msgstr "Rapporter eit problem" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Rapporter eit problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3305,8 +3343,8 @@ msgstr "Rapporter, finn eller diskuter lokale problem" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -3315,8 +3353,8 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3325,31 +3363,31 @@ msgstr "Publisert av %s %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3360,7 +3398,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3369,17 +3407,22 @@ msgstr "Legger til eit problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3401,7 +3444,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3463,20 +3506,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3488,15 +3531,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3507,7 +3550,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3521,8 +3564,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3537,7 +3580,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3577,13 +3620,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3614,7 +3656,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3631,11 +3673,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -3668,9 +3710,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3678,19 +3720,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3702,7 +3744,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3715,17 +3757,17 @@ msgstr "" msgid "Show older reports" msgstr "Oppdateringane dine" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3733,20 +3775,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Logg inn" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3755,6 +3797,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Enter a password" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3797,15 +3844,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3815,7 +3862,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3858,13 +3905,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3884,15 +3931,14 @@ msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3922,7 +3968,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Kategori" @@ -3931,21 +3977,22 @@ msgstr "Kategori" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send inn" @@ -3997,8 +4044,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4033,18 +4079,22 @@ msgstr "" msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4055,6 +4105,7 @@ msgstr "Tekst-utgåve" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4091,7 +4142,7 @@ msgstr "" 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 "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." @@ -4105,7 +4156,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." @@ -4118,28 +4168,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4279,7 +4329,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -4297,7 +4347,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4314,14 +4364,18 @@ 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -4329,10 +4383,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4357,15 +4420,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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." @@ -4396,10 +4450,10 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -4438,7 +4492,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4454,7 +4508,7 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Denne rapporten er for tida markert som open." @@ -4471,7 +4525,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4555,7 +4608,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4565,7 +4618,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4601,7 +4654,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4609,18 +4662,18 @@ msgstr "" msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" @@ -4639,7 +4692,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4647,11 +4700,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" @@ -4691,24 +4744,24 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Lagt inn av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Oppdatert!" @@ -4719,7 +4772,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4774,28 +4827,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-post allereie i misbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Brukar flagga" @@ -4821,10 +4874,8 @@ msgid "User:" msgstr "Brukarar" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brukarar" @@ -4871,6 +4922,10 @@ msgstr "" msgid "View wards" msgstr "andre område:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4902,7 +4957,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4964,7 +5019,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4992,17 +5047,15 @@ msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5016,11 +5069,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5028,11 +5081,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5049,7 +5102,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5071,11 +5124,11 @@ msgstr "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i % msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5083,7 +5136,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og ta kontakt, eller sjå på problemet ditt.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5161,11 +5214,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5174,9 +5227,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5184,9 +5237,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5202,13 +5253,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5217,15 +5268,15 @@ msgstr "" msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5247,7 +5298,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Passordet ditt har vorte endra" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Oppdateringane dine" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5259,8 +5315,8 @@ msgstr "Oppdateringane dine" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5278,13 +5334,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5310,7 +5368,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5348,6 +5406,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Logg inn eller opprett ein konto" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5384,12 +5451,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5406,11 +5473,11 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5426,12 +5493,12 @@ msgstr "brukaren er frå same administrasjon som problemet – %d" msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-post allereie i misbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "E-post lagd til misbrukliste" @@ -5602,8 +5669,12 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Enter a password" +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Hugs mi innlogging på denne datamaskina" #~ msgid "Password:" #~ msgstr "Passord:" diff --git a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po index 31c86f6a06a..68863db2fea 100644 --- a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pl_PL.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Seb Tur , 2018\n" "Language-Team: Polish (Poland) (https://www.transifex.com/mysociety/teams/12067/pl_PL/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "" @@ -174,9 +174,9 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "" @@ -205,7 +205,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -214,31 +214,22 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -247,12 +238,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Jak zgłaszać problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -312,9 +306,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -324,16 +318,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -341,7 +334,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -361,7 +354,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -428,33 +422,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -491,7 +487,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -524,6 +520,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -536,12 +536,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -554,10 +554,8 @@ msgid "Ban user" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -594,7 +592,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -626,7 +623,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -636,6 +633,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -689,7 +687,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -717,6 +715,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -729,7 +731,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -758,18 +760,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -783,8 +784,7 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -803,7 +803,7 @@ msgstr "" msgid "Confirmed" msgstr "" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -814,16 +814,20 @@ msgstr "" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -833,12 +837,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -873,6 +877,10 @@ msgstr "" msgid "Create a report" msgstr "" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +msgid "Create an account" +msgstr "" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -882,18 +890,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -911,7 +916,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -935,7 +940,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -963,6 +968,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -971,7 +980,7 @@ msgstr "" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -983,8 +992,8 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1000,17 +1009,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1042,8 +1052,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1052,11 +1062,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1068,7 +1074,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1076,7 +1082,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1117,33 +1123,34 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +msgid "Edit report details" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +msgid "Edit your update" +msgstr "" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1176,20 +1183,20 @@ msgstr "" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1201,6 +1208,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1277,11 +1292,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Wpisz nazwę ulicy lub dzielnicy" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1332,11 +1342,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1378,6 +1388,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1399,6 +1411,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1476,17 +1493,21 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +msgid "Forgot password" +msgstr "" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1544,7 +1565,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1607,7 +1628,7 @@ msgstr "" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1630,11 +1651,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1659,7 +1680,7 @@ msgstr "" msgid "How to report a problem" msgstr "Jak zgłaszać problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1719,7 +1740,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1829,7 +1850,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1849,8 +1870,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1862,13 +1883,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1908,6 +1922,7 @@ msgstr "" msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1933,7 +1948,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1959,23 +1974,22 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "Oznacz problem na mapie" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1987,7 +2001,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1995,7 +2009,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2003,7 +2017,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2015,11 +2029,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -2039,24 +2053,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2065,6 +2080,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2090,9 +2110,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -2105,6 +2125,11 @@ msgstr "" msgid "Name:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2171,6 +2196,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2255,11 +2282,17 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +msgid "Next:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2272,6 +2305,10 @@ msgstr "" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +msgid "No account?" +msgstr "" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2280,7 +2317,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2313,7 +2350,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2385,16 +2422,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2403,15 +2430,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2463,6 +2490,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2471,15 +2506,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2515,15 +2550,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2540,16 +2573,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2560,12 +2598,14 @@ msgstr "" msgid "Phone:" msgstr "" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2579,7 +2619,7 @@ msgstr "" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2587,12 +2627,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2613,7 +2653,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2633,7 +2673,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2642,15 +2682,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2672,12 +2712,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2685,8 +2725,8 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2696,22 +2736,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "" @@ -2720,13 +2760,13 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" @@ -2736,39 +2776,39 @@ msgstr "" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2795,8 +2835,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2808,7 +2848,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2822,11 +2862,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2859,15 +2899,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2875,9 +2915,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2886,19 +2924,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "Wpisz nazwę ulicy lub dzielnicy" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2933,14 +2971,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2963,7 +2997,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2972,7 +3006,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2997,7 +3030,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3022,26 +3055,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3110,7 +3142,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3135,7 +3167,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3179,9 +3211,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3213,14 +3245,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3231,14 +3263,14 @@ msgstr "Jak zgłaszać problem" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Jak zgłaszać problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3265,8 +3297,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Raportuj, przeglądaj i dyskutuj o lokalnych problemach" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3275,8 +3307,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3285,31 +3317,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3320,7 +3352,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3329,17 +3361,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3360,7 +3397,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3420,20 +3457,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3445,15 +3482,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3464,7 +3501,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3478,8 +3515,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3494,7 +3531,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3534,13 +3571,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3570,7 +3606,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3587,11 +3623,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3623,9 +3659,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3633,19 +3669,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3657,7 +3693,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3669,17 +3705,17 @@ msgstr "" msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3687,20 +3723,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3709,6 +3745,10 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +msgid "Sign in with a password" +msgstr "" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3751,15 +3791,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3769,7 +3809,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3812,13 +3852,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3837,14 +3877,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3873,7 +3912,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3881,21 +3920,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3945,8 +3985,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3980,18 +4019,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4002,6 +4045,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4035,7 +4079,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4049,7 +4093,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4062,27 +4105,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4222,7 +4265,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4239,7 +4282,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4256,14 +4299,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4271,10 +4317,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4299,15 +4354,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4338,10 +4384,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4380,7 +4426,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4396,7 +4442,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4412,7 +4458,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4496,7 +4541,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4506,7 +4551,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4542,7 +4587,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4550,18 +4595,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4579,7 +4624,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4587,11 +4632,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4631,22 +4676,22 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4657,7 +4702,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4711,26 +4756,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4754,10 +4799,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4802,6 +4845,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4832,7 +4879,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4893,7 +4940,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4921,17 +4968,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4945,11 +4990,11 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4957,11 +5002,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4978,7 +5023,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5000,11 +5045,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5012,7 +5057,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5090,11 +5135,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5103,9 +5148,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5113,9 +5158,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5131,13 +5174,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5146,15 +5189,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5175,7 +5218,11 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +msgid "Your update" +msgstr "" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5187,8 +5234,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5206,13 +5253,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5238,7 +5287,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5276,6 +5325,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5312,12 +5369,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5333,11 +5390,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5353,11 +5410,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5572,3 +5629,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" msgstr[3] "" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Wpisz nazwę ulicy lub dzielnicy" diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 6ec7a55085a..6dc2d0568b7 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(Não reportar ao município)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcional)" @@ -178,9 +178,9 @@ msgstr "(remeter para ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed dos Problemas Nesta %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" @@ -211,7 +211,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -220,34 +220,24 @@ msgstr "" msgid "%s live problems" msgstr "%s problemas ao vivo" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr " Não Deixe-me confirmar o meu relatório por e-mail" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr " Não Deixe-me confirmar o meu relatório por e-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr " Não Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr " Não Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr " Não , deixe-me entrar por e-mail" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr " Não , deixe-me entrar por e-mail" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -256,12 +246,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr " Sim Eu tenho uma password" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Reportar um problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -324,9 +317,9 @@ msgstr "(Sem número de telefone)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -336,16 +329,15 @@ msgstr "" msgid "Add user" msgstr "Adicionar user" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -353,7 +345,7 @@ msgstr "" msgid "Added %s" msgstr "Adicionado %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -373,7 +365,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Avise-me de atualizações futuras" @@ -441,34 +434,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Uma atualização marcada, problema esta resolvido" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonimo" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonimo" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonimo:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -505,7 +500,7 @@ msgstr "Atribuir ao órgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -539,6 +534,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -551,12 +550,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Aguardando moderação" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Voltar" @@ -570,10 +569,8 @@ msgid "Ban user" msgstr "Bandeira - Usuario" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -610,7 +607,6 @@ msgid "Can't see the map? Skip this step" msgstr "Não pode ver a localizaçao no mapa Salte esta etapa " #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -643,7 +639,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "Categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -653,6 +649,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -707,7 +704,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -736,6 +733,10 @@ msgstr "Clique no link do email de confirmação para entrar" msgid "Click the link in that email to sign in." msgstr "Clique no link do email de confirmação para entrar" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -748,7 +749,7 @@ msgstr "Clique no link do email de confirmação para entrar" msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Fechado pelo Município" @@ -778,18 +779,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -803,8 +803,7 @@ msgstr "Confirmar" msgid "Confirm account" msgstr "Confirmar conta" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -823,7 +822,7 @@ msgstr "Confirmação" msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -834,16 +833,20 @@ msgstr "Confirmado:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Fale connosco" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Fale com a equipe" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -853,12 +856,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Não foi possível encontrar usuário" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Não olhar para cima da localização" @@ -894,6 +897,11 @@ msgstr "Criado" msgid "Create a report" msgstr "Criar um report" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Entrar e criar uma conta" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -903,18 +911,15 @@ msgstr "Criar uma categoria" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -932,7 +937,7 @@ msgstr "Criado" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -958,7 +963,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -986,6 +991,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -995,7 +1004,7 @@ msgstr "" msgid "Delete" msgstr "Excluidos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1007,8 +1016,8 @@ msgstr "" msgid "Deleted" msgstr "Excluidos" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1024,17 +1033,18 @@ msgstr "Descrição detalhada do problema" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "DEtalhes" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1066,8 +1076,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1076,11 +1086,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Já tem uma password?" @@ -1092,7 +1098,7 @@ msgstr "" msgid "Don’t know" msgstr "Não sei" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1100,7 +1106,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1141,34 +1147,36 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar os detalhes do corpo" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Editar os detalhes do corpo" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Editar os detalhes do corpo" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Suas atualizações" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1201,20 +1209,20 @@ msgstr "Editar" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Password (opcional)" @@ -1227,6 +1235,15 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Clique no link do email de confirmação para entrar" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1304,11 +1321,6 @@ msgstr "Digite um nome de uma rua de Mindelo" 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" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1359,11 +1371,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1406,6 +1418,8 @@ msgstr "Dados adicionais:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Dados adicionais:" @@ -1428,6 +1442,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1505,17 +1524,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Password" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Não se lembra da sua password?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1573,7 +1597,7 @@ msgstr " Ir" msgid "Going to send questionnaire?" msgstr "Vai enviar questionário?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1641,7 +1665,7 @@ msgstr "Esconder" msgid "Hide all reports and updates" msgstr "Listar todos os problemas relatados" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1664,11 +1688,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Ocultar pins" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1693,7 +1717,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Como reportar um problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" @@ -1753,7 +1777,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1864,7 +1888,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1884,8 +1908,8 @@ msgstr "Agencia_responsavel valor %s inválido" msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1897,13 +1921,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Manter-me ligado neste computador" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1943,6 +1960,7 @@ msgstr "Última atualização:" msgid "Last update:" msgstr "Última atualização:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1969,7 +1987,7 @@ msgstr "Listar todos os problemas relatados" msgid "Loading reports…" msgstr "relatórios fechados" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Carregando ..." @@ -1995,23 +2013,22 @@ msgstr "Alertas locais" msgid "Locate the problem on a map of the area" msgstr "Localize o problema no mapa da área ou localidade" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2023,7 +2040,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "Mapa" @@ -2031,7 +2048,7 @@ msgstr "Mapa" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2039,7 +2056,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2051,11 +2068,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Menssagem" @@ -2075,24 +2092,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Falta informaçao jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2101,6 +2119,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Moderado por divisão dentro de um dia de trabalho" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2126,9 +2149,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nome" @@ -2141,6 +2164,11 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2211,6 +2239,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2297,11 +2327,18 @@ msgstr "" msgid "Next" msgstr "Proximo" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Proximo" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2314,6 +2351,11 @@ msgstr "Proximo" msgid "No" msgstr "Nao" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Confirmar conta" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2322,7 +2364,7 @@ msgstr "" msgid "No body" msgstr "Nenhum corpo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nenhum Concelho selecionado" @@ -2355,7 +2397,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Nenhum resultado retornado" @@ -2427,16 +2469,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Finalmente, para enviar o seu relatório ..." - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Finalmente, para enviar a sua actualização ..." - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2445,15 +2477,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2505,6 +2537,14 @@ msgstr "Especificação Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2513,15 +2553,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2558,15 +2598,13 @@ msgstr "Parente" msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Password (opcional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2584,16 +2622,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefone (opcional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2604,12 +2647,14 @@ msgstr "" msgid "Phone:" msgstr "Telefone:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2623,7 +2668,7 @@ msgstr "Telefone:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2631,12 +2676,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2657,7 +2702,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Coloque a fix pin no mapa" @@ -2677,7 +2722,7 @@ msgstr "Por favor verifique as passwords e tente novamente" msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2687,15 +2732,15 @@ msgid "Please check your phone number is correct" msgstr "Favor verificar se seu email esta correcto" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Escolher uma categoria" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2720,12 +2765,12 @@ msgstr "" " ir par a Página Inicial e como SIGA INSTRUÇÕES." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2734,8 +2779,8 @@ msgstr "Por favor insira uma mensagem" msgid "Please enter a mobile number" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2745,22 +2790,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Por favor insira uma password" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Por favor insira um email valido" @@ -2769,14 +2814,14 @@ msgstr "Por favor insira um email valido" msgid "Please enter a valid email address" msgstr "Por favor insira um endereço de e-mail válido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Por favor insira um email valido" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" @@ -2786,39 +2831,39 @@ msgstr "Por favor, insira alguns detalhes" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Digite o seu e-mail" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Digite seu primeiro nome" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Digite seu nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Digite seu segundo nome, apelido" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Por favor, insira o seu título" @@ -2845,8 +2890,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2858,7 +2903,7 @@ msgstr "Por favor, note que as actualizações não são enviadas para as autori msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Por favor, note o relatório ainda não foi enviado . Escolha uma categoria e acrescentar mais informações abaixo, em seguida, enviar." @@ -2872,12 +2917,12 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2910,15 +2955,15 @@ msgstr "Selecione o tipo de alerta que deseja" msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique se o problema foi corrigido" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2926,9 +2971,7 @@ msgstr "" msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Postar" @@ -2937,19 +2980,19 @@ msgstr "Postar" msgid "Postcode or street name and area" msgstr "Inserir um código postal válido (xxxx-xxx), ou nome da rua, zona ou localidade" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postado anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postado por %s aem %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postado por %s (%s) em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postado por %s em %s" @@ -2984,14 +3027,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3014,7 +3053,7 @@ msgstr "Problema %s enviado ao conselho %s" msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -3023,7 +3062,6 @@ msgid "Problem state change based on survey results" msgstr "Mudança de estado do problema com base nos resultados da pesquisa" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3050,7 +3088,7 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" msgid "Problems within %.1fkm of %s" msgstr "Problemas dentro de %.1fkm deste local" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3076,26 +3114,26 @@ msgstr "" msgid "Property address:" msgstr "Endereço do imóvel:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Fornecer uma atualização" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Fornecer uma password é opcional, mas isso vai permitir reportar problemas de forma mais fácil, actualizar e gerir os seus relatórios." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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 password é opcional, mas isso vai permitir reportar problemas de forma mais fácil, actualizar e gerir os seus relatórios." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3164,7 +3202,7 @@ msgstr "RSS feed de %s, %s problemas pendentes" msgid "RSS feed of nearby problems" msgstr "RSS feed dos problemas próximos" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3189,7 +3227,7 @@ msgstr "RSS feed de atualizações para este problema" msgid "Receive email when updates are left on this problem." msgstr "RSS feed dos problemas locais recentes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3236,9 +3274,9 @@ msgstr "Remover bandeira" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3270,14 +3308,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Reportar um problema" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3288,14 +3326,14 @@ msgstr "Reportar um problema" msgid "Report abuse" msgstr "Abusivo" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Reportar um problema" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3323,8 +3361,8 @@ msgstr "Reportar, ver ou discutir problemas locais" msgid "Report, view, or discuss local problems" msgstr "Reportar, ver ou discutir problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" @@ -3333,8 +3371,8 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" @@ -3343,31 +3381,31 @@ msgstr "Relatado por %s em %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" @@ -3378,7 +3416,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3387,17 +3425,22 @@ msgstr "Relatando um problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Relatórios" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Relatórios aguardando aprovação" @@ -3419,7 +3462,7 @@ msgstr "" msgid "Reports published" msgstr "Os relatórios publicados" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3481,20 +3524,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Lugar certo?" @@ -3506,15 +3549,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3525,7 +3568,7 @@ msgstr "Girar para a direita" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3539,8 +3582,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3555,7 +3598,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3595,13 +3638,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3632,7 +3674,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3649,11 +3691,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -3686,9 +3728,9 @@ msgid "Share" msgstr "Acçao" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3696,19 +3738,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3720,7 +3762,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3734,17 +3776,17 @@ msgstr "Mostrar antigo" msgid "Show older reports" msgstr "elatórios de pesquisa" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Mostrar pins" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3752,20 +3794,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Entrar" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3774,6 +3816,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Entrar e criar uma conta" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Digite uma nova password" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3816,15 +3863,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Desculpe, não conseguimos encontrar esse local." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3834,7 +3881,7 @@ msgstr "" 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3877,13 +3924,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3903,15 +3950,14 @@ msgid "State:" msgstr "Estado" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Estado" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3941,7 +3987,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Subcategoria: %s" @@ -3950,21 +3996,22 @@ msgstr "Subcategoria: %s" msgid "Subdivision/Body" msgstr "Zona / Bairro" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Assunto:" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Assunto:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Submeter" @@ -4016,8 +4063,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4052,18 +4098,22 @@ msgstr "" msgid "Survey Results" msgstr "Resultados teste" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -4074,6 +4124,7 @@ msgstr "Somente versao texto" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4107,7 +4158,7 @@ msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu pro 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 "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor, tente novamente." @@ -4121,7 +4172,6 @@ msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente." @@ -4134,28 +4184,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 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:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Esse relatório foi removido FixMyStreetMIndelo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Esse relatório foi removido FixMyStreetMIndelo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4295,7 +4345,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Esse relatório foi removido FixMyStreetMIndelo" @@ -4313,7 +4363,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Não existem relatórios a apresentar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4330,15 +4380,19 @@ msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mai 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." @@ -4346,10 +4400,19 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Houve problemas com a sua atualização. Por favor, veja abaixo." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4374,15 +4437,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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." @@ -4413,10 +4467,10 @@ msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do pr 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta informação é necessária" @@ -4455,7 +4509,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Este relatório está aguardando moderação." @@ -4471,7 +4525,7 @@ msgstr "Este relatório está marcado como fixo." msgid "This report is currently marked as open." msgstr "Este relatório está marcado como aberto." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Este relatório está marcado como aberto." @@ -4488,7 +4542,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -4572,7 +4625,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4582,7 +4635,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Tente novamente" @@ -4618,7 +4671,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Não confirmado" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Desconhecido" @@ -4626,18 +4679,18 @@ msgstr "Desconhecido" msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Erro desconhecido" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" @@ -4656,7 +4709,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4664,11 +4717,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Atualize abaixo colocado de forma anónima em %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Actualizar abaixo adicionado por %s em %s" @@ -4708,24 +4761,24 @@ msgstr "Atualizar status" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postado por %s (%s) em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Postado por %s em %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Actualizado!" @@ -4736,7 +4789,7 @@ msgstr "Actualizado!" msgid "Updates" msgstr "Actualizaçoes" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4791,28 +4844,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Email adicionado a lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-mail já está na lista abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Usuário sinalizado" @@ -4838,10 +4891,8 @@ msgid "User:" msgstr "Usuários" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuários" @@ -4889,6 +4940,10 @@ msgstr "Exibir relatórios por Ward" msgid "View wards" msgstr "outras áreas:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4920,7 +4975,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4982,7 +5037,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5010,17 +5065,15 @@ msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você v msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Localização errada? Basta clicar novamente no mapa." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5034,11 +5087,11 @@ msgstr "Localização errada? Basta clicar novamente no mapa." msgid "Yes" msgstr "Sim" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5046,11 +5099,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Você pode ver o problema neste site ." @@ -5068,7 +5121,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5090,11 +5143,11 @@ msgstr "Você pode nos ajudar a encontrar um endereço de e-mail de contato para msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Você recusou, por favor preencha o quadro de cima" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5102,7 +5155,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Você já respondeu a este questionário. Se você tem uma pergunta, por favor entrar em contato , ou ver o seu problema . \n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5184,11 +5237,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "O seu e-mail" @@ -5197,9 +5250,9 @@ msgstr "O seu e-mail" msgid "Your email address" msgstr "O seu endereço de email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "O seu endereço de email" @@ -5208,9 +5261,7 @@ msgstr "O seu endereço de email" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Suas informações só serão utilizadas de acordo com nossa política de privacidade " -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Nome" @@ -5226,13 +5277,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Password" @@ -5241,15 +5292,15 @@ msgstr "Password" msgid "Your password has been changed" msgstr "Sua password foi alterada" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Telefone " @@ -5271,7 +5322,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Sua password foi alterada" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Suas atualizações" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5283,8 +5339,8 @@ msgstr "Suas atualizações" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5302,13 +5358,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5334,7 +5392,7 @@ msgstr "por exemplo '%s' ou '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5372,6 +5430,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Entrar e criar uma conta" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5408,12 +5475,12 @@ msgstr "sair" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "o município local" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5430,11 +5497,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "de hoje" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5450,12 +5517,12 @@ msgstr "usuário é da mesmo concelho do problema - %d" msgid "user is problem owner" msgstr "usuário é proprietário problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-mail já está na lista abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Email adicionado a lista de abusos" @@ -5626,8 +5693,32 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Digite uma nova password" +#~ msgid "No let me sign in by email" +#~ msgstr " Não , deixe-me entrar por e-mail" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr " Não , deixe-me entrar por e-mail" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Editar os detalhes do corpo" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Manter-me ligado neste computador" + +#~ msgid "Now to submit your report…" +#~ msgstr "Finalmente, para enviar o seu relatório ..." + +#~ msgid "Now to submit your update…" +#~ msgstr "Finalmente, para enviar a sua actualização ..." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Localização errada? Basta clicar novamente no mapa." #~ msgid "Password:" #~ msgstr "Password:" diff --git a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po index 87a68130c2f..9c893292213 100644 --- a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: 2018-09-06 20:57+0000\n" "Last-Translator: Kennet Emerson , 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/mysociety/teams/12067/pt_BR/)\n" @@ -22,13 +22,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -166,7 +166,7 @@ msgstr "(não existe mais)" msgid "(not sent to council)" msgstr "(não enviado ao conselho)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcional)" @@ -184,9 +184,9 @@ msgstr "(enviar ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" @@ -215,7 +215,7 @@ msgstr "Denúncias, Estatísticas e Ações para

%s

" msgid " %s reports %s" msgstr " %s denúncias %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s salvo." @@ -224,31 +224,22 @@ msgstr "%s salvo." msgid "%s live problems" msgstr "%s problemas ao vivo" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Não Deixe-me confirmar a denúncia por e-mail" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "Não Deixe-me confirmar a denúncia por email/mensagem" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "No Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "No Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Não deixe-me entrar por e-mail" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "Não deixe-me entrar por e-mail" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota: Esta denúncia foi enviada para a ação. Quaisquer alterações feitas não serão repassadas." @@ -257,12 +248,15 @@ msgstr "Nota: Esta denúncia foi enviada para a ação. Quaisqu msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota: Esta denúncia ainda não foi enviado para ação. Quaisquer alterações feitas podem não ser repassadas." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Sim Eu tenho uma senha" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Denunciar um problema" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Ativar autenticação de duas etapas" @@ -325,9 +319,9 @@ msgstr "Adicionar número de telefone" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Adicione para lista" @@ -337,16 +331,15 @@ msgstr "Adicione para lista" msgid "Add user" msgstr "Adicione usuário" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Adicionar / editar categorias de problemas" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Adicionar / editar prioridades de resposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Adicionar / editar modelos de resposta" @@ -354,7 +347,7 @@ msgstr "Adicionar / editar modelos de resposta" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -374,7 +367,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Alerte me para futuras atualizações" @@ -441,33 +435,35 @@ msgstr "Sempre buscar todos os problemas" msgid "An update marked this problem as fixed." msgstr "Uma atualização marcou este problema como solucionado." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anônimo" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Usuário anônimo" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anônimo:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Outro usuário" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Tem certeza de que deseja cancelar este upload?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Você tem certeza?" @@ -504,7 +500,7 @@ msgstr "Atribuir a um orgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Atribuir usuários à áreas" @@ -537,6 +533,10 @@ msgstr "Auto-repsosta:" msgid "Automated" msgstr "Automatizado" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Categorias disponíveis" @@ -549,12 +549,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Evite informações pessoais e números de placa de veículos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Voltar" @@ -567,10 +567,8 @@ msgid "Ban user" msgstr "Banir usuário" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -607,7 +605,6 @@ msgid "Can't see the map? Skip this step" msgstr "Não consegue ver o mapa? Pular este passo" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -639,7 +636,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "Categoria e estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoria alterada de ‘%s’ para ‘%s’" @@ -649,6 +646,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Taxa de correção para categoria de problemas > 4 semanas " #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -702,7 +700,7 @@ msgstr "Escolha o nome de uma categoria que faça sentido para msgid "Choose another" msgstr "Escolher outro(a)" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Limpar dados offline" @@ -730,6 +728,10 @@ msgstr "Clique no link de nosso email de confirmação para entrar" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -742,7 +744,7 @@ msgstr "" msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Fechado pelo conselho" @@ -771,18 +773,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Código" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuração" @@ -796,8 +797,7 @@ msgstr "Confirmar" msgid "Confirm account" msgstr "Confirmar conta" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 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, fornecendo uma nova senha nesse ponto. Quando você confirmar, sua senha será atualizada." @@ -816,7 +816,7 @@ msgstr "Confirmação" msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -827,16 +827,20 @@ msgstr "Confirmado:" msgid "Contact %s" msgstr "Contato" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Contate-nos" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Contactar o time" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -846,12 +850,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Não foi possível encontrar o usuário" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Não foi possível encontrar a localização" @@ -886,6 +890,11 @@ msgstr "Criar" msgid "Create a report" msgstr "Criar uma denúncia" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Entrar ou criar uma conta" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -895,18 +904,15 @@ msgstr "Criar uma categoria" msgid "Create priority" msgstr "Criar prioridade" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "Criar denúncias/atualizações como usuário anônimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Criar denúncias/atualizações como o conselho" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -924,7 +930,7 @@ msgstr "Criado" msgid "Created %d new users" msgstr "%d novos usuários criados" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -948,7 +954,7 @@ msgstr "Atualmente agrupado por %s" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -976,6 +982,11 @@ msgstr "Padrão" msgid "Default priority" msgstr "Prioridade padrão" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Criar denúncias/atualizações como o conselho" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -984,7 +995,7 @@ msgstr "" msgid "Delete" msgstr "Excluír" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -996,8 +1007,8 @@ msgstr "Deletar template" msgid "Deleted" msgstr "Deletado" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1013,17 +1024,18 @@ msgstr "Descrição" msgid "Description:" msgstr "Descrição:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalhes" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1055,8 +1067,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Descartar mudanças" @@ -1065,11 +1077,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1081,7 +1089,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1089,7 +1097,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1130,33 +1138,36 @@ msgstr "Editar" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Editar categoria da denúncia" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Editar denúncias" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Editar prioridade da denúncia" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Editar denúncias" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Suas atualizações" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1189,20 +1200,20 @@ msgstr "Editor" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Endereço de email" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "Endereço de email (opcional)" @@ -1214,6 +1225,14 @@ msgstr "Alerta de email criado" msgid "Email alert deleted" msgstr "Alerta de email deletado" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Email verificado:" @@ -1290,10 +1309,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1343,11 +1358,11 @@ msgstr "Categoria existente" msgid "Existing users won't be modified." msgstr "Usuários existentes não serão modificados." -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Expandir mapa" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Explique o que está acontecendo" @@ -1389,6 +1404,8 @@ msgstr "Campos Extras" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1410,6 +1427,11 @@ msgstr "" msgid "Fields" msgstr "Campos" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1487,17 +1509,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Sua senha" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Esqueceu sua senha?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1555,7 +1582,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Garantir acesso ao administrador" @@ -1618,7 +1645,7 @@ msgstr "Campo Escondido" msgid "Hide all reports and updates" msgstr "Esconder todas as denúncias e atualizações" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Esconder toda a denúncia" @@ -1641,11 +1668,11 @@ msgstr "Esconder meu nome nesta denúncia" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Esconder toda a atualização?" @@ -1670,7 +1697,7 @@ msgstr "Início" msgid "How to report a problem" msgstr "Como denunciar um problema" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Como enviar denúncias com sucesso" @@ -1730,7 +1757,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Se você está nos contatando sobre uma denúncia ou atualização específica, por favor inclua o link para a denúncia na mensagem." @@ -1840,7 +1867,7 @@ msgstr "Inspecionar denúncia" msgid "Inspection required" msgstr "Inspeção requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1860,8 +1887,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1873,13 +1900,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "Está a caminho do conselho agora." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Me mantenha logado neste dispositivo" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1919,6 +1939,7 @@ msgstr "Última atualização:" msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1944,7 +1965,7 @@ msgstr "Listar todas os problemas denunciados" msgid "Loading reports…" msgstr "Carregando denúncias..." -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Carregando..." @@ -1970,23 +1991,22 @@ msgstr "Alertas locais" msgid "Locate the problem on a map of the area" msgstr "Localize o problema no mapa da área" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Entrar com o Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Entrar com o Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Entrar com o email" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Entrar com email/sms" @@ -1998,7 +2018,7 @@ msgstr "Sair de todas as sessões" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -2006,7 +2026,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2014,7 +2034,7 @@ msgstr "" msgid "Manual order" msgstr "Ordem manual" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Mapa" @@ -2026,11 +2046,11 @@ msgstr "Marcar como enviado" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Mensagem" @@ -2050,24 +2070,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderado" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderar esta denúncia" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderar esta atualização" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Moderado por %s às %s" @@ -2076,6 +2097,12 @@ msgstr "Moderado por %s às %s" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Moderar esta denúncia" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2101,9 +2128,9 @@ msgstr "Mais comentados" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Nome" @@ -2116,6 +2143,11 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navegar para este problema" @@ -2182,6 +2214,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nova senha:" @@ -2266,11 +2300,18 @@ msgstr "Mais novo" msgid "Next" msgstr "Próximo" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Próximo" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2283,6 +2324,11 @@ msgstr "Próximo" msgid "No" msgstr "Não" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Sua conta" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Sem área" @@ -2291,7 +2337,7 @@ msgstr "Sem área" msgid "No body" msgstr "Nenhum orgão" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nenhum concelho selecionado" @@ -2324,7 +2370,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Nenhum resultado retornado" @@ -2396,16 +2442,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Número de problemas denunciados em cada categoria, nos últimos 7 dias." @@ -2414,15 +2450,15 @@ msgstr "Número de problemas denunciados em cada categoria, nos últimos 7 dias. msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Dado offline limpo" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2474,6 +2510,14 @@ msgstr "" msgid "Options" msgstr "Opções" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2482,15 +2526,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2526,15 +2570,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Senha (opcional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2551,16 +2593,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Número de telefone" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Número de telefone (opcional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Telefone verificado:" @@ -2571,12 +2618,14 @@ msgstr "Telefone verificado:" msgid "Phone:" msgstr "Telefone:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2590,7 +2639,7 @@ msgstr "Telefone:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto é requerida." @@ -2598,12 +2647,12 @@ msgstr "Foto é requerida." msgid "Photo required" msgstr "Foto requerida" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "Falha ao enviar a foto." #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2624,7 +2673,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2644,7 +2693,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "Por favor, verifique se seu email está correto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2653,15 +2702,15 @@ msgid "Please check your phone number is correct" msgstr "Por favor, verifique se seu telefone está correto" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Por favor escolha uma categoria" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Por favor, escolha uma senha menos comum" @@ -2683,12 +2732,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor, especifique uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2696,8 +2745,8 @@ msgstr "Por favor, especifique uma mensagem" msgid "Please enter a mobile number" msgstr "Por favor, digite um número de telefone" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Por favor, digite um nome" @@ -2707,22 +2756,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Por favor, especifique uma senha" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Por favor, digite um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Por favor, especifique um email válido" @@ -2731,13 +2780,13 @@ msgstr "Por favor, especifique um email válido" msgid "Please enter a valid email address" msgstr "Por favor, digite um endereço de email válido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Por favor, digite um email válido ou número de telefone" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Por favor, especifique alguns detalhes" @@ -2747,39 +2796,39 @@ msgstr "Por favor, especifique alguns detalhes" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Por favor, especifique seu email" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Por favor, digite seu primeiro nome" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Por favor, digite seu nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Por favor, digite seu número de telefone" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Por favor, especifique seu segundo nome" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2806,8 +2855,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber outro questionário" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2819,7 +2868,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2833,11 +2882,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2870,15 +2919,15 @@ msgstr "Por favor, selecione o tipo de alerta que você quer" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Por favor, envie apenas uma imagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "Por favor, confirme pelo menos um dos e-mail/telefone" @@ -2886,9 +2935,7 @@ msgstr "Por favor, confirme pelo menos um dos e-mail/telefone" msgid "Please write a message" msgstr "Por favor, digite uma mensagem" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Postar" @@ -2896,19 +2943,19 @@ msgstr "Postar" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postado anonimamente às %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postado por %s às %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postado por %s (%s) às %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postado por %s às %s" @@ -2943,14 +2990,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Detalhes privados" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -2973,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problema marcado como aberto" @@ -2982,7 +3025,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3007,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3032,26 +3074,26 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Forneça uma atualização" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Forneça uma atualização como" -#: templates/web/base/auth/general.html:124 -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 "Fornecer um nome e uma senha é opcional, mas fazendo isto você conseguirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Fornecer um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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 um nome e uma senha é opcional, mas isto te permitirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Detalhes públicos" @@ -3120,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3145,7 +3187,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3189,9 +3231,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3223,14 +3265,14 @@ msgid "Report ID:" msgstr "ID da Denúnciia" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Denunciar um problema" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Denunciar um problema aqui" @@ -3240,13 +3282,13 @@ msgstr "Denunciar um problema aqui" msgid "Report abuse" msgstr "Denunciar abuso" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "Denunciar outro problema aqui" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Denunciar como: " @@ -3273,8 +3315,8 @@ msgstr "Denuncie, veja e discuta problemas locais" msgid "Report, view, or discuss local problems" msgstr "Denuncie, veja ou discuta problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Denunciado anonimamente às %s" @@ -3283,8 +3325,8 @@ msgstr "Denunciado anonimamente às %s" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Denunciado por %s às %s" @@ -3293,31 +3335,31 @@ msgstr "Denunciado por %s às %s" msgid "Reported by:" msgstr "Denunciado por:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Denunciado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Denunciado anonimamente às %s na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Denunciado por %s às %s na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Denunciado anonimamente às %s via %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Denunciado por %s às %s via %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3328,7 +3370,7 @@ msgstr "Denunciado:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3337,17 +3379,22 @@ msgstr "Denunciando um problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Denúncias" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Denúncias aguardando aprovação" @@ -3368,7 +3415,7 @@ msgstr "" msgid "Reports published" msgstr "Denúncias publicadas" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3428,20 +3475,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Reverter para o original" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Reverter para o texto original" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Reverter para o título original" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Lugar certo?" @@ -3453,15 +3500,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Girar Para a Esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3472,7 +3519,7 @@ msgstr "Girar Para a Direita" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" @@ -3486,8 +3533,8 @@ msgstr "Salvar + fechar como duplicado" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3502,7 +3549,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3542,13 +3589,12 @@ msgstr "A busca não encontrou nenhum usuário." msgid "Security" msgstr "Segurança" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Veja nossa poítica de privacidade" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3578,7 +3624,7 @@ msgstr "" msgid "Select:" msgstr "Selecionar:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Enviar" @@ -3595,11 +3641,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3631,9 +3677,9 @@ msgid "Share" msgstr "Compartilhar" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3641,19 +3687,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Mostrar Foto?" @@ -3665,7 +3711,7 @@ msgstr "Mostrar todas as atualizações" msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Mostrar nome publicamente?" @@ -3677,17 +3723,17 @@ msgstr "Mostrar antigo" msgid "Show older reports" msgstr "Mostrar denúncias antigas" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Mostrar foto" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3695,20 +3741,20 @@ msgstr "" msgid "Show reports in your area" msgstr "Mostrar denúncias em sua área" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Entrar" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3717,6 +3763,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Entrar ou criar uma conta" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Definir senha" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3759,15 +3810,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar seu problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Desculpe, nós não conseguimos encontrar esta localização." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3777,7 +3828,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Desculpe, não conseguimos salvar sua(s) imagem(ns), por favor tente novamente." @@ -3820,13 +3871,13 @@ msgstr "Data Início" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3845,14 +3896,13 @@ msgid "State:" msgstr "Estado:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "Estados" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3881,7 +3931,7 @@ msgstr "Visão da Rua" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Subcategoria" @@ -3889,21 +3939,22 @@ msgstr "Subcategoria" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Assunto" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Assunto:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Enviar" @@ -3953,8 +4004,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3988,18 +4038,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -4010,6 +4064,7 @@ msgstr "Versão de texto" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4043,7 +4098,7 @@ msgstr "" 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 "Obrigado, ficamos felizes em saber que foi corrigido! Poderíamos apenas perguntar se você já relatou um problema para um conselho antes?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Esta imagem parece não ter sido enviada corretamente (%s), por favor tente novamente." @@ -4057,7 +4112,6 @@ msgstr "Esse local não parece ser no Brasil; Por favor, tente novamente." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "O CEP não foi encontrado, desculpe." @@ -4070,27 +4124,27 @@ msgstr "O problema foi marcado como enviado." msgid "That problem will now be resent." msgstr "Este problema será reenviado." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "Este usuário deslogou." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4230,7 +4284,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4247,7 +4301,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Não há denúncias para mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4264,14 +4318,18 @@ msgstr "Houve um problema ao tentar mostrar esta página. Por favor tente novame msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Houve um problema com sua atualização. Por favor tente novamente." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com sua atualização. Por favor tente novamente." @@ -4279,10 +4337,21 @@ msgstr "Houve um problema com sua atualização. Por favor tente novamente." msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Estes serão enviados para o conselho, mas nunca serão mostrados online." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Estes nunca serão mostrados online." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4307,15 +4376,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Estes serão enviados para o conselho, mas nunca serão mostrados online." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Estes nunca serão mostrados online." - #: 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 "" @@ -4346,10 +4406,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta informação é necessária" @@ -4388,7 +4448,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta denúncia está aguardando moderação." @@ -4404,7 +4464,7 @@ msgstr "Esta denúncia está atualmente marcada como resolvida." msgid "This report is currently marked as open." msgstr "Esta denúncia está atualmente marcada como aberta." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4420,7 +4480,6 @@ msgid "Time spent (in minutes):" msgstr "Tempo gasto (em minutos):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Linha do tempo" @@ -4504,7 +4563,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4514,7 +4573,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Tente novamente" @@ -4550,7 +4609,7 @@ msgstr "Desbanir" msgid "Unconfirmed" msgstr "Não confirmado" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Desconhecido" @@ -4558,18 +4617,18 @@ msgstr "Desconhecido" msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Erro desconhecido" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4587,7 +4646,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Atualização" @@ -4595,11 +4654,11 @@ msgstr "Atualização" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4639,22 +4698,22 @@ msgstr "" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "Atualizado por %s (%s) em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "Atualizado por %s em %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Atualizado!" @@ -4665,7 +4724,7 @@ msgstr "Atualizado!" msgid "Updates" msgstr "Atualizados" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4719,26 +4778,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "Usuário já existe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4762,10 +4821,8 @@ msgid "User:" msgstr "Usuário:" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuários" @@ -4810,6 +4867,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4840,7 +4901,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4901,7 +4962,7 @@ msgstr "Quais problemas você gostaria de receber alertas?" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4929,17 +4990,15 @@ msgstr "Você gostaria de receber outro questionário em 4 semanas, te lembrando msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Escrever toda sua mensagem em maiúsculas dificulta a leitura, assim como a falta de pontuação." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Localização Errada? Clique novamente no mapa." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4953,11 +5012,11 @@ msgstr "Localização Errada? Clique novamente no mapa." msgid "Yes" msgstr "Sim" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Você está offline" @@ -4965,11 +5024,11 @@ msgstr "Você está offline" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Você está denunciando este problema por ser abusivo, conter informação pessoal, ou algo similar:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Você está denunciando esta atualização por ser abusiva, conter informação pessoal, ou algo similar:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "Você pode criar uma nova denúncia na mesma localização." @@ -4986,7 +5045,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Você pode contatar suporte técnico em %s" @@ -5008,11 +5067,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Você recusou; por favor preencha a caixa acima" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5020,7 +5079,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Você já anexou fotos para esta denúncia. Note que você pode anexar no máximo 3 para esta denúncia (se você tentar anexar mais, a mais antiga será removida)." @@ -5098,11 +5157,11 @@ msgid "Your account" msgstr "Sua conta" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Seu email" @@ -5111,9 +5170,9 @@ msgstr "Seu email" msgid "Your email address" msgstr "Seu endereço de email" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "Seu email ou telefone" @@ -5121,9 +5180,7 @@ msgstr "Seu email ou telefone" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Sua informação apenas será usada de acordo com nossa política de privacidade" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Seu nome" @@ -5139,13 +5196,13 @@ msgstr "Seu nome foi ocultado de todas as suas denúncias e atualizações." msgid "Your name has been hidden." msgstr "Seu nome foi ocultado" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "Suas denúncias offline" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Sua senha" @@ -5154,15 +5211,15 @@ msgstr "Sua senha" msgid "Your password has been changed" msgstr "Sua senha foi alterada" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "Sua senha deve ter %d ou mais caracteres. " #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Seu número de telefone" @@ -5183,7 +5240,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Seu token foi gerado" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Suas atualizações" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5195,8 +5257,8 @@ msgstr "Suas atualizações" msgid "Your verification code is %s" msgstr "Seu código de verificação é %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Você mesmo" @@ -5214,13 +5276,15 @@ msgid "all" msgstr "tudo" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "um administrador" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5246,7 +5310,7 @@ msgstr "por exemplo ‘%s’ or ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5284,6 +5348,16 @@ msgstr "nada" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Entrar ou criar uma conta" + +#: templates/web/base/auth/create.html:13 +#, fuzzy +msgid "or sign in" +msgstr "Novos problemas para %s" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5320,12 +5394,12 @@ msgstr "sair" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5341,11 +5415,11 @@ msgstr "" msgid "today" msgstr "hoje" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "atualização" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "atualizações" @@ -5361,11 +5435,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "usuário fora da lista de abuso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "usuário removido da lista de abuso" @@ -5534,3 +5608,21 @@ msgid "report" msgid_plural "reports" msgstr[0] "denúncia" msgstr[1] "denúncias" + +#~ msgid "No let me sign in by email" +#~ msgstr "Não deixe-me entrar por e-mail" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "Não deixe-me entrar por e-mail" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Me mantenha logado neste dispositivo" + +#~ msgid "Private details" +#~ msgstr "Detalhes privados" + +#~ 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 "Fornecer um nome e uma senha é opcional, mas fazendo isto você conseguirá denunciar problemas, fornecer atualizações ou administrar suas denúncias de maneira mais fácil." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Localização Errada? Clique novamente no mapa." diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 7be5053f456..8ac66e3a6f6 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "şi" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -157,7 +157,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(netrimis)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opțional)" @@ -176,9 +176,9 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" @@ -208,7 +208,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -217,31 +217,22 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -250,12 +241,14 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" +#: templates/web/base/report/new/form_user.html:8 +msgid "About the problem" +msgstr "" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -316,9 +309,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -328,16 +321,15 @@ msgstr "" msgid "Add user" msgstr "Adaugă utilizator" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -345,7 +337,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -365,7 +357,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -432,33 +425,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -495,7 +490,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -528,6 +523,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -540,12 +539,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -559,10 +558,8 @@ msgid "Ban user" msgstr "Adaugă utilizator" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -599,7 +596,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -631,7 +627,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -641,6 +637,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -694,7 +691,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -722,6 +719,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -734,7 +735,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -764,18 +765,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -789,8 +789,7 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -809,7 +808,7 @@ msgstr "" msgid "Confirmed" msgstr "" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -820,16 +819,20 @@ msgstr "" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -839,12 +842,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -879,6 +882,10 @@ msgstr "" msgid "Create a report" msgstr "" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +msgid "Create an account" +msgstr "" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -888,18 +895,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -917,7 +921,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -941,7 +945,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,6 +973,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -977,7 +985,7 @@ msgstr "" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -989,8 +997,8 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1006,17 +1014,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1048,8 +1057,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1058,11 +1067,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1074,7 +1079,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1082,7 +1087,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1123,33 +1128,35 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +msgid "Edit report details" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "%s actualizări" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1182,20 +1189,20 @@ msgstr "" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1207,6 +1214,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1283,10 +1298,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1336,11 +1347,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1382,6 +1393,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1403,6 +1416,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1480,17 +1498,21 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +msgid "Forgot password" +msgstr "" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1548,7 +1570,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1611,7 +1633,7 @@ msgstr "" msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1634,11 +1656,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1663,7 +1685,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1723,7 +1745,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1833,7 +1855,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1853,8 +1875,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1866,13 +1888,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1912,6 +1927,7 @@ msgstr "" msgid "Last update:" msgstr "" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1937,7 +1953,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1963,23 +1979,22 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1991,7 +2006,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1999,7 +2014,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2007,7 +2022,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2019,11 +2034,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -2043,24 +2058,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2069,6 +2085,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2094,9 +2115,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" @@ -2109,6 +2130,11 @@ msgstr "" msgid "Name:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2175,6 +2201,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2259,11 +2287,17 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +msgid "Next:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2276,6 +2310,10 @@ msgstr "" msgid "No" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:7 +msgid "No account?" +msgstr "" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2284,7 +2322,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2317,7 +2355,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2389,16 +2427,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2407,15 +2435,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2467,6 +2495,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2475,15 +2511,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2519,15 +2555,13 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2544,16 +2578,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2564,12 +2603,14 @@ msgstr "" msgid "Phone:" msgstr "" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2583,7 +2624,7 @@ msgstr "" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2591,12 +2632,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2617,7 +2658,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2637,7 +2678,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2646,15 +2687,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2676,12 +2717,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2689,8 +2730,8 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2700,22 +2741,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "" @@ -2724,13 +2765,13 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "" @@ -2740,39 +2781,39 @@ msgstr "" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2799,8 +2840,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2812,7 +2853,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2826,11 +2867,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2863,15 +2904,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2879,9 +2920,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2889,19 +2928,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2936,14 +2975,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2966,7 +3001,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2975,7 +3010,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3000,7 +3034,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3025,26 +3059,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3113,7 +3146,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3138,7 +3171,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3182,9 +3215,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3216,14 +3249,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3233,13 +3266,13 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3266,8 +3299,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3276,8 +3309,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3286,31 +3319,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3321,7 +3354,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3330,17 +3363,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3361,7 +3399,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3421,20 +3459,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3446,15 +3484,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3465,7 +3503,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3479,8 +3517,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3495,7 +3533,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3535,13 +3573,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3571,7 +3608,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3588,11 +3625,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3624,9 +3661,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3634,19 +3671,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3658,7 +3695,7 @@ msgstr "" msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3671,17 +3708,17 @@ msgstr "" msgid "Show older reports" msgstr "Rapoartele dvs." -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3689,20 +3726,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3711,6 +3748,10 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/base/auth/general.html:80 +msgid "Sign in with a password" +msgstr "" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3753,15 +3794,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3771,7 +3812,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3814,13 +3855,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3839,14 +3880,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3875,7 +3915,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3883,21 +3923,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3947,8 +3988,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3982,18 +4022,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -4004,6 +4048,7 @@ msgstr "" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4037,7 +4082,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4051,7 +4096,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "" @@ -4064,27 +4108,27 @@ msgstr "" msgid "That problem will now be resent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4224,7 +4268,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 msgid "The user has been sent a login email" msgstr "" @@ -4241,7 +4285,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4258,14 +4302,17 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +msgid "There was a problem with your login information." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4273,10 +4320,19 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4301,15 +4357,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4340,10 +4387,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4382,7 +4429,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4398,7 +4445,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 msgid "This report is now closed to updates." msgstr "" @@ -4414,7 +4461,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4498,7 +4544,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4508,7 +4554,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4544,7 +4590,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4552,18 +4598,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4581,7 +4627,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4589,11 +4635,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4633,22 +4679,22 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "" @@ -4659,7 +4705,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4713,26 +4759,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4756,10 +4802,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4804,6 +4848,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4834,7 +4882,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4895,7 +4943,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4923,17 +4971,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4947,11 +4993,11 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -4959,11 +5005,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4980,7 +5026,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5002,11 +5048,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5014,7 +5060,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5092,11 +5138,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5105,9 +5151,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5115,9 +5161,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5133,13 +5177,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5148,15 +5192,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5177,7 +5221,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Rapoartele dvs." + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5189,8 +5238,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5208,13 +5257,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5240,7 +5291,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5279,6 +5330,14 @@ msgstr "" msgid "not the council's responsibility" msgstr "marcat ca nefiind responsabilitatea consiliului" +#: templates/web/base/auth/general.html:6 +msgid "or create an account" +msgstr "" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5315,12 +5374,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5336,11 +5395,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5356,11 +5415,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index a7094c22eae..eb581361020 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Михаил Нифантьев , 2018\n" "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "и" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -163,7 +163,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(не отправлено в органы самоуправления)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(необязательно)" @@ -183,9 +183,9 @@ msgstr "(отправлено в обе инстанции)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-фид о проблемах в пределах: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" @@ -219,7 +219,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -228,34 +228,24 @@ msgstr "" msgid "%s live problems" msgstr "Актуальных неполадок: %s" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Нет Я хочу подтвердить свое обращение электронным письмом" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Нет Я хочу подтвердить свое обращение электронным письмом" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Нет Я хочу подтвердить обновление электронным письмом" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Нет Я хочу подтвердить обновление электронным письмом" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -264,12 +254,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Да У меня есть пароль" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Сообщить о проблеме" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -335,9 +328,9 @@ msgstr "(номер телефона отсутствует)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -347,16 +340,15 @@ msgstr "" msgid "Add user" msgstr "Добавить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -364,7 +356,7 @@ msgstr "" msgid "Added %s" msgstr "Добавлено: %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -384,7 +376,8 @@ msgstr "Создано уведомление «%d» для: %s. Тип: %s, п msgid "Alert %d disabled (created %s)" msgstr "Уведомление «%d» отключено (создано: %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Оповещать меня об обновлениях в будущем" @@ -452,34 +445,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "В обновлении эта неполадка помечена как исправленная." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Анонимно" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Анонимно" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Анонимно:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -516,7 +511,7 @@ msgstr "Направить во внешнее учреждение:" msgid "Assign to subdivision:" msgstr "Направить в подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -550,6 +545,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -562,12 +561,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Ожидает модерации" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Назад" @@ -581,10 +580,8 @@ msgid "Ban user" msgstr "Пометить пользователя" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -621,7 +618,6 @@ msgid "Can't see the map? Skip this step" msgstr "Карта не отображается? Пропустите этот шаг" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -654,7 +650,7 @@ msgstr "Категория" msgid "Category and State" msgstr "Категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -664,6 +660,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -727,7 +724,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -756,6 +753,10 @@ msgstr "Чтобы войти, пройдите по ссылке, указан msgid "Click the link in that email to sign in." msgstr "Чтобы войти, пройдите по ссылке, указанной в письме." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -768,7 +769,7 @@ msgstr "Чтобы войти, пройдите по ссылке, указан msgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Закрыто органом самоуправления" @@ -798,18 +799,17 @@ msgid "Cobrand:" msgstr "Кобренд:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -823,8 +823,7 @@ msgstr "Подтвердить" msgid "Confirm account" msgstr "Подтвердить аккаунт" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -843,7 +842,7 @@ msgstr "Подтверждение" msgid "Confirmed" msgstr "Подтверждено" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -854,16 +853,20 @@ msgstr "Подтверждено:" msgid "Contact %s" msgstr "Свяжитесь с командой сайта %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Свяжитесь с нами" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Свяжитесь с командой" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -873,12 +876,12 @@ msgstr "" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Не удалось найти пользователя" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Не удалось найти местоположение" @@ -914,6 +917,11 @@ msgstr "Создано" msgid "Create a report" msgstr "Создать обращение" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Войдите или создайте аккаунт" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -923,18 +931,15 @@ msgstr "Создать категорию" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -952,7 +957,7 @@ msgstr "Создано" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -978,7 +983,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "В данный момент на сайте не зарегистрировано ни одного учреждения." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Невозможно связаться с покупателем" @@ -1006,6 +1011,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1015,7 +1024,7 @@ msgstr "" msgid "Delete" msgstr "Удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1027,8 +1036,8 @@ msgstr "Удалить шаблон" msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1044,17 +1053,18 @@ msgstr "Описание" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Дополнительная информация" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1086,8 +1096,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1096,11 +1106,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "У вас есть пароль на сайте %s?" @@ -1112,7 +1118,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знаю" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Не любите заполнять формы?" @@ -1120,7 +1126,7 @@ msgstr "Не любите заполнять формы?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1165,34 +1171,36 @@ msgstr "Редактировать" msgid "Edit body details" msgstr "Редактировать информацию об учреждении" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Редактировать информацию об учреждении" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Редактировать информацию об учреждении" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Ваши обновления" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1225,20 +1233,20 @@ msgstr "Редактор" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Адрес эл. почты" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Пароль (необязательно)" @@ -1251,6 +1259,15 @@ msgstr "Создано уведомление по эл. почте" msgid "Email alert deleted" msgstr "Уведомление по эл. почте удалено" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Чтобы войти, пройдите по ссылке, указанной в письме." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1340,11 +1357,6 @@ msgstr "Введите название улицы в Цюрихе" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1395,11 +1407,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1442,6 +1454,8 @@ msgstr "Дополнительная информация:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Дополнительная информация:" @@ -1464,6 +1478,11 @@ msgstr "Не удалось отправить сообщение" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1541,17 +1560,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Подробнее читайте в разделе Как в FixMyStreet используется инструмент Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ваш пароль" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Забыли пароль?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Перенаправлено во внешнее учреждение" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Пожелание перенаправлено во внешнее учреждение" @@ -1609,7 +1633,7 @@ msgstr "Поехали!" msgid "Going to send questionnaire?" msgstr "Собираетесь отправить опрос?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1677,7 +1701,7 @@ msgstr "Скрыто" msgid "Hide all reports and updates" msgstr "Помеченные обращения и профили пользователей" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1700,11 +1724,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Скрыть метки" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1729,7 +1753,7 @@ msgstr "На главную страницу" msgid "How to report a problem" msgstr "Как сообщить о проблеме" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Как успешно создавать и отправлять обращения" @@ -1793,7 +1817,7 @@ msgstr "" "Если одно местоположение обслуживают два и более учреждений, система сайта FixMyStreet объединяет похожие категории в единую запись,\n" " которая располагается в меню. Если вы хотите, чтобы это произошло, убедитесь, что вы используете одно и то же название категории для выбранных учреждений." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1917,7 +1941,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1937,8 +1961,8 @@ msgstr "Неверно задано значение agency_responsible %s" msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1950,13 +1974,6 @@ msgstr "Загляните в раздел Часто задав msgid "It’s on its way to the council right now." msgstr "Отправлено в орган самоуправления." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Запомнить мой логин и пароль на этом компьютере" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1996,6 +2013,7 @@ msgstr "Последнее обновление:" msgid "Last update:" msgstr "Последнее обновление:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2022,7 +2040,7 @@ msgstr "Все сообщения о неполадках в виде списк msgid "Loading reports…" msgstr "закрытые обращения" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Загрузка..." @@ -2048,23 +2066,22 @@ msgstr "Местные уведомления" msgid "Locate the problem on a map of the area" msgstr "Укажите на карте местоположение проблемы" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2076,7 +2093,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "КАРТА" @@ -2084,7 +2101,7 @@ msgstr "КАРТА" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2092,7 +2109,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Карта" @@ -2104,11 +2121,11 @@ msgstr "Пометить как отправленное" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Помечайте тех пользователей, за действиями которых вы хотите следить." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Сообщение" @@ -2128,24 +2145,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2154,6 +2172,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Прошло модерацию в течение одного рабочего дня" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2179,9 +2202,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Имя" @@ -2194,6 +2217,12 @@ msgstr "Имя" msgid "Name:" msgstr "Имя:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2263,6 +2292,8 @@ msgid "New note to DM:" msgstr "Новая заметка для DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Новый пароль" @@ -2348,11 +2379,18 @@ msgstr "Самые новые" msgid "Next" msgstr "Далее" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Далее" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2365,6 +2403,11 @@ msgstr "Далее" msgid "No" msgstr "Нет" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Подтвердить аккаунт" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Территория не указана" @@ -2373,7 +2416,7 @@ msgstr "Территория не указана" msgid "No body" msgstr "Нет учреждения" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Орган самоуправления не выбран" @@ -2406,7 +2449,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Результатов нет" @@ -2484,16 +2527,6 @@ msgstr "Заметки SDM для DM" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Теперь обращение можно отправить…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Теперь обновление можно отправить…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2502,15 +2535,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2562,6 +2595,14 @@ msgstr "Спецификация Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2570,15 +2611,15 @@ msgstr "" msgid "Order" msgstr "Порядок" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2615,15 +2656,13 @@ msgstr "Родительская" msgid "Partial" msgstr "Частичная" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Пароль (необязательно)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Постоянная ссылка" @@ -2642,16 +2681,22 @@ msgid "Phone Reporter:" msgstr "Обращение отправлено:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Номер телефона" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Номер телефона (необязательно)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Количество символов в тексте обращения не должно превышать %s. Напишите более короткое обращение." + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2663,12 +2708,14 @@ msgstr "Обращение отправлено:" msgid "Phone:" msgstr "Телефон:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2682,7 +2729,7 @@ msgstr "Телефон:" msgid "Photo" msgstr "Фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Необходимо добавить фото." @@ -2690,12 +2737,12 @@ msgstr "Необходимо добавить фото." msgid "Photo required" msgstr "Необходимо добавить фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2716,7 +2763,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Поставить метку на карте" @@ -2736,7 +2783,7 @@ msgstr "Проверьте пароли и попробуйте еще раз" msgid "Please check your email address is correct" msgstr "Проверьте правильность написания адреса эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2746,15 +2793,15 @@ msgid "Please check your phone number is correct" msgstr "Проверьте правильность написания адреса эл. почты" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Выберите категорию" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2779,12 +2826,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. " #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Введите текст сообщения" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2793,8 +2840,8 @@ msgstr "Введите текст сообщения" msgid "Please enter a mobile number" msgstr "Введите номер своего телефона" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2804,22 +2851,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Введите пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Введите действующий адрес эл. почты" @@ -2828,14 +2875,14 @@ msgstr "Введите действующий адрес эл. почты" msgid "Please enter a valid email address" msgstr "Введите действующий адрес эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Введите номер своего телефона" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Введите дополнительную информацию" @@ -2845,39 +2892,39 @@ msgstr "Введите дополнительную информацию" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Введите свой эл. адрес" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Введите свое имя" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Введите свое имя" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Введите номер своего телефона" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Введите свою фамилию" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Напишите, как к вам обращаться" @@ -2904,8 +2951,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Укажите, хотите ли вы еще один опросник" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2917,7 +2964,7 @@ msgstr "Важно: новые данные не отсылаются в орг msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Внимание! Ваше обращение не было отправлено. Чтобы завершить процесс отправки, выберите нужную категорию и добавьте информацию ниже." @@ -2931,12 +2978,12 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Поясните, почему вы решили заново отправить это обращение" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2969,15 +3016,15 @@ msgstr "Выберите тип уведомления" msgid "Please state whether or not the problem has been fixed" msgstr "Сообщите о статусе неполадки: проблема была решена?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2985,9 +3032,7 @@ msgstr "" msgid "Please write a message" msgstr "Напишите сообщение" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Опубликовать" @@ -2996,19 +3041,19 @@ msgstr "Опубликовать" msgid "Postcode or street name and area" msgstr "Введите индекс ближайшего отделения связи, название улицы или регион" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Опубликовано анонимно (%s)" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Автор публикации: %s (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" @@ -3043,14 +3088,10 @@ msgstr "Конфиденциальность и файлы cookie" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Доступ ограничен" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Проблема" @@ -3073,7 +3114,7 @@ msgstr "Проблема (%s) отправлена в орган самоупр msgid "Problem breakdown by state" msgstr "Сортировка проблем по статусу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Проблема помечена как открытая." @@ -3082,7 +3123,6 @@ msgid "Problem state change based on survey results" msgstr "Смена статуса проблемы на основании результатов опроса" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблемы" @@ -3109,7 +3149,7 @@ msgstr "Недавно решенные проблемы на сайте FixMySt msgid "Problems within %.1fkm of %s" msgstr "Проблемы в пределах %.1fkm от этого места" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3135,26 +3175,26 @@ msgstr "Проблемы в пределах этого места: %s, %s" msgid "Property address:" msgstr "Адрес имущества:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Предоставить новые данные" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Пароль необязателен. Но когда вы предоставите эти данные, вы сможете быстрее сообщать о проблемах, вводить новые данные о них и редактировать свои обращения." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3223,7 +3263,7 @@ msgstr "%s: RSS-фид, в пределах района: %s" msgid "RSS feed of nearby problems" msgstr "RSS-фид о проблемах поблизости" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3248,7 +3288,7 @@ msgstr "RSS-фид об обновлениях по этой проблеме" msgid "Receive email when updates are left on this problem." msgstr "Получать эл. письма об обновлениях по этой проблеме." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3295,9 +3335,9 @@ msgstr "Удалить пометку" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3329,14 +3369,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Сообщить о проблеме" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3347,14 +3387,14 @@ msgstr "Сообщить о проблеме" msgid "Report abuse" msgstr "Сообщить об оскорбительном поведении" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Сообщить о проблеме" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3382,8 +3422,8 @@ msgstr "Городские проблемы. Сообщайте, просмат msgid "Report, view, or discuss local problems" msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте." -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Сообщено анонимно в: %s" @@ -3392,8 +3432,8 @@ msgstr "Сообщено анонимно в: %s" msgid "Reported before" msgstr "Сообщено ранее" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Автор обращения: %s, время отправки: %s" @@ -3402,31 +3442,31 @@ msgstr "Автор обращения: %s, время отправки: %s" msgid "Reported by:" msgstr "Автор обращения:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Обращение отнесено к категории: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Обращение (категория: %s) отправлено анонимно в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Обращение (категория: %s), автор: %s, отправлено в: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Анонимно отправлено через: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Отправлено через: %s, автор: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Анонимно отправлено через: %s, категория: %s, время отправки: %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Отправлено через: %s, категория: %s, автор обращения: %s, время отправки: %s" @@ -3437,7 +3477,7 @@ msgstr "Обращение отправлено:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3446,17 +3486,23 @@ msgstr "Сообщение о проблеме" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Обращения" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Количество символов в тексте обращения не должно превышать %s. Напишите более короткое обращение." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Количество символов в тексте обращения не должно превышать %s. Напишите более короткое обращение." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Обращения, ожидающие проверки" @@ -3478,7 +3524,7 @@ msgstr "" msgid "Reports published" msgstr "Опубликованные обращения" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3541,20 +3587,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Шаблоны ответов для: %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Место указано верно?" @@ -3566,15 +3612,15 @@ msgstr "Дорога находится в ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3585,7 +3631,7 @@ msgstr "Повернуть вправо" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Спутник" @@ -3599,8 +3645,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3615,7 +3661,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3655,13 +3701,12 @@ msgstr "Пользователи не найдены." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3692,7 +3737,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3709,11 +3754,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Обращение возвращено" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Отправлено позже: %s %s" @@ -3746,9 +3791,9 @@ msgid "Share" msgstr "Поделиться" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3756,19 +3801,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3780,7 +3825,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Показывать мое имя на сайте" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3794,17 +3839,17 @@ msgstr "Показать давние" msgid "Show older reports" msgstr "Искать обращения" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Показать метки" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3812,20 +3857,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Вход" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3834,6 +3879,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Войдите или создайте аккаунт" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Введите пароль" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3879,15 +3929,15 @@ msgstr "Указана неверная ссылка" msgid "Sorry, there has been an error confirming your problem." msgstr "При подтверждении вашего обращения произошла ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Не удалось найти это местоположение." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3897,7 +3947,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "Не удалось проанализировать это местоположение. Повторите попытку." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Не удалось сохранить фото. Повторите попытку." @@ -3941,13 +3991,13 @@ msgstr "Дата начала:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Статус" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3967,15 +4017,14 @@ msgid "State:" msgstr "Статус:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Статус" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4005,7 +4054,7 @@ msgstr "Просмотр улиц" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Субкатегория: %s" @@ -4014,21 +4063,22 @@ msgstr "Субкатегория: %s" msgid "Subdivision/Body" msgstr "Подразделение/учреждение" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Отправить" @@ -4080,8 +4130,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4116,18 +4165,22 @@ msgstr "" msgid "Survey Results" msgstr "Результаты опроса" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Шаблон «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Шаблоны" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -4138,6 +4191,7 @@ msgstr "Только текстовая версия" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4171,7 +4225,7 @@ msgstr "Спасибо за предоставленное фото. Тепер 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 "Мы рады узнать, что проблема решена! Это было ваше первое обращение в орган самоуправления?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Кажется, возникли трудности с загрузкой фото (%s).Повторите попытку." @@ -4185,7 +4239,6 @@ msgstr "Это местоположение находится за предел #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Не удалось распознать индекс." @@ -4198,28 +4251,28 @@ msgstr "Проблема помечена как отправленная." msgid "That problem will now be resent." msgstr "Сейчас мы еще раз отправим это обращение." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Просмотр обращения невозможен на этом устройстве (%s)." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Это обращение было удалено с сайта FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Это обращение было удалено с сайта FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4369,7 +4422,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Пользователь не смог определить местоположение неполадки на карте. Вместо этого он ввел данные о местности поблизости от неполадки." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Это обращение было удалено с сайта FixMyStreet." @@ -4389,7 +4442,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Нет обращений." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4406,15 +4459,19 @@ msgstr "При загрузке страницы произошла ошибка msgid "There was a problem with your email/password combination. Please try again." msgstr "Имя пользователя или пароль указаны неверно. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Не удалось загрузить новые данные. Повторите попытку." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Имя пользователя или пароль указаны неверно. Если вы не помните свой пароль или у вас его нет, заполните форму «Вход с помощью адреса эл. почты»." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Не удалось загрузить новые данные. Повторите попытку." @@ -4422,10 +4479,19 @@ msgstr "Не удалось загрузить новые данные. Повт msgid "There were problems with your report. Please see below." msgstr "Не удалось загрузить обращение. Прочтите информациию ниже." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Не удалось загрузить новые данные. Прочтите информациию ниже." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4455,15 +4521,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 пока работает в тестовом режиме, поэтому в процессе работы могут возникать неполадки. Они будут исправлены через некоторое время." @@ -4499,10 +4556,10 @@ msgstr "Поскольку пользователь не обозначил ка 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Эта информация является обязательной" @@ -4541,7 +4598,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Это обращение ожидает модерации." @@ -4557,7 +4614,7 @@ msgstr "Это обращение на данный момент помечен msgid "This report is currently marked as open." msgstr "Это обращение на данный момент помечено как открытое." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Это обращение на данный момент помечено как открытое." @@ -4574,7 +4631,6 @@ msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -4658,7 +4714,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4668,7 +4724,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Повторите попытку" @@ -4704,7 +4760,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Не подтверждено" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Неизв." @@ -4712,18 +4768,18 @@ msgstr "Неизв." msgid "Unknown alert type" msgstr "Неизвестный тип уведомления" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Неизвестная ошибка" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Неизвестный идентификатор проблемы" @@ -4742,7 +4798,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Обновление" @@ -4750,11 +4806,11 @@ msgstr "Обновление" msgid "Update %s created for problem %d; by %s" msgstr "Добавлены новые данные (%s) для проблемы: %d;, автор: %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Ниже представлены анонимно добавленные новые данные в: %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Ниже представлены новые данные, добавленные пользователем: %s, в: %s" @@ -4794,24 +4850,24 @@ msgstr "Обновление статусов" msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Автор публикации: %s (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Обновлено!" @@ -4822,7 +4878,7 @@ msgstr "Обновлено!" msgid "Updates" msgstr "Обновления" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Текст обновления ограничен %s симв. Напишите более короткое сообщение" @@ -4877,28 +4933,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Адрес эл. почты добавлен в черный список" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Этот адрес эл. почты уже находится в черном списке" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Аккаунт пользователя помечен" @@ -4924,10 +4980,8 @@ msgid "User:" msgstr "Пользователи" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Пользователи" @@ -4975,6 +5029,10 @@ msgstr "Посмотреть обращения по районам" msgid "View wards" msgstr "другие области" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5006,7 +5064,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5068,7 +5126,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5096,17 +5154,15 @@ msgstr "Хотите получить еще один опрос через 4 н 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 -msgid "Wrong location? Just click again on the map." -msgstr "Неверно указано местоположение? Нажмите на карту еще раз." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5120,11 +5176,11 @@ msgstr "Неверно указано местоположение? Нажмит msgid "Yes" msgstr "Да" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Вы считаете, что эта проблема не нуждалась в модерации:" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5132,11 +5188,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обновление и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Вы можете ознакомиться с проблемой на этом сайте." @@ -5154,7 +5210,7 @@ msgstr "Вы можете добавить адрес эл. почты поль msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Вы можете написать в службу технической поддержки: %s" @@ -5179,11 +5235,11 @@ msgstr "Вы можете помочь нам: найдите контактны msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Вы отказались; заполните форму выше" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5191,7 +5247,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Вы уже ответили на этот опрос. Если у вас есть вопросы, пишите нам или ознакомьтесь с данными опубликованной вами проблемы.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Вы уже предоставили фото в этом обращении. Важно: можно прикрепить не более 3 фото (если выбрать больше изображений, они заменят прикрепленные ранее)." @@ -5276,11 +5332,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваш эл. адрес" @@ -5289,9 +5345,9 @@ msgstr "Ваш эл. адрес" msgid "Your email address" msgstr "Ваш адрес эл. почты" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Ваш адрес эл. почты" @@ -5300,9 +5356,7 @@ msgstr "Ваш адрес эл. почты" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей политикой конфиденциальности" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ваше имя" @@ -5318,13 +5372,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ваш пароль" @@ -5333,15 +5387,15 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль был изменен" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ваш номер телефона" @@ -5363,7 +5417,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Ваш пароль был изменен" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Ваши обновления" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5375,8 +5434,8 @@ msgstr "Ваши обновления" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5395,13 +5454,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5427,7 +5488,7 @@ msgstr "напр.: ‘%s’ или ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5466,6 +5527,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "помечено как вопрос вне ответственности органа управления" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Войдите или создайте аккаунт" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5502,12 +5572,12 @@ msgstr "выйти" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "местный орган самоуправления" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "метка не отображается, так как карта не была использована" @@ -5524,11 +5594,11 @@ msgstr "этот тип проблемы поблизости" msgid "today" msgstr "сегодня" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5544,12 +5614,12 @@ msgstr "пользователь проживает недалеко от обн msgid "user is problem owner" msgstr "неполадка находится в собственности пользователя" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Этот адрес эл. почты уже находится в черном списке" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Адрес эл. почты добавлен в черный список" @@ -5766,8 +5836,35 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Введите пароль" +#~ msgid "No let me sign in by email" +#~ msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Редактировать информацию об учреждении" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Введите почтовый индекс ближайшего отделения связи в Великобритании или название улицы и регион" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Запомнить мой логин и пароль на этом компьютере" + +#~ msgid "Now to submit your report…" +#~ msgstr "Теперь обращение можно отправить…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Теперь обновление можно отправить…" + +#~ 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 "Имя и пароль необязательны. Но когда вы предоставите эти данные, вы сможете быстрее сообщать о проблемах, вводить новые данные о них и редактировать свои обращения." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Неверно указано местоположение? Нажмите на карту еще раз." #~ msgid "Password:" #~ msgstr "Пароль:" diff --git a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po index 90d8b1257a3..f9a6ba66194 100644 --- a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sl_SI.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Matevz Langus , 2018\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/mysociety/teams/12067/sl_SI/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "in" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcijsko)" @@ -174,9 +174,9 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "" @@ -205,7 +205,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -214,31 +214,22 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -247,12 +238,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Povzemi težavo" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -312,9 +306,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -324,16 +318,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -341,7 +334,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -361,7 +354,8 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "" @@ -428,33 +422,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Drug uporabnik" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Ali želite prekiniti prenos?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Ali ste prepričani?" @@ -491,7 +487,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -524,6 +520,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -536,12 +536,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -554,10 +554,8 @@ msgid "Ban user" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -594,7 +592,6 @@ msgid "Can't see the map? Skip this step" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -626,7 +623,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -636,6 +633,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -689,7 +687,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -717,6 +715,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -729,7 +731,7 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "" @@ -758,18 +760,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -783,8 +784,7 @@ msgstr "" msgid "Confirm account" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -803,7 +803,7 @@ msgstr "" msgid "Confirmed" msgstr "" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -814,16 +814,20 @@ msgstr "" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -833,12 +837,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -873,6 +877,11 @@ msgstr "" msgid "Create a report" msgstr "" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Prijavi se ali ustvari račun" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -882,18 +891,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -911,7 +917,7 @@ msgstr "" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -935,7 +941,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -963,6 +969,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -971,7 +981,7 @@ msgstr "" msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -983,8 +993,8 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1000,17 +1010,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1042,8 +1053,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1052,11 +1063,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1068,7 +1075,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1076,7 +1083,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1117,34 +1124,35 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Prosim vnesi podrobnosti" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Prosim vnesi podrobnosti" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +msgid "Edit your update" +msgstr "" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1177,20 +1185,20 @@ msgstr "" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1202,6 +1210,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1278,10 +1294,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1331,11 +1343,11 @@ msgstr "Obstoječa kategorija" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Razširi zemljevid" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Objasnite kaj je narobe" @@ -1377,6 +1389,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1398,6 +1412,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1475,17 +1494,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Vnesite geslo" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1543,7 +1567,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1607,7 +1631,7 @@ msgstr "Skrit" msgid "Hide all reports and updates" msgstr "Skrij vsa poročila in novosti" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Skrij celotno poročilo" @@ -1630,11 +1654,11 @@ msgstr "Skrij moje ime v tem poročilu" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "V celoti skrij posodobitev?" @@ -1659,7 +1683,7 @@ msgstr "Domov" msgid "How to report a problem" msgstr "Kako prijaviti težavo" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Kako uspešno poslati poročilo" @@ -1719,7 +1743,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1829,7 +1853,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1849,8 +1873,8 @@ msgstr "" msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1862,13 +1886,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1908,6 +1925,7 @@ msgstr "Zadnji popravek:" msgid "Last update:" msgstr "Zadnji popravek:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1933,7 +1951,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Nalagam..." @@ -1959,23 +1977,22 @@ msgstr "" msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Prijavi se s Facebookom" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Prijavi se s Twitterjem" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Prijavi se z elektronskim naslovom" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -1987,7 +2004,7 @@ msgstr "Odjavi se iz vseh sej" msgid "Look up" msgstr "Poišči" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -1995,7 +2012,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2003,7 +2020,7 @@ msgstr "" msgid "Manual order" msgstr "Ročno sortiranje" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2015,11 +2032,11 @@ msgstr "Označi kot poslano" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Sporočilo" @@ -2039,24 +2056,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderiraj" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2065,6 +2083,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2090,9 +2113,9 @@ msgstr "Najpogosteje komentirano" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Ime" @@ -2105,6 +2128,11 @@ msgstr "Ime" msgid "Name:" msgstr "Ime:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navigiraj do te težave" @@ -2171,6 +2199,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Novo geslo:" @@ -2256,11 +2286,18 @@ msgstr "Najnovejši" msgid "Next" msgstr "Naslednji" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Naslednji" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2273,6 +2310,10 @@ msgstr "Naslednji" msgid "No" msgstr "Ne" +#: templates/web/base/report/form/user_loggedout_password.html:7 +msgid "No account?" +msgstr "" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2281,7 +2322,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "" @@ -2314,7 +2355,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ni vrnjenih rezultatov" @@ -2386,16 +2427,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2404,15 +2435,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "V redu" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2464,6 +2495,14 @@ msgstr "" msgid "Options" msgstr "Možnosti" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2472,15 +2511,15 @@ msgstr "" msgid "Order" msgstr "Vrstni red" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2516,15 +2555,13 @@ msgstr "Starš" msgid "Partial" msgstr "Delno" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Geslo (opcijsko)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2541,16 +2578,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonska številka" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2561,12 +2603,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2580,7 +2624,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Slika" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Slika je obvezna." @@ -2588,12 +2632,12 @@ msgstr "Slika je obvezna." msgid "Photo required" msgstr "Slika obvezna" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2614,7 +2658,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2634,7 +2678,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2643,15 +2687,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Prosim izberi kategorijo" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Prosim izberi manj pogosto uporabljano geslo" @@ -2673,12 +2717,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Prosim vnesi sporočilo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2686,8 +2730,8 @@ msgstr "Prosim vnesi sporočilo" msgid "Please enter a mobile number" msgstr "Prosim vnesi mobilno številko" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Prosim vnesi ime" @@ -2697,22 +2741,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Prosim vnesi geslo" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Prosim vnesi zadevo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Prosim vnesi veljaven elektronski naslov" @@ -2721,13 +2765,13 @@ msgstr "Prosim vnesi veljaven elektronski naslov" msgid "Please enter a valid email address" msgstr "Prosim vnesi veljaven elektronski naslov" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Prosim vnesi veljaven elektronski naslov ali telefonsko številko" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Prosim vnesi podrobnosti" @@ -2737,39 +2781,39 @@ msgstr "Prosim vnesi podrobnosti" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Prosim vnesi tvoj elektronski naslov" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Prosim vnesi svoje ime" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Vnesi svoje ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Vnesi svojo telefonsko številko" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Prosim vnesi svoj naziv" @@ -2796,8 +2840,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2809,7 +2853,7 @@ msgstr "" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "" @@ -2823,11 +2867,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2860,15 +2904,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2876,9 +2920,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "" @@ -2886,19 +2928,19 @@ msgstr "" msgid "Postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "" @@ -2933,14 +2975,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2963,7 +3001,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "" @@ -2972,7 +3010,6 @@ msgid "Problem state change based on survey results" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Težave" @@ -2997,7 +3034,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3022,26 +3059,25 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3110,7 +3146,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3135,7 +3171,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3179,9 +3215,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3213,14 +3249,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3231,14 +3267,14 @@ msgstr "Kako prijaviti težavo" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Kako prijaviti težavo" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3265,8 +3301,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "" @@ -3275,8 +3311,8 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "" @@ -3285,31 +3321,31 @@ msgstr "" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3320,7 +3356,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3329,17 +3365,22 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Poročila" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Poročila čakajoča potrditve" @@ -3360,7 +3401,7 @@ msgstr "" msgid "Reports published" msgstr "Poročila obljavljena." -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3420,20 +3461,20 @@ msgstr "Predloge odgovora" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Vrni na original" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Vrni na prvotno besedilo" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Vrni na prvotni naslov" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Pravo mesto?" @@ -3445,15 +3486,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Zavrti v levo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3464,7 +3505,7 @@ msgstr "Zavrti v desno" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Vrtenje te slike bo uničilo neshranjene spremembe tega poročila." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" @@ -3478,8 +3519,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3494,7 +3535,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3534,13 +3575,12 @@ msgstr "" msgid "Security" msgstr "Varnost" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3570,7 +3610,7 @@ msgstr "" msgid "Select:" msgstr "Izberi:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Pošlji" @@ -3588,11 +3628,11 @@ msgstr "Prijavi se z elektronskim naslovom" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "" @@ -3624,9 +3664,9 @@ msgid "Share" msgstr "Deli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3634,19 +3674,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Prikaži sliko?" @@ -3658,7 +3698,7 @@ msgstr "Prikaži vse posodobitve" msgid "Show my name publicly" msgstr "Prikaži moje ime javno?" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Prikaži ime javno?" @@ -3672,17 +3712,17 @@ msgstr "Prikaži vse posodobitve" msgid "Show older reports" msgstr "Išči poročila" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Prikaži sliko" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3690,20 +3730,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3712,6 +3752,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Prijavi se ali ustvari račun" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Vnesite geslo" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3754,15 +3799,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Oprosti, ne najdem te lokacije." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3772,7 +3817,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3815,13 +3860,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3840,14 +3885,13 @@ msgid "State:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3876,7 +3920,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Podkategorija" @@ -3884,21 +3928,22 @@ msgstr "Podkategorija" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Zadeva" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Zadeva:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Pošlji" @@ -3948,8 +3993,7 @@ msgid "Summarise your changes" msgstr "Povzemi svoje spremembe" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -3983,18 +4027,22 @@ msgstr "" msgid "Survey Results" msgstr "" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Predloge" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Besedilo" @@ -4005,6 +4053,7 @@ msgstr "Samo besedilna verzija" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4038,7 +4087,7 @@ msgstr "" 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 "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -4052,7 +4101,6 @@ msgstr "Lokacije izgleda ni v Združenem kraljestvu. Poskusi ponovno." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Poštna številka je nepoznana. Oprosti." @@ -4065,27 +4113,27 @@ msgstr "Težava je označena kot poslana." msgid "That problem will now be resent." msgstr "Težava bo poslana ponovno." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "Uporabnik odjavljen." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4225,7 +4273,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Uporabnik odjavljen." @@ -4243,7 +4291,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Ni poročil za prikaz." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4260,14 +4308,18 @@ msgstr "Težava s prikazom strani. Poskusi kasneje." msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Težava s prikazom strani. Poskusi kasneje." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "" @@ -4275,10 +4327,20 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Ti nikoli ne bodo prikazani na spletu." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4303,15 +4365,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Ti nikoli ne bodo prikazani na spletu." - #: 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 "" @@ -4342,10 +4395,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Podatek je obvezen" @@ -4384,7 +4437,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4400,7 +4453,7 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Skrij vsa poročila in novosti" @@ -4417,7 +4470,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4501,7 +4553,7 @@ msgstr "Prevodi" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4511,7 +4563,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Poskusi ponovno" @@ -4547,7 +4599,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4555,18 +4607,18 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Neznana napaka" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4584,7 +4636,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4592,11 +4644,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "" @@ -4636,22 +4688,22 @@ msgstr "" msgid "Updated" msgstr "Posodobljen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Posodobljen!" @@ -4662,7 +4714,7 @@ msgstr "Posodobljen!" msgid "Updates" msgstr "Posodobitve" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4716,26 +4768,26 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4759,10 +4811,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" @@ -4807,6 +4857,10 @@ msgstr "" msgid "View wards" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4837,7 +4891,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4898,7 +4952,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4926,17 +4980,15 @@ 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4950,11 +5002,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Ste brez povezave." @@ -4962,11 +5014,11 @@ msgstr "Ste brez povezave." msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -4983,7 +5035,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5005,11 +5057,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5017,7 +5069,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5095,11 +5147,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5108,9 +5160,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5118,9 +5170,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5136,13 +5186,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5151,15 +5201,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5180,7 +5230,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Ni novih posodobitev" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5192,8 +5247,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5211,13 +5266,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5243,7 +5300,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5281,6 +5338,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Prijavi se ali ustvari račun" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5317,12 +5383,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5338,11 +5404,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5358,11 +5424,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5578,9 +5644,6 @@ msgstr[1] "poročili" msgstr[2] "poročil" msgstr[3] "poročil" -#~ msgid "Enter a password" -#~ msgstr "Vnesite geslo" - #~ msgid "New" #~ msgstr "Nov" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index d3ebb7b32b9..a77de01d686 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "dhe" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -162,7 +162,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(nuk është dërguar në kuvend)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opsionale)" @@ -181,9 +181,9 @@ msgstr "(dërguar te të dy)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Zgjedh kategorinë --" @@ -216,7 +216,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -225,31 +225,22 @@ msgstr "" msgid "%s live problems" msgstr "%s problemet në kohë reale" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Jo Më lejo të konfirmoj raportin tim me email" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Jo Me lejo të konfirmoj përditësimin me email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Jo më lejo të kyçem me email" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Vërejtje: Ky raport është përcjellë për veprim. Ndryshimet e mëpasme nuk do të përcjellen." @@ -258,12 +249,15 @@ msgstr "Vërejtje: Ky raport është përcjellë për veprim. N msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Vërejtje: Ky raport nuk është përcjellë akoma për veprim. Ndryshimet mund të mos përcjellen më tutje." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Po Kam fjalëkalim" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Përmblidhe problemin" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -326,9 +320,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Shto në listë" @@ -338,16 +332,15 @@ msgstr "Shto në listë" msgid "Add user" msgstr "Shto përdorues" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Shto/modifiko kategoritë e problemeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Shto/modifiko prioritetet e përgjegjes" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Shto/modifiko shabllonat e përgjegjeve" @@ -355,7 +348,7 @@ msgstr "Shto/modifiko shabllonat e përgjegjeve" msgid "Added %s" msgstr "Shtoi %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Nëse e shtoni këtë raport në listë, ai do të largohet nga lista %s." @@ -375,7 +368,8 @@ msgstr "Njoftimi %d u krijua për %s, lloji %s, parametrat %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Njoftimi %d është çaktivizuar (krijuar %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Më njofto për përditësimet e ardhme" @@ -442,33 +436,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Një përditësim e ka shenjuar këtë problem si të zgjidhur." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonim" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonim:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Përdorues tjetër" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "A je i sigurt se do ta ndërpresh këtë ngarkim?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "A je i sigurt?" @@ -505,7 +501,7 @@ msgstr "Cakto te një zyre e jashtme:" msgid "Assign to subdivision:" msgstr "Cakto te një nëndepartament:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Cakto përdoruesit në zona" @@ -538,6 +534,10 @@ msgstr "Pergjigje automatike:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Kategoritë ekzistuese" @@ -550,12 +550,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Mos përcillni informacione personale dhe targa të veturave" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Në pritje të ndërmjetësimit" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Prapa" @@ -568,10 +568,8 @@ msgid "Ban user" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -608,7 +606,6 @@ msgid "Can't see the map? Skip this step" msgstr "Nuk mund ta shihni hartën? Kapërceni këtë hap" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -640,7 +637,7 @@ msgstr "Kategoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategoria është ndryshuar nga ‘%s’ në ‘%s’" @@ -650,6 +647,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "norma fikse e kategorisë për probleme > më të vjetra se 4 javë" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -712,7 +710,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -740,6 +738,10 @@ msgstr "Kliko vegzën në emailin e konfimimit për t'u kyçur." msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -752,7 +754,7 @@ msgstr "" msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Mbyllur nga zyra" @@ -782,18 +784,17 @@ msgid "Cobrand:" msgstr "Ko-brandimi" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurimi" @@ -807,8 +808,7 @@ msgstr "Konfirmo" msgid "Confirm account" msgstr "Konfirmo llogarinë" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Konfirmo me email në vend të futjes së fjalëkalimit. Kur konfirmoni, përditësohet fjalëkalimi." @@ -827,7 +827,7 @@ msgstr "Konfirmimi" msgid "Confirmed" msgstr "Konfirmuar" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -838,16 +838,20 @@ msgstr "Konfirmuar:" msgid "Contact %s" msgstr "Kontakto %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Na kontaktoni" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakto ekipin" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -857,12 +861,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinatat" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Përdoruesi nuk u gjet" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Vendndodhja nuk u gjet" @@ -897,6 +901,11 @@ msgstr "" msgid "Create a report" msgstr "Krijo raport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Kyçu ose krijo një llogari" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -906,18 +915,15 @@ msgstr "Krijo kategori" msgid "Create priority" msgstr "Krijo prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Krijo raportim/përditësim si zyre" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Krijo raportim/përditësim në emër të përdoruesit" @@ -935,7 +941,7 @@ msgstr "U krijua" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -960,7 +966,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Aktualisht asnjë zyre nuk është krijuar." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klienti nuk është i kontaktueshëm" @@ -988,6 +994,11 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Krijo raportim/përditësim si zyre" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -997,7 +1008,7 @@ msgstr "" msgid "Delete" msgstr "Fshirë" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1009,8 +1020,8 @@ msgstr "Fshij shabllonin" msgid "Deleted" msgstr "Fshirë" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1026,17 +1037,18 @@ msgstr "Përshkrimi" msgid "Description:" msgstr "Përshkrimi:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detajet" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1068,8 +1080,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1078,11 +1090,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Mos dërgo njoftime me email për komentet te krijuesi i raportimit" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "E keni %s fjalëkalimin?" @@ -1094,7 +1102,7 @@ msgstr "" msgid "Don’t know" msgstr "Nuk e di" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Nuk ju pëlqejnë formularët?" @@ -1102,7 +1110,7 @@ msgstr "Nuk ju pëlqejnë formularët?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Lësho fotografitë këtu kliko për të ngarkuar" @@ -1147,33 +1155,36 @@ msgstr "Modifiko" msgid "Edit body details" msgstr "Modifiko detajet e zyres" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Modifiko detajet e përdoruesit tjetër" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Modifiko privilegjet e përdoruesit tjetër" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Modifiko kategorine" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Detajet e raportimit të moderuar" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Modifiko prioritetin e raportimit" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Modifiko raportimet" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Përditësimet tuaja" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1206,20 +1217,20 @@ msgstr "Redaktori" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Adresa e emailit" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1231,6 +1242,14 @@ msgstr "U krijua një njoftim me email" msgid "Email alert deleted" msgstr "Njoftimi me email u fshi" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1319,11 +1338,6 @@ msgstr "Fut një rrugë në Zürich" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Fut një kod postar të Britanisë, apo një rrugë / lagje" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Fut një kod postar të Britanisë, apo një rrugë / lagje" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1374,11 +1388,11 @@ msgstr "Kategori ekzistuese" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Shpjego ku është problemi" @@ -1422,6 +1436,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Të dhëna shtesë:" @@ -1444,6 +1460,11 @@ msgstr "Dërgimi i mesazhit dështoi" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1521,17 +1542,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Për më shumë informata, shih Si përdoret Mapit nga FixMyStreet." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Fjalëkalimi juaj" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Keni harruar fjalëkalimin?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Është përcjellë te një zyre e jashtme" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Dëshirë për ta përcjellë te një zyre e jashtme" @@ -1589,7 +1615,7 @@ msgstr "Vazhdo" msgid "Going to send questionnaire?" msgstr "Do ta dërgoni pyetësorin?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Jepni qasje administratorit" @@ -1654,7 +1680,7 @@ msgstr "Fshehur" msgid "Hide all reports and updates" msgstr "Raportimet dhe përdoruesit e markuar" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1677,11 +1703,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Fshih shenjën" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1706,7 +1732,7 @@ msgstr "Ballina" msgid "How to report a problem" msgstr "Si të raportoj problemin" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Si të dërgoj raportimin me sukses" @@ -1770,7 +1796,7 @@ msgstr "" "Nëse dy apo më shum zyre shërbejnë në të njejtin lokacion, FixMyStreet i kombinon kategoritë identike në një të vetme\n" " në meny. Sigurohu që do të përdoret e njejta kategori te zyret nëse doni që të kombinohen." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1894,7 +1920,7 @@ msgstr "" msgid "Inspection required" msgstr "Kërkohet inspektim" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instrukto kontraktorët se si të rregullohet problemi" @@ -1914,8 +1940,8 @@ msgstr "Vlerë jovalide për agency_responsible %s" msgid "Invalid format %s specified." msgstr "Formati jovalid %s ." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Vendndodhja jovalide. Lokacioni i ri duhet të mbulohet nga e njejta zyre." @@ -1927,13 +1953,6 @@ msgstr "Shpesh është më e shpejta të lexohen pyetjet e shpesh msgid "It’s on its way to the council right now." msgstr "Është rrugës për te zyrja momentalisht." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Më mbaj të kyçur në këtë kompjuter" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1973,6 +1992,7 @@ msgstr "Përditësimi i fundit:" msgid "Last update:" msgstr "Përditësimi i fundit:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1999,7 +2019,7 @@ msgstr "Listo të gjitha problemet e raportuara" msgid "Loading reports…" msgstr "Modifiko raportimet" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Duke ngarkuar..." @@ -2025,23 +2045,22 @@ msgstr "Njoftimet lokale" msgid "Locate the problem on a map of the area" msgstr "Lokalizo problemin në hartën e zonës" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2053,7 +2072,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "HARTA" @@ -2061,7 +2080,7 @@ msgstr "HARTA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Menagjo listat" @@ -2069,7 +2088,7 @@ msgstr "Menagjo listat" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Harta" @@ -2081,11 +2100,11 @@ msgstr "Marko si të dërguar" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Marko përdoruesit, sjellje e të cilëve do ta përcjellësh si të markuar." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "Detajet e problemeve të markimit" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Mesazhi" @@ -2105,24 +2124,25 @@ msgstr "Zyret që mungojnë:" msgid "Missing jurisdiction_id" msgstr "ID e jurisdikcionit që mungon" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Modero" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Detajet e raportimit të moderuar" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Modero këtë raportim" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2131,6 +2151,12 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Moderuar nga departamenti brenda një dite të punës" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Modero këtë raportim" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2156,9 +2182,9 @@ msgstr "Më të komentuarit" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Emri" @@ -2171,6 +2197,12 @@ msgstr "Emri" msgid "Name:" msgstr "Emri:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Përditësimet janë të limituara në gjatësi prej %s shenjash. Ju lutemi shkurtojeni përditësimin " + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navigo te ky problem" @@ -2239,6 +2271,8 @@ msgid "New note to DM:" msgstr "Shenim i ri për DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Fjalëkalim i ri:" @@ -2324,11 +2358,18 @@ msgstr "Më e reja" msgid "Next" msgstr "Tjetra" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Tjetra" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2341,6 +2382,11 @@ msgstr "Tjetra" msgid "No" msgstr "Jo" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Llogaria juaj" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Pa zonë" @@ -2349,7 +2395,7 @@ msgstr "Pa zonë" msgid "No body" msgstr "Pa zyre" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nuk është zgjedhur zyrja" @@ -2382,7 +2428,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Nuk u kthye asnjë rezultat" @@ -2462,16 +2508,6 @@ msgstr "Shenimet nga SDM te DM" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Tash te dërgimi i raportimit…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Tash te dërgimi i përditësimit…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2480,15 +2516,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2540,6 +2576,14 @@ msgstr "Specifikimet Open311" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2548,15 +2592,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2592,15 +2636,13 @@ msgstr "Instanca prindore" msgid "Partial" msgstr "I pjesshëm" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Fjalëkalimi (opsional)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2618,16 +2660,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numri i telefonit" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Numri i telefonit (opsional)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Raportimet janë të kufizuara në gjatesinë %s shenja. Ju lutem shkurtojeni raportin tuaj" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2638,12 +2686,14 @@ msgstr "" msgid "Phone:" msgstr "Telefoni:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2657,7 +2707,7 @@ msgstr "Telefoni:" msgid "Photo" msgstr "Fotografia" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Fotografia është e domosdoshme" @@ -2665,12 +2715,12 @@ msgstr "Fotografia është e domosdoshme" msgid "Photo required" msgstr "Foto e domosdoshme" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2691,7 +2741,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Vendos shenjën në hartë" @@ -2711,7 +2761,7 @@ msgstr "Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri" msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni adresën e emailit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2720,15 +2770,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Ju lutem zgjedhni kategorinë" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2753,12 +2803,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Ju lutemi mos u bëni abuziv — abuzimi i zyreve e zhvlerëson shërbimin për të gjithë përdoruesit." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Ju lutem shkruani mesazhin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2766,8 +2816,8 @@ msgstr "Ju lutem shkruani mesazhin" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Ju lutemi shkruani emrin" @@ -2777,22 +2827,22 @@ msgstr "Ju lutem shkruani emrin për këtë zyre" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Ju lutemi shkruani fjalëkalimin" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Ju lutemi shkruani titullin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Ju lutemi shkruani një email valid" @@ -2801,13 +2851,13 @@ msgstr "Ju lutemi shkruani një email valid" msgid "Please enter a valid email address" msgstr "Ju lutemi jepni një adresë valide emaili" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Ju lutemi shkruani disa detaje" @@ -2817,39 +2867,39 @@ msgstr "Ju lutemi shkruani disa detaje" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Ju lutemi shkruani emailin tuaj" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Ju lutemi shkruani emrin tuaj" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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 "Ju lutemi shkruani emrin tuaj të plotë, zyreve u duhen këto informata - nëse nuk doni që emri juaj të shfaqet, hiqni çekimin më poshtë" #: perllib/FixMyStreet/App/Controller/Contact.pm:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Ju lutemi shkruani emrin tuaj" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Ju lutemi shkruani numrin tuaj të telefonit" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Ju lutemi shkruani mbiemrin tuaj (opsionale) " -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Ju lutemi shkruani titullin tuaj" @@ -2876,8 +2926,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ju lutemi shenoni nëse doni të pranoni edhe një pyetësor tjetër" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2889,7 +2939,7 @@ msgstr "Ju lutem vini re se përditësimet nuk do të përcjellen te zyrja." msgid "Please note your report has not yet been sent." msgstr "Ju lutemi vini re se raportimi juaj nuk është dërguar akoma." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Ju lutemi vini re se raportimi juaj nuk është dërguar akoma. Zgjedhni kategorinë dhe shtoni informatat shtesë mëposhtë dhe pastaj dërgoni." @@ -2903,11 +2953,11 @@ msgstr "Ju lutemi vini re se përditësimi juaj nuk është postuar%s (%s) at %s" msgstr "Postuar nga %s (%s) ne %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postuar nga %s ne %s" @@ -3014,14 +3062,10 @@ msgstr "Privacia dhe cookiet" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3044,7 +3088,7 @@ msgstr "Problemi %s u dërgua te zyrja %s" msgid "Problem breakdown by state" msgstr "Analiza e problemit sipas statusit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problemi është shenuar si i hapur." @@ -3053,7 +3097,6 @@ msgid "Problem state change based on survey results" msgstr "Ndryshimi i statusit të problemit bazuar në rezultatet e anketës" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemet" @@ -3078,7 +3121,7 @@ msgstr "Problemet e raportuara së fundit në FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3103,26 +3146,26 @@ msgstr "Problemet brenda %s, %s" msgid "Property address:" msgstr "Adresa e pronës:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Ofro një përditësim" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Ofro një përditësim si" -#: templates/web/base/auth/general.html:124 -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 "Shenimi i emrit dhe fjalëkalimit është opsional, por nëse e jepni kjo do t'ju mundësojë të raportoni më lehtë, të bëni përditësime dhe të menagjoni raportimet tuaja." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Shenimi i fjalëkalimit është opsional, por kjo do t'ju mundësojë të raportoni më lehtë, të bëni përditësime dhe të menagjoni raportimet tuaja." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Shenimi i fjalëkalimit është opsional, por kjo do t'ju mundësojë të raportoni më lehtë, të bëni përditësime dhe të menagjoni raportimet tuaja." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3191,7 +3234,7 @@ msgstr "RSS feed i %s, brenda lagjes %s" msgid "RSS feed of nearby problems" msgstr "RSS feed i problemeve në afërsi" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3216,7 +3259,7 @@ msgstr "RSS feed për të rejat rreth këtij problemi" msgid "Receive email when updates are left on this problem." msgstr "Prano email kur ka përditësime të këtij problemi." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Pranuar nga %s disa momente më vonë" @@ -3261,9 +3304,9 @@ msgstr "Hiq markimin" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Hiq nga lista" @@ -3295,14 +3338,14 @@ msgid "Report ID:" msgstr "ID e raportimit" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Raporto problemin" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3313,14 +3356,14 @@ msgstr "Raporto problemin" msgid "Report abuse" msgstr "Raporto abuzimin" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Raporto problemin" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Raporto si" @@ -3348,8 +3391,8 @@ msgstr "Raporto, shih apo diskuto problemet lokale" msgid "Report, view, or discuss local problems" msgstr "Raporto, shih apo diskuto problemet lokale" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Raportuar ne menyre anonime te %s" @@ -3358,8 +3401,8 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "Raportuar para" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Raportuar nga %s te %s" @@ -3368,31 +3411,31 @@ msgstr "Raportuar nga %s te %s" msgid "Reported by:" msgstr "Raportuar nga:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Raportuar në kategorinë %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Raportuar në kategorinë %s në mënyrë anonime te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Raportuar në kategorinë %s nga %s te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Raportuar përmjet %s në mënyrë anonime te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Raportuar përmjet %s nga %s te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Raportuar përmjet %s në kategorinë %s në mënyrë anonime te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar përmjet %s në kategorinë %s te %s" @@ -3403,7 +3446,7 @@ msgstr "Raportuar:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3412,17 +3455,23 @@ msgstr "Raportimi i një problemi" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Raportimet" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Raportimet janë të kufizuara në gjatesinë %s shenja. Ju lutem shkurtojeni raportin tuaj" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Raportimet janë të kufizuara në gjatesinë %s shenja. Ju lutem shkurtojeni raportin tuaj" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Raportimet që presin aprovim" @@ -3443,7 +3492,7 @@ msgstr "" msgid "Reports published" msgstr "Raportimet e publikuara" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3503,20 +3552,20 @@ msgstr "Shablloni i përgjigjes" msgid "Response Templates for %s" msgstr "Shablloni i përgjigjes për %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Vendi i duhur?" @@ -3528,15 +3577,15 @@ msgstr "Operatori i rrugës për këtë rrugë me emër (nxjerrë nga referenca msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operatori i rrugës për këtë rrugë me emër (nga OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rrotullo majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3547,7 +3596,7 @@ msgstr "Rrotullo djathtas" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rrotullimi i kësaj fotografie do t'i humbas ndërrimet e paruajtura në këtë raport." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Sateliti" @@ -3561,8 +3610,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3577,7 +3626,7 @@ msgid "Save with a public update" msgstr "Ruaj me përditësim publik" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3617,13 +3666,12 @@ msgstr "Kërkimi nuk gjeti asnjë përdorues." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Shih parimet tona të privacisë" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3654,7 +3702,7 @@ msgstr "" msgid "Select:" msgstr "Zgjedh:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3671,11 +3719,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Dërgo raportin prapa" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Dërgo te %s %s më vonë" @@ -3708,9 +3756,9 @@ msgid "Share" msgstr "Shpërndaj" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Lista" @@ -3718,19 +3766,19 @@ msgstr "Lista" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Listuar" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Listuar nga %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3742,7 +3790,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Publiko emrin tim" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3755,17 +3803,17 @@ msgstr "" msgid "Show older reports" msgstr "Kërko raportet" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Shfaq shenjat" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3773,20 +3821,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Kyçu" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Kyçu me email në vend se të shkruani fjalëkalim të ri. Kur klikoni në vegzën në email, fjalëkalimi do të përditësohet." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3795,6 +3843,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Kyçu ose krijo një llogari" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Shkruaj fjalekalimin" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3839,15 +3892,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Kërkojmë falje, ndodhi një gabim gjatë konfirmimit të problemit tuaj." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Kërkojmë falje, lokacioni nuk u gjet." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Kërkojmë falje, nuk arritëm t'ju kyçim. Plotësoni formularin e mëposhtëm." @@ -3857,7 +3910,7 @@ msgstr "Kërkojmë falje, nuk arritëm t'ju kyçim. Plotësoni formularin e mëp msgid "Sorry, we could not parse that location. Please try again." msgstr "Kërkojmë falje, lokacioni ishte i pakuptueshëm. Provoni përsëri." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Kërkojmë falje, nuk arritëm t'i ruajmë foto(t) tuaja, provoni përsëri." @@ -3900,13 +3953,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Statusi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3925,14 +3978,13 @@ msgid "State:" msgstr "Statusi:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3962,7 +4014,7 @@ msgstr "Pamja e rrugës" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3970,21 +4022,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "Nëndrejtoria/Zyra" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Tema" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Tema:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Dërgo" @@ -4035,8 +4088,7 @@ msgid "Summarise your changes" msgstr "Përmblidh ndryshimet" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4070,18 +4122,22 @@ msgstr "Përdoruesit e privilegjuar kanë të drejta të kryejnë të gj msgid "Survey Results" msgstr "Rezultatet e anketimit" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Shablloni «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Shabllonet" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Teksti" @@ -4092,6 +4148,7 @@ msgstr "Verzioni vetëm tekst" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4125,7 +4182,7 @@ msgstr "Ju falemnderit për ngarkimin e fotos. Na duhet ta dijmë vendndodhjen e 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 "Falemnderit, na vjen mirë që është rregulluar! A mund t'ju pyesim, nëse keni raportuar problem përpara?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Kjo foto nuk duket të jetë ngarkuar mirë (%s), ju lutemi provoni prap." @@ -4139,7 +4196,6 @@ msgstr "Ky lokacion nuk duket se është brenda kufijve të shtetit; provoni pra #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Ky kod postar nuk është i njohur, na vjen keq." @@ -4152,28 +4208,28 @@ msgstr "Problemi u markua i dërguar." msgid "That problem will now be resent." msgstr "Ky problem nuk do të ridërgohet." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Raporti nuk mund të shihet në %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Ky raport është fshirë nga FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Ky raport është fshirë nga FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4323,7 +4379,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Përdoruesi nuk arriti ta lokalozojë problemin në hartë, por mund të shihni zonën përreth lokacionit që ka zgjedhur " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Ky raport është fshirë nga FixMyStreet." @@ -4343,7 +4399,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nuk ka raporte për t'u shfaqur." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4360,14 +4416,18 @@ msgstr "Pati një problem për të shfaqur këtë faqe. Ju lutemi provoni më vo msgid "There was a problem with your email/password combination. Please try again." msgstr "Pati një problem me kombinimin email/fjalëkalim. Ju lutemi provoni përsëri." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri." @@ -4375,10 +4435,21 @@ msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri." msgid "There were problems with your report. Please see below." msgstr "Pati një problem me raportin tuaj. Ju lutemi lexoni mëposhtë." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Pati një problem me përditësimin tuaj. Ju lutemi lexoni mëposhtë." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Këto shenime do të dërgohen te zyrja, por nuk do të shfaqen publikisht." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Këto shenime nuk do të shfaqet kurrë publikisht." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4409,15 +4480,6 @@ msgstr "Këto do të shfaqen publikisht që tjerët t'i shohin, në përputhje m msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "Këto shenime do të dërgohen te %s dhe të shfaqen publikisht që tjerët t'i shohin në përputhje me politikat tona të privacisë." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Këto shenime do të dërgohen te zyrja, por nuk do të shfaqen publikisht." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Këto shenime nuk do të shfaqet kurrë publikisht." - #: 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 "Ky implementim i API-së është duke u punuar dhe nuk është stabil akoma. Mund të ndryshojë në të ardhmen pa paralajmërim." @@ -4453,10 +4515,10 @@ msgstr "Ky email i është dërguar dy zyrave që e mbulojnë lokacionin, meqë 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 "Ky problem u është dërguar disa zyrave që mbulojnë vendndodhjen e tij, meqenëse kategoria e zgjedhur figuron te të gjitha këto zyra; ju lutemi injorojeni nëse nuk jeni zyra kompetente për t'u marrë me këtë çështje." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ky informacion është i domosdoshëm" @@ -4495,7 +4557,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ky raport pret moderim." @@ -4511,7 +4573,7 @@ msgstr "Ky raport është markuar i rregulluar." msgid "This report is currently marked as open." msgstr "Ky problem është markuar i hapur." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Ky problem është markuar i hapur." @@ -4528,7 +4590,6 @@ msgid "Time spent (in minutes):" msgstr "Koha e shpenzuar (në minuta):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohëzgjatja" @@ -4612,7 +4673,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "Besuar nga zyra:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Besuar për të bërë raporte që nuk kanë nevojë të inspektohen" @@ -4622,7 +4683,7 @@ msgstr "Besuar:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Provoni përsëri" @@ -4658,7 +4719,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Pakonfirmuar" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Panjohur" @@ -4666,18 +4727,18 @@ msgstr "Panjohur" msgid "Unknown alert type" msgstr "Lloj i panjohur i njoftimit" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Gabim i panjohur" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "ID e panjohur e gabimit" @@ -4696,7 +4757,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Përditësim" @@ -4704,11 +4765,11 @@ msgstr "Përditësim" msgid "Update %s created for problem %d; by %s" msgstr "Përditësim %s i krijuar për problemin %d; nga %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Përditësimi i mëposhtëm është shtuar anonim te %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Përditësimi i mëposhtëm është shtuar nga %s te %s" @@ -4748,22 +4809,22 @@ msgstr "Statuset e përditësimit" msgid "Updated" msgstr "Përditësuar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Përditësuar!" @@ -4774,7 +4835,7 @@ msgstr "Përditësuar!" msgid "Updates" msgstr "Përditësimet" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Përditësimet janë të limituara në gjatësi prej %s shenjash. Ju lutemi shkurtojeni përditësimin " @@ -4829,26 +4890,26 @@ msgstr "ID e përdoruesit për t'i atribuuar komentet te" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Markimi i përdoruesit u hoq" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Përdorues i markuar" @@ -4872,10 +4933,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Përdoruesit" @@ -4921,6 +4980,10 @@ msgstr "Shih raportet sipas lagjes" msgid "View wards" msgstr "Shih raportet sipas lagjes" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4951,7 +5014,7 @@ msgstr "Kemi gjetu më shumë se një rezultat për referencën e problemit:" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5012,7 +5075,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Tri foto mjaftojnë." @@ -5040,17 +5103,15 @@ msgstr "A dëshironi të merrni pyetësorin tjetër pas 4 javësh, për t'ju kuj msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Nëse e shkruani mesazhin të tërin me germa të mëdha, e bëni atë vështirë të lexueshëm, njësoj si pa shenja pikësimi." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Lokacioni i gabuar? Thjeshtë klikoni prap në hartë." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5064,11 +5125,11 @@ msgstr "Lokacioni i gabuar? Thjeshtë klikoni prap në hartë." msgid "Yes" msgstr "Po" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Po ankoheni se raportimi është moderuar pa nevojë:" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5076,11 +5137,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Po raportoni se raportimi në fjalë është abuziv, ka informata personale, apo diçka të ngjajshme:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Po raportoni se përditësimi në fjalë është abuziv, përmban informata personale, apo diçka ngjashëm:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Ju mund të shihni problemin në këtë faqe." @@ -5098,7 +5159,7 @@ msgstr "Mund ta shtoni emailin e përdoruesit abuziv te lista e abuzimeve, gjë msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Ju mund të kontaktoni ndihmën teknike në %s" @@ -5123,11 +5184,11 @@ msgstr "Mund të na ndihmoni duke gjetur kontaktin adekuat për problemet e %s d msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Mund ta markoni një zyre si të fshirë nëse nuk doni që të jetë aktive në faqe." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Keni mohuar; ju lutemi plotësoni fushën mëlartë" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5135,7 +5196,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Ju tashmë i jeni përgjigjur pyetësorit. Nëse keni pyetje, ju lutemi na kontaktoni, apo shikoni problemin.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "Tashmë keni ngarkuar foto për këtë problem. Vini re ju mund të ngarkoni më së shumti 3 foto në këtë raport (nëse tentoni të ngarkoni më shumë, fotoja më e vjetër do të fshihet)." @@ -5216,11 +5277,11 @@ msgid "Your account" msgstr "Llogaria juaj" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emaili juaj" @@ -5229,9 +5290,9 @@ msgstr "Emaili juaj" msgid "Your email address" msgstr "Adresa juaj e emailit " -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5239,9 +5300,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Informatat tuaja do të përdoren vetëm në përputhje me politikat tona të privacisë" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Emri juaj" @@ -5257,13 +5316,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Fjalëkalimi juaj" @@ -5272,15 +5331,15 @@ msgstr "Fjalëkalimi juaj" msgid "Your password has been changed" msgstr "Fjalëkalimi juaj është ndryshuar" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Numri juaj i telefonit" @@ -5301,7 +5360,12 @@ msgstr "Listat tuaja" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Përditësimet tuaja" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5313,8 +5377,8 @@ msgstr "Përditësimet tuaja" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Vetë ju" @@ -5333,13 +5397,15 @@ msgid "all" msgstr "të gjitha" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5366,7 +5432,7 @@ msgstr "p.sh. ‘%s’ ose ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Një gropë 25 cm në Rr. Filan Fisteku afër kutisë së postës" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Kjo gropë është këtu tash dy muaj dhe..." @@ -5405,6 +5471,15 @@ msgstr "asnjë" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Kyçu ose krijo një llogari" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5441,12 +5516,12 @@ msgstr "shkyçu" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "zyra lokale" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "nuk ka pin në hartë meqenëse përdoruesi nuk e ka përdorë" @@ -5462,11 +5537,11 @@ msgstr "ky lloj i problemit lokal" msgid "today" msgstr "sot" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5482,11 +5557,11 @@ msgstr "përdoruesi është nga e njejta zonë si problemi - %d" msgid "user is problem owner" msgstr "përdoruesi është pronar i problemit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5656,8 +5731,30 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Shkruaj fjalekalimin" +#~ msgid "No let me sign in by email" +#~ msgstr "Jo më lejo të kyçem me email" + +#~ msgid "Edit other users' details" +#~ msgstr "Modifiko detajet e përdoruesit tjetër" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Fut një kod postar të Britanisë, apo një rrugë / lagje" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Më mbaj të kyçur në këtë kompjuter" + +#~ msgid "Now to submit your report…" +#~ msgstr "Tash te dërgimi i raportimit…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Tash te dërgimi i përditësimit…" + +#~ 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 "Shenimi i emrit dhe fjalëkalimit është opsional, por nëse e jepni kjo do t'ju mundësojë të raportoni më lehtë, të bëni përditësime dhe të menagjoni raportimet tuaja." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Lokacioni i gabuar? Thjeshtë klikoni prap në hartë." #~ msgid "Password:" #~ msgstr "Fjalëkalimi:" diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po index 352e472d9c3..e5dff2aa8ad 100644 --- a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sr.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Serbian (https://www.transifex.com/mysociety/teams/12067/sr/)\n" @@ -18,13 +18,13 @@ 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:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -166,7 +166,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(nije poslato skupštini)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(opcionalno)" @@ -186,9 +186,9 @@ msgstr "(poslato oboma)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS vesti %s, u okviru %s " -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" @@ -219,7 +219,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -228,34 +228,24 @@ msgstr "" msgid "%s live problems" msgstr " %s %s" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Ne Dozvolite mi da svoj izveštaj potvrdim e-mejlom" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Ne Dozvolite mi da svoj izveštaj potvrdim e-mejlom" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "ne Dozvolite da mi da ažuriranje potvrdim e-mejlom" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "ne Dozvolite da mi da ažuriranje potvrdim e-mejlom" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Ne dozvolite mi da se priključim e-mejlom" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Ne dozvolite mi da se priključim e-mejlom" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Napomena: Ovaj izveštaj prosleđen je dalje za dalje radnje . Svaka dalja promena neće biti prosleđena." @@ -264,12 +254,15 @@ msgstr "Napomena: Ovaj izveštaj prosleđen je dalje za dalje r msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Napomena: Ovaj izveštaj još uvek nije podnet dalje za dalje radnje. Svaka načinjena promena ne može biti prosleđena." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Da Imam lozinku" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Rezimiraj problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -335,9 +328,9 @@ msgstr "(Bez broja telefona)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Dodaj u uži krug" @@ -347,16 +340,15 @@ msgstr "Dodaj u uži krug" msgid "Add user" msgstr "Dodaj korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Dodaj/izmeni problemske kategorije" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Dodaj/izmeni prioritete odgovora" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Dodaj/izmeni šablone odgovora" @@ -364,7 +356,7 @@ msgstr "Dodaj/izmeni šablone odgovora" msgid "Added %s" msgstr "Dodato %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Dodavanjem ove prijave u vaš uži krug uklonićete ga iz užeg kruga %s." @@ -384,7 +376,8 @@ msgstr "Obaveštenje %d stvoreno zar %s, tip %s, parametri %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Obaveštenje %d deaktivirano (kreirano %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Upozori me na buduće ažurirane informacije" @@ -452,34 +445,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Ažuriranjem je ovaj problem obeležen kao rešen." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anoniman" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anoniman" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anoniman" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Drugi korisnik" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Da li si siguran da želiš da otkažeš ovo otpremanje?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Da li si siguran?" @@ -516,7 +511,7 @@ msgstr "Dodeli spoljnoj direkciji:" msgid "Assign to subdivision:" msgstr "Dodeli korisnicima po područjima:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Dodeljeno %s" @@ -550,6 +545,10 @@ msgstr "Automatski odgovor:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Dostupne kategorije" @@ -562,12 +561,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Izbegavajte lične informacije i registarske tablice vozila " -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Čekajući moderaciju" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Nazad" @@ -581,10 +580,8 @@ msgid "Ban user" msgstr "Obeleži korisnika " #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -621,7 +618,6 @@ msgid "Can't see the map? Skip this step" msgstr "Ne vidite mapu? Preskočite ovaj korak" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -654,7 +650,7 @@ msgstr "Kategorija je promenjena sa ‘%s’ na ‘%s’" msgid "Category and State" msgstr "Kategorija je promenjena sa ‘%s’ na ‘%s’" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Norma rešavanja problema stari > od 4 nedelje " @@ -664,6 +660,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Norma rešavanja problema stari > od 4 nedelje " #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -728,7 +725,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -757,6 +754,10 @@ msgstr "Klikni na link iz našeg e-mejla potvrde da se upišeš u sistem." msgid "Click the link in that email to sign in." msgstr "Klikni na link iz našeg e-mejla potvrde da se upišeš u sistem." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -769,7 +770,7 @@ msgstr "Klikni na link iz našeg e-mejla potvrde da se upišeš u sistem." msgid "Closed" msgstr "Zatvoren" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Zaključila skupština" @@ -799,18 +800,17 @@ msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguracija" @@ -824,8 +824,7 @@ msgstr "Potvrdi" msgid "Confirm account" msgstr "Potvrdi račun" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "Potvrdi e-mejlom, pružajući novu lozinku u toj fazi. Nakon potvrde, ažuriraće se vaša lozinka." @@ -844,7 +843,7 @@ msgstr "Potvrda" msgid "Confirmed" msgstr "Potvrđeno" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -855,16 +854,20 @@ msgstr "Potvrđeno:" msgid "Contact %s" msgstr "Kontakt %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontaktirajte nas" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontaktiraj tim" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -874,12 +877,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Korisnik se ne može naći" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Lokacija se ne može pretražiti" @@ -915,6 +918,11 @@ msgstr "Kreiran" msgid "Create a report" msgstr "Kreiraj izveštaj" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Upiši se ili otvori račun" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -924,19 +932,16 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "Kreiraj prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Kreiraj izveštaje/ažurirane informacije za skupštinu opštine" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika" @@ -954,7 +959,7 @@ msgstr "Kreiran" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -980,7 +985,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Trenutno nije kreirano nikakvo telo." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klijent nedostupan" @@ -1009,6 +1014,11 @@ msgstr "" msgid "Default priority" msgstr "Kreiraj prioritet" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Kreiraj izveštaje/ažurirane informacije za skupštinu opštine" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1018,7 +1028,7 @@ msgstr "" msgid "Delete" msgstr "Izbrisano" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1030,8 +1040,8 @@ msgstr "Izbriši šablon" msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1047,17 +1057,18 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Pojedinosti" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1089,8 +1100,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1099,11 +1110,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Nemojte slati e-mejl obaveštenja o komentarima dobijenim od podnosioca problema" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Da li imate %s lozinku?" @@ -1115,7 +1122,7 @@ msgstr "" msgid "Don’t know" msgstr "Ne’t znam" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Ne dopada vam se oblik?" @@ -1123,7 +1130,7 @@ msgstr "Ne dopada vam se oblik?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Prevuci i spusti fotografije ovde ili klikni da učitaš" @@ -1167,33 +1174,36 @@ msgstr "Izmeni" msgid "Edit body details" msgstr "Izmeni podatke o opštini" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Izmeni podatke drugih korisnika" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Izmeni ovlašćenja drugih korisnika" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Izmeni kategoriju prijave" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Uredi pojedinosti o prijavi" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Izmeni prioritet prijave" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Izmeni prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Izmena ažuriranih informacija %d" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1226,20 +1236,20 @@ msgstr "Urednik" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Emejl" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Emejl adresa" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Emejl adresa" @@ -1252,6 +1262,15 @@ msgstr "Kreirano E-mejl obaveštenja" msgid "Email alert deleted" msgstr "Izbrisano E-mejl obaveštenje" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Klikni na link iz našeg e-mejla potvrde da se upišeš u sistem." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1334,11 +1353,6 @@ msgstr "Unesi Zürich naziv ulice" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Unesi naziv obližnje ulice ili oblasti" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Unesi naziv obližnje ulice ili oblasti" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1389,11 +1403,11 @@ msgstr "Postojeća kategorija" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Objasni šta je pogrešno" @@ -1438,6 +1452,8 @@ msgstr "Dodatni podaci" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Dodatni podaci:" @@ -1460,6 +1476,11 @@ msgstr "Nije uspeo da pošalje poruku" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1537,17 +1558,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Za podrobnije informacije, vidi Kako Sredimoju ulicu koristi Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Zaboravili ste lozinku?" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Zaboravili ste lozinku?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Upućeno spoljnom telu" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Često postavljana pitanja" @@ -1605,7 +1631,7 @@ msgstr "Nastavi" msgid "Going to send questionnaire?" msgstr "Šaljete upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Dozvolite pristup administratoru" @@ -1671,7 +1697,7 @@ msgstr "Sakriveno" msgid "Hide all reports and updates" msgstr "Obeležene prijave i korisnici" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1694,11 +1720,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Sakrij oznaku" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1723,7 +1749,7 @@ msgstr "Početak" msgid "How to report a problem" msgstr "Kako prijaviti problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Kako poslati uspešne prijave" @@ -1787,7 +1813,7 @@ msgstr "" "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." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1905,7 +1931,7 @@ msgstr "" msgid "Inspection required" msgstr "Potrebna inspekcija" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Naložite ugovaračima da reše probleme" @@ -1925,8 +1951,8 @@ msgstr "Pogrešna agencija_odgovorna value %s" msgid "Invalid format %s specified." msgstr "Nevažeći format %s naveden." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Nevažeća lokacija. Novu lokaciju mora pokrivati ista skupština." @@ -1938,13 +1964,6 @@ msgstr "Često je najbrže proveriti naša FAQ i videti da li msgid "It’s on its way to the council right now." msgstr "U ovom trenutku je na putu ka skupštini." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Držite me upisanim na ovom računaru" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1984,6 +2003,7 @@ msgstr "Poslednje ažuriranje:" msgid "Last update:" msgstr "Poslednje ažuriranje:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2010,7 +2030,7 @@ msgstr "Navedi sve prijavljene probleme" msgid "Loading reports…" msgstr "Izmeni prijave" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Loading..." @@ -2036,23 +2056,22 @@ msgstr "Lokalna obaveštenja" msgid "Locate the problem on a map of the area" msgstr "Pronađite problem na mapi oblasti" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2064,7 +2083,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "MAPA" @@ -2072,7 +2091,7 @@ msgstr "MAPA" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Upravljaj užim krugom" @@ -2080,7 +2099,7 @@ msgstr "Upravljaj užim krugom" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Mapa" @@ -2092,11 +2111,11 @@ msgstr "Označi kao poslat" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označi kao uređen/zaključen u poslednjih osam nedelja" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Poruka" @@ -2116,24 +2135,25 @@ msgstr "Direkcije koje nedostaju:" msgid "Missing jurisdiction_id" msgstr "Jurisdikcija koja nedostaje_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Uredi" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Uredi pojedinosti o prijavi" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Uredi ovu prijavu" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2142,6 +2162,12 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Uređuje odsek u jednom radnom danu " +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Uredi ovu prijavu" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2167,9 +2193,9 @@ msgstr "Najčešće komentarisani" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Ime" @@ -2182,6 +2208,12 @@ msgstr "Ime" msgid "Name:" msgstr "Ime: %s" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Upravljaj ovim problemom" @@ -2250,6 +2282,8 @@ msgid "New note to DM:" msgstr "Nova beleška za DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nova lozinka:" @@ -2336,11 +2370,18 @@ msgstr "Najnovije" msgid "Next" msgstr "Sledeće" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Sledeće" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2353,6 +2394,11 @@ msgstr "Sledeće" msgid "No" msgstr "Ne" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Potvrdi račun" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Nema oblasti" @@ -2361,7 +2407,7 @@ msgstr "Nema oblasti" msgid "No body" msgstr "Nema direkcije" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Nije odabrana skupština" @@ -2394,7 +2440,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "No result returned" @@ -2474,16 +2520,6 @@ msgstr "Sada podnesite vaše najnovije informacije…" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Now to submit your report…" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Now to submit your update…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2492,15 +2528,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "U redu" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2552,6 +2588,14 @@ msgstr "" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2560,15 +2604,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2605,15 +2649,13 @@ msgstr "Izvor" msgid "Partial" msgstr "Delimično" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Lozinka (opcionalno)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2632,16 +2674,22 @@ msgid "Phone Reporter:" msgstr "Prijavio:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Broj telefona" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Broj telefona (opcionalno)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2653,12 +2701,14 @@ msgstr "Prijavio:" msgid "Phone:" msgstr "Tel:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2672,7 +2722,7 @@ msgstr "Tel:" msgid "Photo" msgstr "Fotografija" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Fotografija potrebna." @@ -2680,12 +2730,12 @@ msgstr "Fotografija potrebna." msgid "Photo required" msgstr "Fotografija potrebna" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2706,7 +2756,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Stavi oznaku na mapi" @@ -2726,7 +2776,7 @@ msgstr "Molimo vas proverite lozinke i probajte ponovo " msgid "Please check your email address is correct" msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2736,15 +2786,15 @@ msgid "Please check your phone number is correct" msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna " #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Molimo vas izaberite kategoriju" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2766,12 +2816,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Molimo vas unesite poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2780,8 +2830,8 @@ msgstr "Molimo vas unesite poruku" msgid "Please enter a mobile number" msgstr "Molimo vas unesite vaš broj telefona" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Molimo vas unesite ime" @@ -2791,22 +2841,22 @@ msgstr "Molimo vas unesite naziv ovog tela" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Molimo vas unesite lozinku" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Molimo vas unesite predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Molimo vas unesite važeći e-mejl" @@ -2815,14 +2865,14 @@ msgstr "Molimo vas unesite važeći e-mejl" msgid "Please enter a valid email address" msgstr "Molimo vas unesite važeću e-mejl adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Molimo vas unesite vaš broj telefona" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Molimo vas unesite neke podatke" @@ -2832,39 +2882,39 @@ msgstr "Molimo vas unesite neke podatke" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Molimo vas unesite vaš e-mejl" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Molimo vas unesite vaše ime" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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 vas unesite vaše ime, skupština treba ove informacije – ukoliko ne želite da vam se ime prikazuje na stranici, skinite znak štikliranja iz polja ispod " #: perllib/FixMyStreet/App/Controller/Contact.pm:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Molimo vas unesite vaše ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Molimo vas unesite vaš broj telefona" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Molimo vas unesite vaše drugo ime" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Molimo vas unesite vaše zvanje" @@ -2891,8 +2941,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo vas navedite da li biste hteli da dobijete još jedan upitnik " -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2904,7 +2954,7 @@ msgstr "Molimo vas imajte u vidu da se ažurirane informacije ne šalju skupšti msgid "Please note your report has not yet been sent." msgstr "Molimo vas imajte u vidu da vaša prijava još uvek nije poslata." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Molimo vas imajte u vidu da vaša prijava još uvek nije poslata." @@ -2918,12 +2968,12 @@ msgstr "Molimo vas imajte u vidu da vaša prijava još uvek nije poslat msgid "Please note:" msgstr "Molimo vas imajte u vidu:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Molimo vas pružite javne informacije o ovoj prijavi." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Molimo vas pružite javne informacije o ovoj prijavi." @@ -2956,15 +3006,15 @@ msgstr "Molimo vas iznesite da li je problem rešen ili ne " msgid "Please state whether or not the problem has been fixed" msgstr "Molimo vas iznesite da li je problem rešen ili ne " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Molimo vas postavite samo sliku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2972,9 +3022,7 @@ msgstr "" msgid "Please write a message" msgstr "Molimo vas napišite poruku" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Postavi" @@ -2983,19 +3031,19 @@ msgstr "Postavi" msgid "Postcode or street name and area" msgstr "Unesi naziv obližnje ulice i oblasti" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postavljeno anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postavio %s na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postavio %s na %s" @@ -3030,14 +3078,10 @@ msgstr "Privatnost i kolačići" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privatan" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3060,7 +3104,7 @@ msgstr "Problem %s poslat skupštini %s" msgid "Problem breakdown by state" msgstr "Pregled problema po stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." @@ -3069,7 +3113,6 @@ msgid "Problem state change based on survey results" msgstr "Promena stanja predmeta na osnovu rezultata ankete " #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -3096,7 +3139,7 @@ msgstr "Nedavno prijavljeni problemi sređeni na Sredimojuulicu" msgid "Problems within %.1fkm of %s" msgstr "Problemi u okviru %.1fkm od ove lokacije" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3122,26 +3165,26 @@ msgstr "Problemi u okviru %s, %s" msgid "Property address:" msgstr "Adresa imovine:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Pruži najnovije informacije" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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 "Pružanje imena i lozinke je opcionalno, ali će isto dozvoliti da se lakše prijave problemi, daju najnovije informacije i u ravlja vašim prijavama." +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Pružanje lozinke je opcionalno, ali će vam omogućiti da lakše prijavite probleme, da ostavite najnovije informacije i upravljate vašim prijavama." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pružanje lozinke je opcionalno, ali će vam omogućiti da lakše prijavite probleme, da ostavite najnovije informacije i upravljate vašim prijavama." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3210,7 +3253,7 @@ msgstr "RSS vesti %s, u okviru %s naselja" msgid "RSS feed of nearby problems" msgstr "RSS vesti o obližnjim problemima" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3235,7 +3278,7 @@ msgstr "RSS vesti o najnovijim informacijama o ovom problemu" msgid "Receive email when updates are left on this problem." msgstr "Primi e-mejl kada su navedene najnovije informacije o ovom problemu." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Primio %s par trenutaka kasnije" @@ -3282,9 +3325,9 @@ msgstr "Ukloni oznaku" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Ukloni iz užeg kruga" @@ -3316,14 +3359,14 @@ msgid "Report ID:" msgstr "ID prijave:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Prijavi problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3334,14 +3377,14 @@ msgstr "Prijavi problem" msgid "Report abuse" msgstr "Prijavi zloupotrebu" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Prijavi problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Prijavi kao" @@ -3369,8 +3412,8 @@ msgstr "Prijavi, pregledaj ili diskutuj o lokalnim problemima" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili diskutuj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Prijavljeni anonimno u %s" @@ -3379,8 +3422,8 @@ msgstr "Prijavljeni anonimno u %s" msgid "Reported before" msgstr "Prijavljeni ranije" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Prijavio %s u %s" @@ -3389,31 +3432,31 @@ msgstr "Prijavio %s u %s" msgid "Reported by:" msgstr "Prijavio:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Prijavljeno u kategoriji %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno u kategoriji %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Prijavljeno u kategoriji %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Prijavljeno putem %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Prijavljeno putem %s od strane %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Prijavljeno putem %s u kategoriji %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavljeno putem %s u kategoriji %s od strane %s u %s" @@ -3424,7 +3467,7 @@ msgstr "Prijavio:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3433,17 +3476,23 @@ msgstr "Prijavljivanje problema" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Prijave" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Prijave čekaju na odobrenje" @@ -3465,7 +3514,7 @@ msgstr "" msgid "Reports published" msgstr "Objavljene prijave" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3528,20 +3577,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Pravo mesto?" @@ -3553,15 +3602,15 @@ msgstr "Drumski operater za naziv ove ulice (proizilazi iz referentnog broja i v msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Drumski operater za naziv ove ulice (iz OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Okreni levo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3572,7 +3621,7 @@ msgstr "Okreni desno" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Okretanjem ove slike odbacuju se nesačuvane promene u izveštaju." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitski" @@ -3586,8 +3635,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3602,7 +3651,7 @@ msgid "Save with a public update" msgstr "Sačuvaj javnim ažuriranjem" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3642,13 +3691,12 @@ msgstr "Pretragom nađeno nula korisnika." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Vidi našu politiku privatnosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3679,7 +3727,7 @@ msgstr "" msgid "Select:" msgstr "Odaberi:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3696,11 +3744,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Pošalji prijavu nazad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Poslato %s %s kasnije" @@ -3733,9 +3781,9 @@ msgid "Share" msgstr "Podeli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Uži krug" @@ -3743,19 +3791,19 @@ msgstr "Uži krug" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Ubačen u uži krug" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Ubacio u uži krug %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3767,7 +3815,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3781,17 +3829,17 @@ msgstr "Prikaži stare" msgid "Show older reports" msgstr "Pretraži prijave" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Prikaži oznake" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3799,20 +3847,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Upiši se" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete na link u vašem e-mejlu, ažuriraće se vaša lozinka." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 #, fuzzy msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete na link u vašem e-mejlu, ažuriraće se vaša lozinka." @@ -3822,6 +3870,11 @@ msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete msgid "Sign in or create an account" msgstr "Upiši se ili otvori račun" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Unesi lozinku" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3867,15 +3920,15 @@ msgstr "Izvinite, ovo nije’t važeći link" msgid "Sorry, there has been an error confirming your problem." msgstr "Izvinite, nastala je greška u potvrđivanju vašeg problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Izvinite, nismo mogli da nađemo datu lokaciju." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Izvinite, nismo uspeli da vas upišemo u sistem. Molimo vas popunite obrazac ispod." @@ -3885,7 +3938,7 @@ msgstr "Izvinite, nismo uspeli da vas upišemo u sistem. Molimo vas popunite obr msgid "Sorry, we could not parse that location. Please try again." msgstr "Izvinite, nismo mogli da shvatimo datu lokaciju. Molimo vas pokušajte ponovo." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Izvinite, nismo uspeli da sačuvamo vaše slike, molimo vas pokušajte ponovo." @@ -3929,13 +3982,13 @@ msgstr "Datum početka:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Država" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3955,15 +4008,14 @@ msgid "State:" msgstr "Statistike" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Država" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3993,7 +4045,7 @@ msgstr "Izgled ulice" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Pod-kategorija: %s" @@ -4002,21 +4054,22 @@ msgstr "Pod-kategorija: %s" msgid "Subdivision/Body" msgstr "Odsek/direkcija" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Predmet" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Predmet" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Podnesi" @@ -4068,8 +4121,7 @@ msgid "Summarise your changes" msgstr "Rezimiraj vaše promene" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4104,18 +4156,22 @@ msgstr "Superkorisnici imaju dozvolu da obave sve radnje u sklo msgid "Survey Results" msgstr "Rezultati ankete" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Šablon «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Šabloni" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4126,6 +4182,7 @@ msgstr "Samo tekstualna verzija" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4159,7 +4216,7 @@ msgstr "Hvala vam što ste postavili vašu fotografiju. Sada moramo da pronađem 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 "Hvala vam, drago nam je da čujemo da je sređeno! Da li samo možemo da vas upitamo da li ste ikada ovaj problem prijavili skupštini i ranije?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Slika nije učitana ispravno (%s), molimo vas pokušajte ponovo." @@ -4173,7 +4230,6 @@ msgstr "Po svemu sudeći data lokacija nije na Kosovu; molimo vas pokušajte pon #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Dati poštanski broj nije prepoznat, izvinite." @@ -4186,28 +4242,28 @@ msgstr "Dati problem obeležen je kao poslat." msgid "That problem will now be resent." msgstr "Dati problem će sada biti ponovo poslat." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Data prijava ne može se pogledati na %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Data prijava uklonjena je sa Sredimojuulicu." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Data prijava uklonjena je sa Sredimojuulicu." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4355,7 +4411,7 @@ msgstr "" 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 da pronađe problem na mapi, već samo da vidi oblast oko lokacije koju su uneli " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Data prijava uklonjena je sa Sredimojuulicu." @@ -4375,7 +4431,7 @@ msgstr "" msgid "There are no reports to show." msgstr "Nema prijava za prikazivanje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4392,15 +4448,19 @@ msgstr "Nastao je problem u prikazivanju ove strane. Molimo vas probajte ponovo msgid "There was a problem with your email/password combination. Please try again." msgstr "Postoji problem sa kombinacijom vašeg e-mejla/lozinke. Molimo vas pokušajte ponovo." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Nastao je problem sa vašom kombinacijom e-mejla/lozinke. Ukoliko ne možete da se setite svoje lozinke ili je nemate, molimo vas popunite ‘upišite se u odeljku na obrascu za email’." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo." @@ -4408,10 +4468,21 @@ msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo." msgid "There were problems with your report. Please see below." msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Iste će biti poslate skupštini, ali nikada neće biti prikazane online." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Iste nikada neće biti prikazane online." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4441,15 +4512,6 @@ msgstr "Iste će biti objavljene online kako bi ih ostali videli, u skladu sa na msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "Iste će biti poslate %s i objavljene online kako bi ih drugi videli, u skladu sa našom politikom privatnosti." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Iste će biti poslate skupštini, ali nikada neće biti prikazane online." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Iste nikada neće biti prikazane online." - #: 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 "Ova primena API je u toku i još uvek nije stabilizovana. Promeniće se bez ikakvog upozorenja ubuduće." @@ -4485,10 +4547,10 @@ msgstr "Ovaj e-mejl poslat je obema direkcijama koje pokrivaju lokaciju problema 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 "Ovaj e-mejl poslat je nekolicini skupština koje pokrivaju lokaciju problema, pošto je odabrana kategorija pružena za sve njih; molimo vas ignorišite je ukoliko niste ispravna direkcija da se pozabavi ovim pitanjem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ova informacija je tražena" @@ -4527,7 +4589,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ova prijava čeka na moderatora." @@ -4543,7 +4605,7 @@ msgstr "Ova prijava je trenutno označena kao sređena." msgid "This report is currently marked as open." msgstr "Ova prijava trenutno je obeležena kao otvorena." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Ova prijava trenutno je obeležena kao otvorena." @@ -4560,7 +4622,6 @@ msgid "Time spent (in minutes):" msgstr "Potrošeno vreme (u minutima):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenski okvir" @@ -4644,7 +4705,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "Kojima veruju direkcije:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Verodostojan da podnosi prijave koje ne moraju da se proveravaju " @@ -4654,7 +4715,7 @@ msgstr "Verodostojan:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Probajte ponovo" @@ -4690,7 +4751,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrđeno" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Nepoznati" @@ -4698,18 +4759,18 @@ msgstr "Nepoznati" msgid "Unknown alert type" msgstr "Nepoznata vrsta obaveštenja" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Nepoznata greška" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "" @@ -4728,7 +4789,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ažuriranje" @@ -4736,11 +4797,11 @@ msgstr "Ažuriranje" msgid "Update %s created for problem %d; by %s" msgstr "Najnovije informacije %s kreirane za problem %d; od strane %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Najnovije informacije ispod dodate anonimno u %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Najnovije informacije ispod dodao %s u %s" @@ -4780,24 +4841,24 @@ msgstr "" msgid "Updated" msgstr "Ažuriran" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Postavio %s na %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Ažuriran!" @@ -4808,7 +4869,7 @@ msgstr "Ažuriran!" msgid "Updates" msgstr "Ažurirane informacije" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4863,28 +4924,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Emejl dodat listi zloupotreba" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-mejl već na listi zloupotreba" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Uklonjena oznaka korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "" @@ -4910,10 +4971,8 @@ msgid "User:" msgstr "Korisnici" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Korisnici" @@ -4961,6 +5020,10 @@ msgstr "Vidi prijave po naselju" msgid "View wards" msgstr "Drugi" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4992,7 +5055,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5054,7 +5117,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Whoa there Testino! Tri fotografije su dovoljne." @@ -5082,17 +5145,15 @@ msgstr "Da li biste voleli da dobijete još jedan upitnik za 4 nedelje, koji će msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pročitati je, kao i ako ne stavite znake interpunkcije." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "Pogrešna lokacija? Samo kliknite ponovo na mapu." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5106,11 +5167,11 @@ msgstr "Pogrešna lokacija? Samo kliknite ponovo na mapu." msgid "Yes" msgstr "Da" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5118,11 +5179,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can make a new report in the same location." msgstr "" @@ -5139,7 +5200,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "" @@ -5161,11 +5222,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5173,7 +5234,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5255,11 +5316,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5268,9 +5329,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5278,9 +5339,7 @@ msgstr "" msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5296,13 +5355,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5311,15 +5370,15 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5340,7 +5399,12 @@ msgstr "" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "No further updates" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5352,8 +5416,8 @@ msgstr "" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5372,13 +5436,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5404,7 +5470,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Ova rupa je tu već dva meseca i…" @@ -5443,6 +5509,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Upiši se ili otvori račun" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5479,12 +5554,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5501,11 +5576,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5521,12 +5596,12 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-mejl već na listi zloupotreba" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Ukloni iz užeg kruga" @@ -5720,8 +5795,34 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "Enter a password" -#~ msgstr "Unesi lozinku" +#~ msgid "No let me sign in by email" +#~ msgstr "Ne dozvolite mi da se priključim e-mejlom" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Ne dozvolite mi da se priključim e-mejlom" + +#~ msgid "Edit other users' details" +#~ msgstr "Izmeni podatke drugih korisnika" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Unesi naziv obližnje ulice ili oblasti" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Držite me upisanim na ovom računaru" + +#~ msgid "Now to submit your report…" +#~ msgstr "Now to submit your report…" + +#~ msgid "Now to submit your update…" +#~ msgstr "Now to submit your update…" + +#~ 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 "Pružanje imena i lozinke je opcionalno, ali će isto dozvoliti da se lakše prijave problemi, daju najnovije informacije i u ravlja vašim prijavama." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Pogrešna lokacija? Samo kliknite ponovo na mapu." #, fuzzy #~ msgid "New" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 57b9e4edc7f..3cb0933f933 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jonatan Nyberg, 2018\n" "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " och " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "(finns inte längre)" msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(valfritt)" @@ -174,9 +174,9 @@ msgstr "(skickat till båda)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(vi har också RSS-flöden för problem inom %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" @@ -208,7 +208,7 @@ msgstr "

Rapporter, statistik och åtgärder för

%s

" msgid " %s reports %s" msgstr " %s rapporter %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "%s sparad." @@ -217,31 +217,22 @@ msgstr "%s sparad." msgid "%s live problems" msgstr "%s aktuella problem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Nej Låt mig bekräfta min rapport via epost" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "Nej Låt mig bekräfta min rapport via epost/SMS" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Nej Låt mig bekräfta uppdateringen via epost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "Nej Låt mig bekräfta min uppdatering via epost/SMS" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Nej Låt mig logga in med min epostadress" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "Nej låt mig logga in via epost eller SMS" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Notera: Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." @@ -250,12 +241,15 @@ msgstr "Notera: Den här rapporten har vidarebefordrats. Ändri msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Notera: Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Ja, jag har ett lösenord" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Sammanfatta problemet" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "Aktivera tvåfaktorsautentisering" @@ -315,9 +309,9 @@ msgstr "Lägg till telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Lägg till i slutlista" @@ -327,16 +321,15 @@ msgstr "Lägg till i slutlista" msgid "Add user" msgstr "Lägg till användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Lägg till eller ta bort problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Lägg till eller ta bort svarsprioriteringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Lägg till eller ta bort svarsmallar" @@ -344,7 +337,7 @@ msgstr "Lägg till eller ta bort svarsmallar" msgid "Added %s" msgstr "Lades till %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Att lägga till den här rapporten i din kortlista tar bort den från kortlistan för %s." @@ -364,7 +357,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Varsko mig om framtida uppdateringar" @@ -431,33 +425,35 @@ msgstr "Hämta alltid alla problem" msgid "An update marked this problem as fixed." msgstr "En uppdatering markerade det här problemet som löst." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "Anonym användare" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Annan användare" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Är du säker på att du vill avbryta den här uppladdningen?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Är du säker?" @@ -494,7 +490,7 @@ msgstr "Tilldela extern förvaltning:" msgid "Assign to subdivision:" msgstr "Tilldela underavdelning:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "Tilldela användare till områden" @@ -527,6 +523,10 @@ msgstr "Autosvar:" msgid "Automated" msgstr "Automatiserad" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Tillgängliga kategorier" @@ -539,12 +539,12 @@ msgstr "Genomsnittlig tid från det att ett problem rapporteras till dess att de msgid "Avoid personal information and vehicle number plates" msgstr "Undvik personlig information och nummerplåtar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Väntar på att granskas" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Tillbaka" @@ -557,10 +557,8 @@ msgid "Ban user" msgstr "Förbjud användare" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -597,7 +595,6 @@ msgid "Can't see the map? Skip this step" msgstr "Kan du inte se kartan? Hoppa över det här steget" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -629,7 +626,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori och tillstånd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori ändrat från ‘%s’ till ‘%s’" @@ -639,6 +636,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -692,7 +690,7 @@ msgstr "Välj ett kategorinamn som å ena sidan är förståeli msgid "Choose another" msgstr "Välj en annan" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "Rensa offline-data" @@ -720,6 +718,10 @@ msgstr "Klicka på länken i vårt bekräftelsemail för att logga in." msgid "Click the link in that email to sign in." msgstr "Klicka på länken i det mejlet för att logga in." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -732,7 +734,7 @@ msgstr "Klicka på länken i det mejlet för att logga in." msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Stängd av kommunen" @@ -762,18 +764,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "Kod" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "Vik ihop karta" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -787,8 +788,7 @@ msgstr "Bekfräfta" msgid "Confirm account" msgstr "Bekräfta konto" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 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." @@ -807,7 +807,7 @@ msgstr "Bekräftelse" msgid "Confirmed" msgstr "Bekräftat" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -818,16 +818,20 @@ msgstr "Bekräftat:" msgid "Contact %s" msgstr "Kontakta %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontakta oss" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakta teamet" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -837,12 +841,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kan inte hitta användaren" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Kunde inte slå upp platsen" @@ -877,6 +881,11 @@ msgstr "Skapa" msgid "Create a report" msgstr "Skapa en rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Logga in eller skapa nytt konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -886,18 +895,15 @@ msgstr "Skapa en kategori" msgid "Create priority" msgstr "Skapa prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "Skapa rapporter/uppdateringar som anonym användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Skapa rapporter/uppdateringar som kommunen" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "Skapa rapporter/uppdateringar på en användares vägnar" @@ -915,7 +921,7 @@ msgstr "Skapad" msgid "Created %d new users" msgstr "Skapade %d nya användare" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -939,7 +945,7 @@ msgstr "För närvarande grupperade efter %s" msgid "Currently no bodies have been created." msgstr "Inga förvaltningar har skapats ännu." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kund ej kontaktbar" @@ -967,6 +973,11 @@ msgstr "Standard" msgid "Default priority" msgstr "Standardprioritet" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Skapa rapporter/uppdateringar som kommunen" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "Defekttyp" @@ -976,7 +987,7 @@ msgstr "Defekttyp" msgid "Delete" msgstr "Borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -988,8 +999,8 @@ msgstr "Ta bort mall" msgid "Deleted" msgstr "Borttagen" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "Beskriv varför du modererar detta" @@ -1005,17 +1016,18 @@ msgstr "Beskrivning" msgid "Description:" msgstr "Beskrivning:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "Detaljerad information är begränsad till %d tecken." #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1047,8 +1059,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "Ta bort ändringar" @@ -1057,11 +1069,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Skicka inte e-postnotifikationer kring hämtade kommentarer till problemrapportens skapare" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "Har du ett lösenord för %s?" @@ -1073,7 +1081,7 @@ msgstr "Vill du automatiskt lyfta en defekt?" msgid "Don’t know" msgstr "Vet ej" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Gillar du inte formulär?" @@ -1081,7 +1089,7 @@ msgstr "Gillar du inte formulär?" msgid "Down one" msgstr "Ner en" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Släpp foton här eller klicka för att ladda upp" @@ -1122,33 +1130,36 @@ msgstr "Ändra" msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Redigera andra användares uppgifter" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Redigera andra användares rättigheter" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "Redigera rapportkategori" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Moderera rapportdetaljer" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "Redigera rapportprioritet" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Redigera rapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "Redigera användarnas detaljer/sök efter deras rapporter" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Dina uppdateringar" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1181,20 +1192,20 @@ msgstr "Redaktör" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Epost" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "E-postadress" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "Epostadress (valfri)" @@ -1206,6 +1217,15 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Klicka på länken i det mejlet för att logga in." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "Epost bekräftad:" @@ -1289,11 +1309,6 @@ msgstr "Skriv in ett Zürich-gatunamn" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Ange ett postnummer eller gatunamn och ort" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Ange ett postnummer eller gatunamn och ort" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1344,11 +1359,11 @@ msgstr "Befintlig kategori" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "Expandera karta" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Förklara felet" @@ -1392,6 +1407,8 @@ msgstr "Ytterligare fält" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Extra data:" @@ -1413,6 +1430,11 @@ msgstr "Misslyckades med att skicka meddelande" msgid "Fields" msgstr "Fält" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1490,17 +1512,22 @@ msgstr "För varje alternativ är Nyckel det värde som är spa msgid "For more information, see How FixMyStreet uses Mapit." msgstr "För mer information, se How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ditt lösenord" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Glömt ditt lösenord?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "Vidarebefordrad till extern förvaltning" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "Vidarebefordrade önskan till extern förvaltning" @@ -1558,7 +1585,7 @@ msgstr "Gå" msgid "Going to send questionnaire?" msgstr "Skicka enkät?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Bevilja tillgång till administratörskontrollpanelen" @@ -1621,7 +1648,7 @@ msgstr "Dolt fält" msgid "Hide all reports and updates" msgstr "Dölj alla rapporter och uppdateringar" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "Dölj hela rapporten" @@ -1644,11 +1671,11 @@ msgstr "Dölj mitt namn i den här rapporten" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Göm kartnålar" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "Dölj uppdatering helt?" @@ -1673,7 +1700,7 @@ msgstr "Hem" msgid "How to report a problem" msgstr "Hur man rapporterar ett problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" @@ -1733,7 +1760,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Om två eller fler förvaltningar delar på ett geografiskt område, kombinerar FixMyStreet identiska kategorier till ett val i menyn. Se till att du använder samma kategorinamn om du vill att det skall hända." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1847,7 +1874,7 @@ msgstr "Inspektera rapport" msgid "Inspection required" msgstr "Inspektion krävs" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "Instruera entreprenörer att lösa problem" @@ -1867,8 +1894,8 @@ msgstr "Inkorrekt värde för agency_responsible, \"%s\"" msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Oglitlig plats. Samma kommun måste ansvara för den nya platsen." @@ -1880,13 +1907,6 @@ msgstr "Det går oftast snabbast att kolla vår FAQ och se om msgid "It’s on its way to the council right now." msgstr "Det är nu på väg till kommunen." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Behåll mig inloggad på den här enheten" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "Nyckel" @@ -1926,6 +1946,7 @@ msgstr "Senaste uppdatering:" msgid "Last update:" msgstr "Senaste uppdatering:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1951,7 +1972,7 @@ msgstr "Lista alla rapporterade problem" msgid "Loading reports…" msgstr "Laddar rapporter..." -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Laddar..." @@ -1977,23 +1998,22 @@ msgstr "Lokala rapporter" msgid "Locate the problem on a map of the area" msgstr "Lokalisera problemet på en karta över området" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Logga in med Facebook" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Logga in med Twitter" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Logga in med e-post" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "Logga in med epost/SMS" @@ -2005,7 +2025,7 @@ msgstr "Logga ut från alla sessioner" msgid "Look up" msgstr "Slå upp" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "KARTA" @@ -2013,7 +2033,7 @@ msgstr "KARTA" msgid "Make anonymous on all reports and updates" msgstr "Gör till anonym på alla rapporter och uppdateringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "Hantera slutlista" @@ -2021,7 +2041,7 @@ msgstr "Hantera slutlista" msgid "Manual order" msgstr "Manuell ordning" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Karta" @@ -2033,11 +2053,11 @@ msgstr "Markera som skickad" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Markera användare som du vill hålla ett öga på som flaggade." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "Lägg till problemdetaljer" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Meddelande" @@ -2057,24 +2077,25 @@ msgstr "Saknade förvaltningar:" msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "Moderera" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "Moderera rapportdetaljer" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "Moderera den här rapporten" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "Moderera den här uppdateringen" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "Modererad av %s %s" @@ -2083,6 +2104,12 @@ msgstr "Modererad av %s %s" msgid "Moderated by division within one working day" msgstr "Granskat av underavdelningen inom en arbetsdag" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +#, fuzzy +msgid "Moderation history" +msgstr "Anledning till moderering:" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2108,9 +2135,9 @@ msgstr "Mest kommenterad" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Namn" @@ -2123,6 +2150,12 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Uppdateringar kan inte innehålla mer än %s tecken. Var vänlig korta ned din uppdatering." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "Navigera till det här problemet" @@ -2191,6 +2224,8 @@ msgid "New note to DM:" msgstr "Ny anteckning till DM:" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Nytt lösenord:" @@ -2276,11 +2311,18 @@ msgstr "Senaste" msgid "Next" msgstr "Nästa" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Nästa" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2293,6 +2335,11 @@ msgstr "Nästa" msgid "No" msgstr "Nej" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Ditt konto" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Inget område" @@ -2301,7 +2348,7 @@ msgstr "Inget område" msgid "No body" msgstr "Ingen förvaltning" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ingen kommun vald" @@ -2334,7 +2381,7 @@ msgstr "Inga inspektioner i det valda datumintervallet." msgid "No reports to show on map, here are some nearby:" msgstr "Det finns inga rapporter att visa på kartan. Här är några närliggande rapporter:" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Inget resultat returnerades" @@ -2408,16 +2455,6 @@ msgstr "Anteckningar från SDM till DM" msgid "Notice" msgstr "Notis" -#: 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:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "För att skicka din uppdatering…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Antalet problem rapporterade för varje kategori, under de senaste sju dagarna." @@ -2426,15 +2463,15 @@ msgstr "Antalet problem rapporterade för varje kategori, under de senaste sju d msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Antalet problem rapporterad i varje kommun, under de senaste sju dagarna." -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "Offline-data rensad" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "Offline-uppdateringsdata sparade" @@ -2486,6 +2523,14 @@ msgstr "Open311 Specifikation" msgid "Options" msgstr "Alternativ" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "Eller prenumerera via RSS" @@ -2494,15 +2539,15 @@ msgstr "Eller prenumerera via RSS" msgid "Order" msgstr "Ordning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2538,15 +2583,13 @@ msgstr "Förälder" msgid "Partial" msgstr "Partiell" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Lösenord (valfritt)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permanent länk" @@ -2564,16 +2607,22 @@ msgid "Phone Reporter:" msgstr "Telefonrapportör:" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Rapporter kan bara innehålla %s tecken. Var vänlig korta ned din rapport" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "Telefonnummer verifierat:" @@ -2584,12 +2633,14 @@ msgstr "Telefonnummer verifierat:" msgid "Phone:" msgstr "Telefonnummer:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2603,7 +2654,7 @@ msgstr "Telefonnummer:" msgid "Photo" msgstr "Foto" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Foto är ett krav." @@ -2611,12 +2662,12 @@ msgstr "Foto är ett krav." msgid "Photo required" msgstr "Foto krävs" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2637,7 +2688,7 @@ msgid "Pick your ward" msgstr "Välj din kommun" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Placera nålen på kartan" @@ -2657,7 +2708,7 @@ msgstr "Vänligen kontrollera lösenordet och prova igen" msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2666,15 +2717,15 @@ msgid "Please check your phone number is correct" msgstr "Kontrollera att ditt telefonnummer är korrekt" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Välj en kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "Välj ett ovanligare lösenord" @@ -2696,12 +2747,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Skriv in ett meddelande" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2709,8 +2760,8 @@ msgstr "Skriv in ett meddelande" msgid "Please enter a mobile number" msgstr "Skriv in ett mobiltelefonnummer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Skriv in ett namn" @@ -2720,22 +2771,22 @@ msgstr "Skriv in namnet på den här förvaltningen" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Skriv in ett lösenord" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Skriv in en giltig epostadress" @@ -2744,13 +2795,13 @@ msgstr "Skriv in en giltig epostadress" msgid "Please enter a valid email address" msgstr "Skriv in en giltig epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "Skriv in en giltig epostadress eller ett giltigt telefonnummer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Skriv några detaljer" @@ -2760,39 +2811,39 @@ msgstr "Skriv några detaljer" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Skriv in din epostadress" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Skriv in ditt förnamn" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Skriv in ditt telefonnummer" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Skriv in ditt efternamn" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Skriv in din titel" @@ -2819,8 +2870,8 @@ msgstr "Generera en tvåfaktorskod och skriv in den nedan:" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frågeformulär" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "Välj ett lösenord som är minst %d tecken långt" @@ -2832,7 +2883,7 @@ msgstr "Observera att uppdateringar inte skickas till kommunen." msgid "Please note your report has not yet been sent." msgstr "Observera att din rapport inte har skickats än." -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Observera att din rapport inte har skickats än. Välj en kategori och ytterligare information nedan. Tryck sedan på skicka." @@ -2846,11 +2897,11 @@ msgstr "Observera att din uppdatering inte har publicerats än. msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "Ange ett dublett-ID eller en offentlig uppdatering för den här rapporten." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten." @@ -2883,15 +2934,15 @@ msgstr "Välj den kategori av rapporter du vill ha" msgid "Please state whether or not the problem has been fixed" msgstr "Ange om problemet har lösts eller ej" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Ladda upp endast en bild" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "Verifiera epostadressen, telefonnumret, eller båda" @@ -2899,9 +2950,7 @@ msgstr "Verifiera epostadressen, telefonnumret, eller båda" msgid "Please write a message" msgstr "Skriv ett meddelande" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Skicka" @@ -2909,19 +2958,19 @@ msgstr "Skicka" msgid "Postcode or street name and area" msgstr "Postnummer eller gatunamn och område" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Postat anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Postat av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Postat av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Postat av %s %s" @@ -2956,14 +3005,10 @@ msgstr "Integritetsskydd och kakor" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "Andra uppgifter" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Rapport" @@ -2986,7 +3031,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2995,7 +3040,6 @@ msgid "Problem state change based on survey results" msgstr "Problemets status ändrats baserat på utredningsresultat" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -3020,7 +3064,7 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" msgid "Problems within %.1fkm of %s" msgstr "Problem inom %.1f km av %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3045,26 +3089,26 @@ msgstr "Problem inom %s, %s" msgid "Property address:" msgstr "Fastighetsadress:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Ge en uppdatering" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "Tillhandahåll uppdatering som" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future 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." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 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." -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "Offentliga uppgifter" @@ -3133,7 +3177,7 @@ msgstr "RSS-flöde för %s, inom område %s" msgid "RSS feed of nearby problems" msgstr "RSS-flöde av närliggande problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3158,7 +3202,7 @@ msgstr "RSS-flöde för uppdateringar till denna rapport" msgid "Receive email when updates are left on this problem." msgstr "Erhåll epost när uppdateringar ges till denna rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "Mottagen av %s kort därefter" @@ -3203,9 +3247,9 @@ msgstr "Ta bort flagga" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Ta bort från slutlista" @@ -3237,14 +3281,14 @@ msgid "Report ID:" msgstr "Rapport-ID:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapportera ett problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3255,14 +3299,14 @@ msgstr "Rapportera ett problem" msgid "Report abuse" msgstr "Rapportera missbruk" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Rapportera ett problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "Rapportera som" @@ -3290,8 +3334,8 @@ msgstr "Rapportera, visa, eller diskutera lokala problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" @@ -3300,8 +3344,8 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -3310,31 +3354,31 @@ msgstr "Rapporterat av %s den %s" msgid "Reported by:" msgstr "Rapporterad av:" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 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:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s av %s den %s" @@ -3345,7 +3389,7 @@ msgstr "Rapporterad:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3354,17 +3398,23 @@ msgstr "Rapportera ett problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 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" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Rapporter kan bara innehålla %s tecken. Var vänlig korta ned din rapport" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Rapporter som väntar på att godkännas" @@ -3385,7 +3435,7 @@ msgstr "Rapporter i närheten av %s skickas till olika förvaltare, beroende på msgid "Reports published" msgstr "Publicerade rapporter" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "Rapporter sparade offline." @@ -3445,20 +3495,20 @@ msgstr "Svarsmallar" msgid "Response Templates for %s" msgstr "Svarsmallar för %s" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "Återgå till orginalrapporten" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "Återgå till orginalstexten" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "Återgå till orginalsammanfattningen" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Rätt plats?" @@ -3470,15 +3520,15 @@ 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:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotera åt vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3489,7 +3539,7 @@ msgstr "Rotera åt höger" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" @@ -3503,8 +3553,8 @@ msgstr "Spara + stäng som dublett" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3519,7 +3569,7 @@ msgid "Save with a public update" msgstr "Spara med en offentlig uppdatering" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "Sparar rapporter offline" @@ -3559,13 +3609,12 @@ msgstr "Inga användare hittades." msgid "Security" msgstr "Säkerhet" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "Se vår integritetsskyddspolicy" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "Se användarinformation för rapporter skapade som kommunen" @@ -3596,7 +3645,7 @@ msgstr "" msgid "Select:" msgstr "Välj:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "Skicka" @@ -3614,11 +3663,11 @@ msgstr "Logga in med e-post" msgid "Sending a confirmation text failed: \"%s\"" msgstr "SMS-bekräftelsetexten kunde inte skickas: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "Skicka tillbaka rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" @@ -3650,9 +3699,9 @@ msgid "Share" msgstr "Dela" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Slutlista" @@ -3660,19 +3709,19 @@ msgstr "Slutlista" msgid "Shortlist all visible" msgstr "Kortlista alla synliga" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Satt på slutlistan" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "Satt på slutlistan av %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "Visa foto?" @@ -3684,7 +3733,7 @@ msgstr "Visa alla uppdateringar" msgid "Show my name publicly" msgstr "Visa mitt namn publikt" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "Visa namn offentligt?" @@ -3698,17 +3747,17 @@ msgstr "Visa alla uppdateringar" msgid "Show older reports" msgstr "Sök bland rapporter" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "Visa foto" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Visa kartnålar" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "Visa rapportörens namn" @@ -3716,20 +3765,20 @@ msgstr "Visa rapportörens namn" msgid "Show reports in your area" msgstr "Visa lokala rapporter" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Logga in" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Sätt ett nytt lösenord och logga in med din e-postadress istället. När du klickar på länken i vårt e-postmeddelande så kommer ditt lösenord att uppdateras." -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "Ange ett nytt lösenord och logga in via epost eller SMS. När du klickar på länken i mejlet eller anger SMS-koden så kommer ditt lösenord att uppdateras." @@ -3738,6 +3787,11 @@ msgstr "Ange ett nytt lösenord och logga in via epost eller SMS. När du klicka msgid "Sign in or create an account" msgstr "Logga in eller skapa nytt konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Ange ett lösenord" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3782,15 +3836,15 @@ msgstr "Koden var inkorrekt." 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Tyvärr kan vi inte hitta den adressen." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "Inloggningen misslyckades. Fyll i formuläret nedan." @@ -3800,7 +3854,7 @@ msgstr "Inloggningen misslyckades. Fyll i formuläret nedan." 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:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen." @@ -3843,13 +3897,13 @@ msgstr "Startdatum" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3868,14 +3922,13 @@ msgid "State:" msgstr "Status:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "Tillstånd" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3905,7 +3958,7 @@ msgstr "Street View" msgid "String" msgstr "Sträng" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "Underkategori" @@ -3913,21 +3966,22 @@ msgstr "Underkategori" msgid "Subdivision/Body" msgstr "Underavdelning/Förvaltning" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Ärende" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Ärende:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Skicka" @@ -3978,8 +4032,7 @@ msgid "Summarise your changes" msgstr "Sammanfatta dina ändringar" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4013,18 +4066,22 @@ msgstr "Superanvändare har rättigheter att utföra samtliga åtgärder msgid "Survey Results" msgstr "Frågeresultat" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "Mall «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Mallar" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -4035,6 +4092,7 @@ msgstr "Version med endast text" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4068,7 +4126,7 @@ msgstr "Tack för att du bifogade ett foto. Vi måste nu lokalisera ditt problem 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 "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporterat ett problem till en kommun tidigare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök igen." @@ -4082,7 +4140,6 @@ msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Det postnummret finns tyvärr inte." @@ -4095,27 +4152,27 @@ msgstr "Problemet har markerats som skickat." msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Rapporten kan inte visas på %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort från FixaMinGata." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 msgid "That user has been logged out." msgstr "Den användaren har loggats ut." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "Den användaren har gjorts anonym i alla rapporter och uppdateringar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "Den användarens personliga information har tagits bort." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "Den användarens rapporter och uppdateringar har dolts." @@ -4255,7 +4312,7 @@ msgstr "" 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" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Den användaren har loggats ut." @@ -4273,7 +4330,7 @@ msgstr "Användarens namn visas offentligt i rapporter som inte msgid "There are no reports to show." msgstr "Det finns inga rapporter att visa." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "Det finns redan en automatiskt svarsmall för denna kategori eller detta tillstånd." @@ -4290,14 +4347,18 @@ msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen se 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/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Det uppstod ett problem med din uppdatering. Försök igen." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "Dina inloggningsuppgifter stämde inte. Om du inte kommer ihåg ditt lösenord, eller inte har ett lösenord, fyll då i ‘Nej’-sektionen av formuläret." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Det uppstod ett problem med din uppdatering. Försök igen." @@ -4305,10 +4366,21 @@ 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:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Det uppstod ett problem med din uppdatering. Se nedan." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +#, fuzzy +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "Dessa kommer att skickas till kommunen, men kommer inte att visas på sajten." + +#: templates/web/base/report/new/councils_text_private.html:3 +#, fuzzy +msgid "These details will never be shown online without your permission." +msgstr "Dessa kommer inte att visas på sajten." + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4334,15 +4406,6 @@ msgstr "Dessa kommer att publiceras offentligt på sajten enligt vår %s and also published online for others to see, in accordance with our privacy policy." msgstr "Dessa kommer att skickas till %s och publiceras offentligt på sajten, enligt vår integritetsskyddspolicy." -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "Dessa kommer att skickas till kommunen, men kommer inte att visas på sajten." - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "Dessa kommer inte att visas på sajten." - #: 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." @@ -4373,10 +4436,10 @@ msgstr "Det här brevet har skickats till flera adresser eftersom rapportören i 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Den här informationen krävs" @@ -4415,7 +4478,7 @@ msgstr "Den här rapporten är en dublett. Lämna uppdateringar på den ursprung #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Den här rapporten väntar på att granskas." @@ -4431,7 +4494,7 @@ msgstr "Det här problemet är markerat som löst" msgid "This report is currently marked as open." msgstr "Den här rapportern är öppen" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Den här rapportern är öppen" @@ -4448,7 +4511,6 @@ msgid "Time spent (in minutes):" msgstr "Nedlagd tid (i minuter):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4532,7 +4594,7 @@ msgstr "Översättningar" msgid "Trusted by bodies:" msgstr "Anförtrodd av kommunen:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "Anförtrodd att skapa rapporter som inte behöver bli inspekterade" @@ -4542,7 +4604,7 @@ msgstr "Anförtrodd:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Försök igen" @@ -4578,7 +4640,7 @@ msgstr "Ta tillbaka förbud" msgid "Unconfirmed" msgstr "Obekräftat" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Okänt" @@ -4586,18 +4648,18 @@ msgstr "Okänt" msgid "Unknown alert type" msgstr "Okänd feltyp" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Okänt fel" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Okänt problemnummer" @@ -4615,7 +4677,7 @@ msgstr "Upp en" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Uppdatering" @@ -4623,11 +4685,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:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Uppdateringen nedan tillagd anonymt %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" @@ -4667,22 +4729,22 @@ msgstr "Uppdaterad status" msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "Uppdaterad av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "Uppdaterad av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Uppdaterad!" @@ -4693,7 +4755,7 @@ msgstr "Uppdaterad!" msgid "Updates" msgstr "Uppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 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." @@ -4747,26 +4809,26 @@ msgstr "Användar-ID att attribuera hämtade kommentarer till" msgid "User Import" msgstr "Användarimport" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "Användaren har lagts till i missbruklistan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "Användaren finns redan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "Användaren finns redan i missbruklistan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Användaren flaggad" @@ -4791,10 +4853,8 @@ msgid "User:" msgstr "Användare:" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Användare" @@ -4840,6 +4900,10 @@ msgstr "Visa rapporter per område" msgid "View wards" msgstr "Andra kommuner" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4870,7 +4934,7 @@ msgstr "Vi hittade mer än en träff för den problemreferensen:" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "Vi har skickat en bekräftelsekod till din telefon. Skriv in den nedan:" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4931,7 +4995,7 @@ msgstr "Vilka problem vill du få information om?" msgid "Which report is it a duplicate of?" msgstr "Vilken rapport är den en dublett av?" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "Du kan som mest ladda upp tre foton." @@ -4959,17 +5023,15 @@ msgstr "Vill du bli påmind om att kolla statusen med ett annat frågeformulär msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Fel plats? Klicka i så fall på kartan igen." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4983,11 +5045,11 @@ msgstr "Fel plats? Klicka i så fall på kartan igen." msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 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/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Du är offline" @@ -4995,11 +5057,11 @@ msgstr "Du är offline" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Du kan se problemet på den här webbplatsen." @@ -5017,7 +5079,7 @@ msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukar msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "Du kan välja att prenumerera på alla problem som rapporteras i detta område, eller baserat på deras mottagare." -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Du kan kontakta teknisk support på %s." @@ -5039,11 +5101,11 @@ msgstr "Du kan hjälpa oss med att hitta kontaktadressen för %s och eposta till msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den skall vara aktiv på sajten." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Du nekade; vänligan fyll i rutan ovan" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "Du har %s sparad att skicka." @@ -5051,7 +5113,7 @@ msgstr "Du har %s sparad att skicka." msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Du har redan svarat på det här frågeformuläret. Om du har en fråga, kontakta oss eller visa problemet.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "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)." @@ -5129,11 +5191,11 @@ msgid "Your account" msgstr "Ditt konto" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din epostadress" @@ -5142,9 +5204,9 @@ msgstr "Din epostadress" msgid "Your email address" msgstr "Din epostadress" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "Din epostadress eller ditt mobiltelefonnummer" @@ -5152,9 +5214,7 @@ msgstr "Din epostadress eller ditt mobiltelefonnummer" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Din information kommer endast att användas i enlighet med vår sekretesspolicy" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ditt namn och efternamn" @@ -5170,13 +5230,13 @@ msgstr "Ditt namn har dolts från alla dina rapporter och uppdateringar." msgid "Your name has been hidden." msgstr "Ditt namn har dolts." -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "Dina offline-rapporter" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ditt lösenord" @@ -5185,15 +5245,15 @@ msgstr "Ditt lösenord" msgid "Your password has been changed" msgstr "Ditt lösenord har ändrats" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "Ditt lösenord måste inkludera %d eller fler tecken." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -5214,7 +5274,12 @@ msgstr "Din slutlista" msgid "Your token has been generated" msgstr "Din token har genererats" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Dina uppdateringar" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "Din uppdatering har blivit sparad offline för att skickas när du kommer tillbaka online." @@ -5226,8 +5291,8 @@ msgstr "Dina uppdateringar" msgid "Your verification code is %s" msgstr "Din verifieringskod är %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "Dig själv" @@ -5245,13 +5310,15 @@ msgid "all" msgstr "samtliga" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "en administratör" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "och en defekt uppförd" @@ -5278,7 +5345,7 @@ msgstr "ex.v. '%s' eller '%s'" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Hål i gatan på Storgatan, nära brevlådan" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 #, fuzzy msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "Detta hål i gatan har varit här i två månader och..." @@ -5317,6 +5384,15 @@ msgstr "inga" msgid "not the council's responsibility" msgstr "inte kommunens ansvar" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Logga in eller skapa nytt konto" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5353,12 +5429,12 @@ msgstr "logga ut" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "kommunen" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5374,11 +5450,11 @@ msgstr "den här typen av problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "uppdatering" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "uppdateringar" @@ -5394,11 +5470,11 @@ msgstr "användaren är från samma kommun som problemet - %d" msgid "user is problem owner" msgstr "användaren är inte problemägare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "användare inte i missbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "användare borttagen från missbruklista" @@ -5568,11 +5644,36 @@ msgid_plural "reports" msgstr[0] "rapport" msgstr[1] "rapporter" -#~ msgid "Enter a password" -#~ msgstr "Ange ett lösenord" +#~ msgid "No let me sign in by email" +#~ msgstr "Nej Låt mig logga in med min epostadress" + +#~ msgid "No let me sign in by email or text" +#~ msgstr "Nej låt mig logga in via epost eller SMS" + +#~ msgid "Edit other users' details" +#~ msgstr "Redigera andra användares uppgifter" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Ange ett postnummer eller gatunamn och ort" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Behåll mig inloggad på den här enheten" + +#~ msgid "Now to submit your report…" +#~ msgstr "För att skicka din rapport…" + +#~ msgid "Now to submit your update…" +#~ msgstr "För att skicka din uppdatering…" + +#~ msgid "Private details" +#~ msgstr "Andra uppgifter" + +#~ 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." -#~ msgid "Moderation reason:" -#~ msgstr "Anledning till moderering:" +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Fel plats? Klicka i så fall på kartan igen." #~ msgid "New" #~ msgstr "Ny" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index 14b2bd9de24..3cfc34e196c 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Zeynep UZER , 2018\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "ve" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -156,7 +156,7 @@ msgstr "(artık mevcut değil)" msgid "(not sent to council)" msgstr "(kurula gönderilmemiş)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(isteğe bağlı)" @@ -175,9 +175,9 @@ msgstr "(her ikisine de gönderildi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(%s problemi için RSS bildirimimiz var)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" @@ -210,7 +210,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -219,31 +219,22 @@ msgstr "" msgid "%s live problems" msgstr "%s güncel problemler" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Hayır E mail yoluyla raporumu onaylamama izin ver" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "No Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Hayır Güncellemelerimi e-posta yoluyla onaylamama izin ver" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Hayır e-posta yoluyla giriş yapmama izin ver" - -#: templates/web/base/auth/general.html:110 -msgid "No let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -252,12 +243,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Evet şifrem var" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Bir problem bildir" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -321,9 +315,9 @@ msgstr "telefon numarası ekle" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "kısa listeye ekle" @@ -333,16 +327,15 @@ msgstr "kısa listeye ekle" msgid "Add user" msgstr "Kullanıcı ekle" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "problem kategorisi ekle/düzenle" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -350,7 +343,7 @@ msgstr "" msgid "Added %s" msgstr "Eklenmiş %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -370,7 +363,8 @@ 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_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Güncellemeleri bildir" @@ -437,33 +431,35 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Bir güncelleştirme sorun giderildi olarak işaretlenmiş. " -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonim" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 msgid "Anonymous user" msgstr "isimsiz kullanıcı" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonim:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "başka kullanıcı" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -500,7 +496,7 @@ msgstr "Dışarıdan bir organ atamak:" msgid "Assign to subdivision:" msgstr "Alt bölüm atamak:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -533,6 +529,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -545,12 +545,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Denetleme bekliyor" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Geri" @@ -563,10 +563,8 @@ msgid "Ban user" msgstr "kullanıcıyı yasakla" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -603,7 +601,6 @@ msgid "Can't see the map? Skip this step" msgstr "Haritayı göremiyor musunuz? Bu adımı atlayın" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -635,7 +632,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -645,6 +642,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -706,7 +704,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -734,6 +732,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -746,7 +748,7 @@ msgstr "" msgid "Closed" msgstr "Kapalı" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Kurul tarafından kapatıldı" @@ -776,18 +778,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" @@ -801,8 +802,7 @@ msgstr "Onayla" msgid "Confirm account" msgstr "Hesabı onayla" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -821,7 +821,7 @@ msgstr "Onay" msgid "Confirmed" msgstr "Onaylandı" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -832,16 +832,20 @@ msgstr "Onaylanmış:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Bize Ulaşın" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Grupla bağlantı kur" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -851,12 +855,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Konuma bakılamadı" @@ -891,6 +895,11 @@ msgstr "" msgid "Create a report" msgstr "Bildiri oluştur" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Giriş yapın ve bir hesap oluşturun " + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -900,18 +909,15 @@ msgstr "Kategori oluştur" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -929,7 +935,7 @@ msgstr "Oluşturuldu" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -954,7 +960,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Şu anda hiçbir organları oluşturulmamıştır." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -982,6 +988,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -991,7 +1001,7 @@ msgstr "" msgid "Delete" msgstr "Silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1003,8 +1013,8 @@ msgstr "" msgid "Deleted" msgstr "Silindi" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1020,17 +1030,18 @@ msgstr "Tanım" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaylar" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1062,8 +1073,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1072,11 +1083,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1088,7 +1095,7 @@ msgstr "" msgid "Don’t know" msgstr "Don’t know" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Şekilleri beğenmediniz mi?" @@ -1096,7 +1103,7 @@ msgstr "Şekilleri beğenmediniz mi?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1137,34 +1144,36 @@ msgstr "Ekle" msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Bölümün detaylarını düzenle" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Bölümün detaylarını düzenle" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Güncellemelerin" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1197,20 +1206,20 @@ msgstr "Editör" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-posta" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 msgid "Email address (optional)" msgstr "" @@ -1222,6 +1231,14 @@ msgstr "E-posta uyarısı oluşturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1307,11 +1324,6 @@ msgstr "Bir Zürich sokak ismi giriniz" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1362,11 +1374,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1408,6 +1420,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "İlave veriler:" @@ -1430,6 +1444,11 @@ msgstr "Mesajınız iletilemedi" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1507,17 +1526,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Daha fazla bilgi için, bakınız FixMyStreet'in Mapit'i nasıl kullandığını." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Şifreniz" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Şifrenizi mi unuttunuz?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1575,7 +1599,7 @@ msgstr "Git" msgid "Going to send questionnaire?" msgstr "Anket gönderecek misiniz?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1640,7 +1664,7 @@ msgstr "Gizli" msgid "Hide all reports and updates" msgstr "Seçilen bildirimler ve kullanıcılar" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1663,11 +1687,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "İğneler gizle" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1692,7 +1716,7 @@ msgstr "Anasayfa" msgid "How to report a problem" msgstr "Bir problem nasıl bildirilir" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Başarılı bildirim nasıl gönderilir" @@ -1752,7 +1776,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1863,7 +1887,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1883,8 +1907,8 @@ msgstr "Geçersiz ajans_sorumlu değer %s" msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiş." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "Geçersiz konum. Aynı konsil tarafından yeni konum girilmeli." @@ -1896,13 +1920,6 @@ msgstr " FAQs'ı kontrol et bu çözüme ulaşmak için en h msgid "It’s on its way to the council right now." msgstr "Kurula iletilmek üzere." -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Bu bilgisayarda oturumu açık tut" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "Anahtar" @@ -1942,6 +1959,7 @@ msgstr "Son güncelleme:" msgid "Last update:" msgstr "Son güncelleme:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1968,7 +1986,7 @@ msgstr "Bildirilmiş problemleri güncelle" msgid "Loading reports…" msgstr "Bildirimlerin" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Yükleniyor..." @@ -1994,23 +2012,22 @@ msgstr "Yerel uyarılar" msgid "Locate the problem on a map of the area" msgstr "Problemin bulunduğu alandaki haritayı bul ve işaretle" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "Facebook ile giriş yap" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "Twitter ile giriş yap" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2022,7 +2039,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "HARİTA" @@ -2031,7 +2048,7 @@ msgstr "HARİTA" msgid "Make anonymous on all reports and updates" msgstr "İsminiz tüm rapor ve güncellemelerde gizlendi." -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2039,7 +2056,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "Harita" @@ -2051,11 +2068,11 @@ msgstr "Gönderildi olarak işaretle" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "İleti" @@ -2075,24 +2092,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Eksik yetki_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2101,6 +2119,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Bir iş gününe bölünmüş bir şekilde yönetilmiştir" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2126,9 +2149,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "İsim" @@ -2141,6 +2164,12 @@ msgstr "İsim" msgid "Name:" msgstr "İsim:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Güncellemeler %s uzunluğunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2207,6 +2236,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2292,11 +2323,18 @@ msgstr "" msgid "Next" msgstr "Sonraki" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Sonraki" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2309,6 +2347,11 @@ msgstr "Sonraki" msgid "No" msgstr "Hayır" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Hesabınız" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2317,7 +2360,7 @@ msgstr "" msgid "No body" msgstr "Birim yok" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Seçilmiş kurul yok" @@ -2350,7 +2393,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Herhangi bir geri dönüş olmamıştır" @@ -2422,16 +2465,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Şimdi bildirimini&hellip kaydet;" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2440,15 +2473,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Tamam" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2500,6 +2533,14 @@ msgstr "Open311 özellikleri" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2508,15 +2549,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2552,15 +2593,13 @@ msgstr "Ebeveyn" msgid "Partial" msgstr "Kısmi" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Şifre (isteğe bağlı)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Permalink" @@ -2578,16 +2617,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefon numarası" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Telefon numarası (isteğe bağlı)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltınız lütfen" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2598,12 +2643,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2617,7 +2664,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "Fotoğraf" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2625,12 +2672,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2651,7 +2698,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Harita üzerine işaretleyin" @@ -2671,7 +2718,7 @@ msgstr "Şifreyi kontrol ediniz ve tekrar deneyiniz" msgid "Please check your email address is correct" msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2680,15 +2727,15 @@ msgid "Please check your phone number is correct" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Kategori seçiniz" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2710,12 +2757,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Mesaj giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2723,8 +2770,8 @@ msgstr "Mesaj giriniz" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2734,22 +2781,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Şifre giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Geçerli e-posta giriniz" @@ -2758,13 +2805,13 @@ msgstr "Geçerli e-posta giriniz" msgid "Please enter a valid email address" msgstr "Geçerli e-posta adresi giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" @@ -2774,39 +2821,39 @@ msgstr "Lütfen bir kaç ayrıntı giriniz" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "E-posta giriniz" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Ad giriniz" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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 "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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Lütfen telefon numaranızı gririniz" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Soyad giriniz" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Konu başlığı giriniz" @@ -2833,8 +2880,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Başka bir anket doldurmak istediğinizi belirtiniz." -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2846,7 +2893,7 @@ msgstr "Güncellemeler kurula gönderilmemiştir." msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Bildiriminiz henüz gönderilmemiştir. Bir kategori seçiniz ve ayrıntılı bilgi ekleyiniz, sonra kaydediniz." @@ -2860,11 +2907,11 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2897,15 +2944,15 @@ msgstr "İstediğiniz bir bildiri şekli secin" msgid "Please state whether or not the problem has been fixed" msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lütfen" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2913,9 +2960,7 @@ msgstr "" msgid "Please write a message" msgstr "Mesaj gönderin" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Paylaş" @@ -2924,19 +2969,19 @@ msgstr "Paylaş" msgid "Postcode or street name and area" msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "%s Anonim olarak gönderildi" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Tarafından paylaşıldı %s saat %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "%s (%s) tarafından %s 'te paylaşılmıştır" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "%s tarafından %s 'te paylaşılmıştır" @@ -2971,14 +3016,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Özel" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Sorun" @@ -3001,7 +3042,7 @@ msgstr "Problem %s kurula gönderildi %s" msgid "Problem breakdown by state" msgstr "Sorun devlet tarafından meydana gelmiştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem çözülmemiş olarak işaretlenmiştir." @@ -3010,7 +3051,6 @@ msgid "Problem state change based on survey results" msgstr "Araştırma sonucu göz önünde bulundurularak problemin durumundaki değişim" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Sorunlar" @@ -3035,7 +3075,7 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3060,26 +3100,26 @@ msgstr "" msgid "Property address:" msgstr "Emlak adresi:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Güncellemeye izin ver" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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 "İ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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +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/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." 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/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3148,7 +3188,7 @@ msgstr "%s içinde %s gözetimiyle RSS besleme" msgid "RSS feed of nearby problems" msgstr "Civardaki problemlerle alakalı RSS besleme" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3173,7 +3213,7 @@ msgstr "Bu problemin güncellemelerini RSS olarak besle" msgid "Receive email when updates are left on this problem." msgstr "Bu sorunda herhangi bir güncelleme olduğunda e-posta ile bildir." -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3218,9 +3258,9 @@ msgstr "İşareti kaldır" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3252,14 +3292,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Bir problem bildir" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3270,14 +3310,14 @@ msgstr "Bir problem bildir" msgid "Report abuse" msgstr "Kötüye kullanım bildir" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Bir problem bildir" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3305,8 +3345,8 @@ msgstr "Yerel problemleri bildir, göster ve tartış" msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "%s 'e ananim olarak bildirilmiş" @@ -3315,8 +3355,8 @@ msgstr "%s 'e ananim olarak bildirilmiş" msgid "Reported before" msgstr "Önceden bildirilmiş" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "%s tarafından %s de bildirilmiştir" @@ -3325,31 +3365,31 @@ msgstr "%s tarafından %s de bildirilmiştir" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "%s kategorisine bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "%s kategorisine anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "%s yoluyla %s tarafından %s da bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar" @@ -3360,7 +3400,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3369,17 +3409,23 @@ msgstr "Bir problemin bildirilmesi" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Bildirimler" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltınız lütfen" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +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 "Onay bekleyen bildirimler" @@ -3400,7 +3446,7 @@ msgstr "" msgid "Reports published" msgstr "Yayınlanmış bildirimler" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3460,20 +3506,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Doğru yer mi?" @@ -3485,15 +3531,15 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Sola Yerleştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3504,7 +3550,7 @@ msgstr "Sağa Yerleştir" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Uydu" @@ -3518,8 +3564,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3534,7 +3580,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3574,13 +3620,12 @@ msgstr "Arama sonucu kullanıcı bulunamadı" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3611,7 +3656,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3628,11 +3673,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "%s %s sonra gönder" @@ -3665,9 +3710,9 @@ msgid "Share" msgstr "Paylaş" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3675,19 +3720,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3699,7 +3744,7 @@ msgstr "" msgid "Show my name publicly" msgstr "İsmimi açıkça göster " -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3712,17 +3757,17 @@ msgstr "" msgid "Show older reports" msgstr "Bildirimleri ara" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "İşaretlemeleri göster" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3730,20 +3775,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Giriş yap" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3752,6 +3797,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Giriş yapın ve bir hesap oluşturun " +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Şifre gir" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3794,15 +3844,15 @@ 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:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Üzgünüz, konum bulunamadı." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3812,7 +3862,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "Üzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3855,13 +3905,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Devlet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3880,14 +3930,13 @@ msgid "State:" msgstr "Devlet:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3917,7 +3966,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 msgid "Subcategory" msgstr "" @@ -3925,21 +3974,22 @@ msgstr "" msgid "Subdivision/Body" msgstr "Alt bölüm/Bölüm" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Konu" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Konu:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Kaydet" @@ -3990,8 +4040,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4025,18 +4074,22 @@ msgstr "" msgid "Survey Results" msgstr "Anket Sonuçları" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Metin" @@ -4047,6 +4100,7 @@ msgstr "Salt metin sürümü " #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4080,7 +4134,7 @@ msgstr "Resim yüklediğiniz için teşekkür ederiz. Şİmsi sorunu konumlandı 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 "Teşekkürler, sorunun hallolduğuna sevindim. Bu sorunu daha önce herhangi bir birime bildirmiş miydiniz?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bu şekilde resim doğru yüklemiş gibi görünmüyor (%s), lütfen tekrar deneyin." @@ -4094,7 +4148,6 @@ msgstr "Konum İngiltere'de görünmüyor; lütfen tekrar deneyin." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Üzgünüz, bu posta kodu bulunamadı." @@ -4107,29 +4160,29 @@ msgstr "Problem gönderildi olarak işaretlenmiştir." msgid "That problem will now be resent." msgstr "Bu problem yeniden gönderilecektir." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Bu bildirim %s 'te görüntülenemiyor" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 #, fuzzy msgid "That user has been made anonymous on all reports and updates." msgstr "İsminiz tüm rapor ve güncellemelerde gizlendi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4269,7 +4322,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Kullanıcı sorunu harşta üzerinde konumlandıramadı ama onların girdiği bölgenin etrafındaki konumları görmek için." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." @@ -4287,7 +4340,7 @@ msgstr "Kullanıcının ismi anonim o msgid "There are no reports to show." msgstr "Gösterilecek hiçbir rapor yok." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4304,14 +4357,18 @@ msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar msgid "There was a problem with your email/password combination. Please try again." msgstr "E-posta / şifrenizde bir sorun oluştu. Lütfen tekrar deneyiniz." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." @@ -4319,10 +4376,19 @@ msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." msgid "There were problems with your report. Please see below." msgstr "Bildiriminiz esnasında hata oluştu. Lütfen aşağıya bakınız." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Güncellemede bir hata oluştu. Lütfen aşağıya bakınız." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4347,15 +4413,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "Bu API uygulaması çalıştırılma aşamadındadır ve henüz stabilize edilmemiştir." @@ -4386,10 +4443,10 @@ msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta proble 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 "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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Bu bilgi gereklidir" @@ -4428,7 +4485,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Bu rapor işlenmeyi bekliyor." @@ -4444,7 +4501,7 @@ msgstr "Bu rapor şu an onarıldı olarak işaretlenmiş." msgid "This report is currently marked as open." msgstr "Bu rapor şu an açık olarak işaretlenmiş." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Bu rapor şu an açık olarak işaretlenmiş." @@ -4461,7 +4518,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zaman çizelgesi" @@ -4545,7 +4601,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4555,7 +4611,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Tekrar dene" @@ -4591,7 +4647,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Onaylanmamış" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Bilinmeyen" @@ -4599,18 +4655,18 @@ msgstr "Bilinmeyen" msgid "Unknown alert type" msgstr "Bilinmeyen uyarı tipi" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Bilinmeyen hata" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" @@ -4629,7 +4685,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Güncelleme" @@ -4637,11 +4693,11 @@ msgstr "Güncelleme" msgid "Update %s created for problem %d; by %s" msgstr " %d problem için %s tarafından oluşturulmuş %s güncelle" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Aşağıdaki anonim olarak %s 'e ekleneni güncelle" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Aşağıda %s tarafıdan %s 'e ekleneni güncelle" @@ -4681,22 +4737,22 @@ msgstr "Güncelleme durumu" msgid "Updated" msgstr "Güncellendi" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Güncellendi!" @@ -4707,7 +4763,7 @@ msgstr "Güncellendi!" msgid "Updates" msgstr "Güncellemeler" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Güncellemeler %s uzunluğunda karakter ile sınırlıdır. Lütfen güncellemenizi kısaltın." @@ -4763,26 +4819,26 @@ msgstr "" msgid "User Import" msgstr "%s rapor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Kullanıcı etiketlendi" @@ -4806,10 +4862,8 @@ msgid "User:" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Kullanıcılar" @@ -4855,6 +4909,10 @@ msgstr "Semte göre bildirimleri görüntüle" msgid "View wards" msgstr "Semte göre bildirimleri görüntüle" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4885,7 +4943,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4946,7 +5004,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4974,17 +5032,15 @@ msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatm msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." 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 -msgid "Wrong location? Just click again on the map." -msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın." - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -4998,11 +5054,11 @@ msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın." msgid "Yes" msgstr "Evet" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Bu problem bildirimini gereksiz bir şekilde yönetildiği için şikayet ediyorsun:" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "Çevrimdışısınız" @@ -5010,11 +5066,11 @@ msgstr "Çevrimdışısınız" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: " -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren güncellemeleri bildiriyorsun: " -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Problemi bu site üzerinde görüntüleyebilir siniz." @@ -5032,7 +5088,7 @@ msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlene msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Teknik destek için %s iletişime geçebilirsiniz." @@ -5056,11 +5112,11 @@ msgstr "Lokal problemler için bize iletişim kurabileceğimiz e-posta adresi bu msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Eğer bir bölümü sitede aktif olarak bulunsun istemiyorsanız, silindi olarak işaretleyebilir siniz." -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5068,7 +5124,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "Bu anketi doldurdunuz. Eğer bir sorunuz var ise, lütfen iletişime geçin, veya problemini sun.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5146,11 +5202,11 @@ msgid "Your account" msgstr "Hesabınız" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-posta adresiniz" @@ -5159,9 +5215,9 @@ msgstr "E-posta adresiniz" msgid "Your email address" msgstr "E-posta adresin" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "E-postanız ya da cep telefonunuz" @@ -5169,9 +5225,7 @@ msgstr "E-postanız ya da cep telefonunuz" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Bilgileriniz sadece bizim gizlilik politikası uyumluluğu çerçevesinde kullanılacaktır" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Adınız" @@ -5187,13 +5241,13 @@ msgstr "İsminiz tüm rapor ve güncellemelerde gizlendi." msgid "Your name has been hidden." msgstr "İsminiz gizlendi." -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "Çevrimdışı raporlarınız" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Şifreniz" @@ -5202,15 +5256,15 @@ msgstr "Şifreniz" msgid "Your password has been changed" msgstr "Şifren değiştirildi" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Telefon numaran" @@ -5231,7 +5285,12 @@ msgstr "Kısa listeniz" msgid "Your token has been generated" msgstr "" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Güncellemelerin" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5243,8 +5302,8 @@ msgstr "Güncellemelerin" msgid "Your verification code is %s" msgstr "onay kodunuz %s" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5263,13 +5322,15 @@ msgid "all" msgstr "tümü" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5296,7 +5357,7 @@ msgstr "ör. ‘%s’ veya ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Örnek Cd. üzerinde, posta kutusunun yakınında 10 inç çukur" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5334,6 +5395,15 @@ msgstr "hiçbiri" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Giriş yapın ve bir hesap oluşturun " + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5370,12 +5440,12 @@ msgstr "çıkış yap" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "ilgili yerel kurul " #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 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" @@ -5391,11 +5461,11 @@ msgstr "bu tip lokal problem" msgid "today" msgstr "bugün" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "güncelleme" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "güncellemeler" @@ -5411,11 +5481,11 @@ msgstr "kullanıcının problemi - %d kuruldaki problemle aynı" msgid "user is problem owner" msgstr "kullanıcı problemin sahibi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 msgid "user removed from abuse list" msgstr "" @@ -5585,8 +5655,28 @@ msgid_plural "reports" msgstr[0] "raporlar" msgstr[1] "raporlar" -#~ msgid "Enter a password" -#~ msgstr "Şifre gir" +#~ msgid "No let me sign in by email" +#~ msgstr "Hayır e-posta yoluyla giriş yapmama izin ver" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "Bölümün detaylarını düzenle" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Bu bilgisayarda oturumu açık tut" + +#~ msgid "Now to submit your report…" +#~ msgstr "Şimdi bildirimini&hellip kaydet;" + +#~ 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 "İ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." + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın." #~ msgid "Password:" #~ msgstr "Şifre:" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 5daa9cdb1e8..6d90d02b492 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "і" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(вибірково)" @@ -177,9 +177,9 @@ msgstr "(відправлено обидвом)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" @@ -212,7 +212,7 @@ msgstr "" msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -221,34 +221,24 @@ msgstr "" msgid "%s live problems" msgstr "%s актуальні проблеми" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr "Ні Я підтверджу сповіщення е-mail" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr "Ні Я підтверджу сповіщення е-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr "Ні Я підтверджу поновлення е-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr "Ні Я підтверджу поновлення е-mail" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr "Ні я залогінюсь через е-mail" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr "Ні я залогінюсь через е-mail" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -257,12 +247,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "Так В мене є пароль" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Сповістити про проблему" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -325,9 +318,9 @@ msgstr "(відсутній номер телефону)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "Додати до переліку" @@ -337,16 +330,15 @@ msgstr "Додати до переліку" msgid "Add user" msgstr "Додати користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "Додати/редагувати категорію" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "Додати/редагувати пріоритет відповіді" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "Додати/редагувати шаблон відповіді" @@ -354,7 +346,7 @@ msgstr "Додати/редагувати шаблон відповіді" msgid "Added %s" msgstr "Додано %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -374,7 +366,8 @@ msgstr "Сповіщення %d створено для %s, type %s, парам msgid "Alert %d disabled (created %s)" msgstr "Сповіщення %d відключено (створено %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Повідомляти мене про оновлення" @@ -442,34 +435,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Оновлення відмітило цю проблему як вирішену." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Анонім" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Анонім" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Анонім:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "Інші користувачі" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "Ви впевнені, що хочете скасувати завантаження?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Ви впевнені?" @@ -506,7 +501,7 @@ msgstr "Назначити зовнішньому відділу:" msgid "Assign to subdivision:" msgstr "Назначити підрозділу:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -540,6 +535,10 @@ msgstr "Автоматична відповідь:" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "Доступні категорії" @@ -552,12 +551,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "Уникайте особистої інформації та номерних знаків транспортних засобів" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Очікує перевірки модератором" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "Назад" @@ -571,10 +570,8 @@ msgid "Ban user" msgstr "Відмітьте користувача" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -611,7 +608,6 @@ msgid "Can't see the map? Skip this step" msgstr "Не бачите мапу? Пропустіть цей крок" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -644,7 +640,7 @@ msgstr "Категорія" msgid "Category and State" msgstr "Категорія" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Категорія змінена з ‘%s’ на ‘%s’" @@ -654,6 +650,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "В цій категорії проблеми не вирішуються > 4 тижнів" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -709,7 +706,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -738,6 +735,10 @@ msgstr "Натисніть на посилання в надісланому е msgid "Click the link in that email to sign in." msgstr "Натисніть на посилання в надісланому електронному лісті, щоб увійти." +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -750,7 +751,7 @@ msgstr "Натисніть на посилання в надісланому е msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "Закрито муніципалітетом" @@ -780,18 +781,17 @@ msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфігурація" @@ -805,8 +805,7 @@ msgstr "Підтвердити" msgid "Confirm account" msgstr "Підтвердити запис" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -825,7 +824,7 @@ msgstr "Підтвердження" msgid "Confirmed" msgstr "Підтверджено" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -836,16 +835,20 @@ msgstr "Підтверджені:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Зворотній звязок" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Звернутись до команди" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -855,12 +858,12 @@ msgstr "" msgid "Coordinates:" msgstr "Координати:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Не вдалось знайти користувача" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "Не вдалось встановити локацію" @@ -896,6 +899,11 @@ msgstr "Створено" msgid "Create a report" msgstr "Створити сповіщення" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Увійти або створити обліковий запис" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -905,19 +913,16 @@ msgstr "Створити категорію" msgid "Create priority" msgstr "Створити приоритет" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Створити звіт/оновлення для ради" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "Створити звіт/оновлення для ради" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -935,7 +940,7 @@ msgstr "Створено" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -961,7 +966,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "Наразі жодних органів не було створено" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -990,6 +995,11 @@ msgstr "" msgid "Default priority" msgstr "Створити приоритет" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#, fuzzy +msgid "Default to creating reports/updates as the council" +msgstr "Створити звіт/оновлення для ради" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -999,7 +1009,7 @@ msgstr "" msgid "Delete" msgstr "Видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1011,8 +1021,8 @@ msgstr "Видалити шаблон" msgid "Deleted" msgstr "Видалено" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1028,17 +1038,18 @@ msgstr "Опис" msgid "Description:" msgstr "Опис:" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Подробиці" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1070,8 +1081,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1080,11 +1091,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Не відправляти листи автору про нові коментарі" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1096,7 +1103,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знаю" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "Не любите форми?" @@ -1104,7 +1111,7 @@ msgstr "Не любите форми?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "Перетягніть фотографії сюди чи натисніть для завантаження" @@ -1145,33 +1152,36 @@ msgstr "Редагувати" msgid "Edit body details" msgstr "Редагувати дані про орган" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -msgid "Edit other users' details" -msgstr "Редагувати інші подробиці про користувача" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "Редагувати права користувача" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Редагувати дані про орган" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "Редагувати звіт" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Ваші поновлення" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1204,20 +1214,20 @@ msgstr "Редактор" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Е-пошта" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "Адреса електронної пошти" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "Адреса електронної пошти" @@ -1230,6 +1240,15 @@ msgstr "Email оповіщення створено" msgid "Email alert deleted" msgstr "Email Оповіщення видалено" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "Натисніть на посилання в надісланому електронному лісті, щоб увійти." + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1307,11 +1326,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "Вкажіть поштовий код UK або назву вулиці та місця" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Вкажіть поштовий код UK або назву вулиці та місця" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1362,11 +1376,11 @@ msgstr "Категорії існують" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "Поясніть чому неправильно" @@ -1409,6 +1423,8 @@ msgstr "Подробиці" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "Додаткові дані:" @@ -1431,6 +1447,11 @@ msgstr "Не вдалося надіслати повідомлення" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1508,17 +1529,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For more information, see How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Ваш пароль" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "Забули пароль?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1576,7 +1602,7 @@ msgstr "Вперед" msgid "Going to send questionnaire?" msgstr "Збираєтесь відправити опитувальник?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "Надання адміністративного доступу" @@ -1644,7 +1670,7 @@ msgstr "Прихований" msgid "Hide all reports and updates" msgstr "Відмічені звіти та користувачі" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1667,11 +1693,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Приховати привязки" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1696,7 +1722,7 @@ msgstr "Домашня" msgid "How to report a problem" msgstr "Як сповістити про проблему" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "Як надіслати якісне сповіщення" @@ -1760,7 +1786,7 @@ msgstr "" "Якщо два чи більше органи обслуговують певний регіон, сервіс сполучає ідентичні категорії в один запис\n" " в меню. Переконайтесь, що ви використовуєте однакові назви категорій якщо хочете, щоб це сталось." -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1871,7 +1897,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1891,8 +1917,8 @@ msgstr "Невірне значення agency_responsible %s" msgid "Invalid format %s specified." msgstr "Невірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1904,13 +1930,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Запам'ятати мене на цьому комп'ютері" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1950,6 +1969,7 @@ msgstr "Останнє поновлення:" msgid "Last update:" msgstr "Останнє поновлення:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1976,7 +1996,7 @@ msgstr "Показати всі прозвітовані проблеми" msgid "Loading reports…" msgstr "Редагувати звіт" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Завантаження..." @@ -2002,23 +2022,22 @@ msgstr "Локальні сповіщення" msgid "Locate the problem on a map of the area" msgstr "Позначте проблему на карті району" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2030,7 +2049,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "Мапа" @@ -2038,7 +2057,7 @@ msgstr "Мапа" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2046,7 +2065,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2058,11 +2077,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Позначте користувачів, чию поведінку ви хочете відстежувати прапорцем." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "Повідомлення" @@ -2082,24 +2101,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Бракує jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2108,6 +2128,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "Модерується підрозділом на протязі робочого дня" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2133,9 +2158,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Ім'я" @@ -2148,6 +2173,12 @@ msgstr "Ім'я" msgid "Name:" msgstr "Ім'я:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст." + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2217,6 +2248,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "Новий пароль:" @@ -2303,11 +2336,18 @@ msgstr "" msgid "Next" msgstr "Далі" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Далі" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2320,6 +2360,11 @@ msgstr "Далі" msgid "No" msgstr "Ні" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Підтвердити запис" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2328,7 +2373,7 @@ msgstr "" msgid "No body" msgstr "Без органу" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Не вибраний департамент" @@ -2361,7 +2406,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "Ніякого результату не повернено" @@ -2433,16 +2478,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "Тепер відправити ваше сповіщення …" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "Тепер щоб відправити ваше поновлення…" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2451,15 +2486,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "Гаразд" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2512,6 +2547,14 @@ msgstr "" msgid "Options" msgstr "додатково" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2520,15 +2563,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2565,15 +2608,13 @@ msgstr "Предок" msgid "Partial" msgstr "Частково" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "Пароль (опціонально)" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "Постійне посилання" @@ -2591,16 +2632,22 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Номер телефону" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "Номер телефону (опціонально)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення." + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2611,12 +2658,14 @@ msgstr "" msgid "Phone:" msgstr "Телефон:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2630,7 +2679,7 @@ msgstr "Телефон:" msgid "Photo" msgstr "Фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "Фото обов'язкове." @@ -2638,12 +2687,12 @@ msgstr "Фото обов'язкове." msgid "Photo required" msgstr "Потрібне фото" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2664,7 +2713,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "Розмістіть шпильку на карті" @@ -2684,7 +2733,7 @@ msgstr "Будь ласка перевірте пароль і спробуйт msgid "Please check your email address is correct" msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2694,15 +2743,15 @@ msgid "Please check your phone number is correct" msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Будь ласка оберіть категорію" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2724,12 +2773,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "Будь ласка не використовуйте образи — ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Будь ласка введіть повідомлення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2738,8 +2787,8 @@ msgstr "Будь ласка введіть повідомлення" msgid "Please enter a mobile number" msgstr "Будь ласка введіть номер телефону" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "Будь ласка, введіть ім'я " @@ -2749,22 +2798,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Будь ласка введіть пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Будь ласка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Будь ласка введіть правильну адресу е-пошти" @@ -2773,14 +2822,14 @@ msgstr "Будь ласка введіть правильну адресу е-п msgid "Please enter a valid email address" msgstr "Будь ласка введіть правильну адресу е-пошти" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Будь ласка введіть номер телефону" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Будь ласка додайте трохи подробиць" @@ -2790,39 +2839,39 @@ msgstr "Будь ласка додайте трохи подробиць" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Будь ласка вкажіть е-пошту" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "Будь ласка введіть ім'я" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Будь ласка введіть ім'я" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "Будь ласка введіть номер телефону" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "Будь ласка введіть прізвище" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "Будь ласка вкажіть заголовок" @@ -2849,8 +2898,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь ласка вкажіть чи ви хочете отримати інші опитування." -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,7 +2911,7 @@ msgstr "Будь ласка зауважте що оновлення не над msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "Будь ласка заауважте, що сповіщення ще не було надіслано. Оберіть категорію та іншу інформацію нижче, і надішліть." @@ -2876,12 +2925,12 @@ msgstr "" msgid "Please note:" msgstr "Будь ласка зауважте:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Будь ласка, оприлюдніть оновлений звіт." -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "Будь ласка, оприлюдніть оновлений звіт." @@ -2914,15 +2963,15 @@ msgstr "Будь ласка оберіть тип бажаних алярмів" msgid "Please state whether or not the problem has been fixed" msgstr "Будь ласка вкажіть чи була вирішена проблема" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "Будь ласка, завантажте тільки зображення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2930,9 +2979,7 @@ msgstr "" msgid "Please write a message" msgstr "Будь ласка напишіть повідомлення" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Допис" @@ -2941,19 +2988,19 @@ msgstr "Допис" msgid "Postcode or street name and area" msgstr "Введіть найближчу поштову адресу, або назву вулиці чи району" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Опубліковано анонімно в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Опубліковано %s в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "Опубліковано %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "Опубліковано %s в %s" @@ -2988,14 +3035,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Приватний" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Проблема" @@ -3018,7 +3061,7 @@ msgstr "Проблему %s надіслано департаменту %s" msgid "Problem breakdown by state" msgstr "Розбивка проблем по стану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -3027,7 +3070,6 @@ msgid "Problem state change based on survey results" msgstr "Стан проблеми змінено базуючись на результатах опитувань" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблеми" @@ -3054,7 +3096,7 @@ msgstr "Нещодавно вирішені проблеми" msgid "Problems within %.1fkm of %s" msgstr "Проблеми в радіусі %.1fkm від цієї точки" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3080,26 +3122,26 @@ msgstr "" msgid "Property address:" msgstr "Адреса майна:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Надішліть оновлення" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Вказання паролю не обов'язкове, проте це дозволить вам більш легко сповіщати про проблеми, залишати поновлення та керувати вашими сповіщеннями" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3168,7 +3210,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3193,7 +3235,7 @@ msgstr "RSS стрічка з оновленнями по цій проблем msgid "Receive email when updates are left on this problem." msgstr "Отримувати листа коли інформація по проблемі буде оновлена" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3240,9 +3282,9 @@ msgstr "Зняти прапорець" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "Видалити з переліку" @@ -3274,14 +3316,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Сповістити про проблему" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3292,14 +3334,14 @@ msgstr "Сповістити про проблему" msgid "Report abuse" msgstr "Поскаржитись" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Сповістити про проблему" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3327,8 +3369,8 @@ msgstr "Сповіщайте, переглядайте, або обговорю msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" @@ -3337,8 +3379,8 @@ msgstr "Сповіщено анонімно по %s" msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" @@ -3347,31 +3389,31 @@ msgstr "Перевідкрито %s о %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" @@ -3382,7 +3424,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3391,17 +3433,23 @@ msgstr "Сповістити про проблему" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Сповіщення" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення." +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення." + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "Сповіщення очікують підтвердження" @@ -3423,7 +3471,7 @@ msgstr "" msgid "Reports published" msgstr "Сповіщення опубліковано" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3486,20 +3534,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "Те місце?" @@ -3511,15 +3559,15 @@ msgstr "Обслуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3530,7 +3578,7 @@ msgstr "Повернути вправо" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3544,8 +3592,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3560,7 +3608,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3600,13 +3648,12 @@ msgstr "Пошук не знайшов користувачів." msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3637,7 +3684,7 @@ msgstr "" msgid "Select:" msgstr "Оберіть:" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3654,11 +3701,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" @@ -3691,9 +3738,9 @@ msgid "Share" msgstr "Поширити" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "Перелік" @@ -3701,19 +3748,19 @@ msgstr "Перелік" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3725,7 +3772,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Показувати моє ім'я публічно" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3739,17 +3786,17 @@ msgstr "Показувати старі" msgid "Show older reports" msgstr "Пошук сповіщень" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Показувати шпильки" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3757,20 +3804,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Увійти" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3779,6 +3826,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Увійти або створити обліковий запис" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Введіть пароль" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3821,15 +3873,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Вибачте, сталася помилка" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Вибачте, ми не знайшли це місце" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3839,7 +3891,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "Вибачте, ми не можем розпізнати це місце. Спробуйте пізніше." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3883,13 +3935,13 @@ msgstr "Початкова дата:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Стан" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3909,15 +3961,14 @@ msgid "State:" msgstr "Стан:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Стан" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3947,7 +3998,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Підкатегорія: %s" @@ -3956,21 +4007,22 @@ msgstr "Підкатегорія: %s" msgid "Subdivision/Body" msgstr "Підрозділ/Орган" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Підтвердити" @@ -4022,8 +4074,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4058,18 +4109,22 @@ msgstr "" msgid "Survey Results" msgstr "Результати опитування" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "Шаблони" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -4080,6 +4135,7 @@ msgstr "Лише текстова версія" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4113,7 +4169,7 @@ msgstr "Дякуємо за надіслане фото. Тепер нам по 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 "Дякуєм, раді чути, що проблему вирішено! Можемо ми поцікавитись чи сповіщали ви органи про будь-яку проблему раніше?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Під час завантаження фото трапилась помилка(%s), будь ласка повторіть" @@ -4127,7 +4183,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." @@ -4140,28 +4195,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "Цей сповіщення неможливо показати на %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Це сповіщення було видалено." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Це сповіщення було видалено." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4305,7 +4360,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Користувач не зміг позначити проблему на карті, тільки введену зону" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Це сповіщення було видалено." @@ -4325,7 +4380,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4342,15 +4397,19 @@ msgstr "Сталась помилка при спробі показати ст msgid "There was a problem with your email/password combination. Please try again." msgstr "Сталась проблема з вашою комбінацією адреси пошти і паролю. Будь ласка спробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "З комбінацією поштової адреси і паролю щось не так. Якщо ви не в змозі пригадати пароль або у вас його немає, заповніть секцію ‘увійти поштою’" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз." @@ -4358,10 +4417,19 @@ msgstr "Сталась проблема з поновленням. Будь ла msgid "There were problems with your report. Please see below." msgstr "Зі сповіщенням є негаразди. Гляньте нижче." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "З поновленням щось негаразд. Гляньте нижче." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4386,15 +4454,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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 "" @@ -4425,10 +4484,10 @@ msgstr "" 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ця інформація обов'язкова" @@ -4467,7 +4526,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Це сповіщення очікує модерації." @@ -4483,7 +4542,7 @@ msgstr "Це сповіщення наразі відмічено вирішен msgid "This report is currently marked as open." msgstr "Це сповіщення відмічено відкритим." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Це сповіщення відмічено відкритим." @@ -4500,7 +4559,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Хронологія" @@ -4584,7 +4642,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4594,7 +4652,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "Спробуйте ще раз" @@ -4630,7 +4688,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Не підтверджено" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "Невідомо" @@ -4638,18 +4696,18 @@ msgstr "Невідомо" msgid "Unknown alert type" msgstr "Невідомий тип алярму" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "Невідома помилка" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Невідомий ідентифікатор проблеми" @@ -4668,7 +4726,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Поновлення" @@ -4676,11 +4734,11 @@ msgstr "Поновлення" msgid "Update %s created for problem %d; by %s" msgstr "Поновлення %s створено для проблеми %d; від %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Поновлення додано анонімно о %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Поновлення нижче додано %s о %s" @@ -4720,24 +4778,24 @@ msgstr "Поновити статуси" msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Опубліковано %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "Опубліковано %s в %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Поновлено!" @@ -4748,7 +4806,7 @@ msgstr "Поновлено!" msgid "Updates" msgstr "Поновлення" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст." @@ -4803,28 +4861,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "Пошта занесена в чорний список" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "Адреса вже в чорному списку" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Користувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Користувач відмічений" @@ -4850,10 +4908,8 @@ msgid "User:" msgstr "Користувачі" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Користувачі" @@ -4901,6 +4957,10 @@ msgstr "Переглянути сповіщення по району" msgid "View wards" msgstr "інші зони:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4932,7 +4992,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4994,7 +5054,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5022,17 +5082,15 @@ msgstr "Хочете отримати ще іншу анкету за 4 тижн 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 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5046,11 +5104,11 @@ msgstr "" msgid "Yes" msgstr "Так" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5058,11 +5116,11 @@ msgstr "" 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:22 +#: templates/web/base/contact/index.html:25 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:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "Ви можете переглянути проблему на цьому сайті." @@ -5080,7 +5138,7 @@ msgstr "You can add an abusive user's email to the abuse list, which automatical msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "Технічна підтримка доступна за адресою %s" @@ -5102,11 +5160,11 @@ msgstr "" msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "Ви відхилили. Будь ласка заповніть форму вище" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5114,7 +5172,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5199,11 +5257,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваша пошта" @@ -5212,9 +5270,9 @@ msgstr "Ваша пошта" msgid "Your email address" msgstr "Ваша адреса е-пошти" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "Ваша адреса е-пошти" @@ -5223,9 +5281,7 @@ msgstr "Ваша адреса е-пошти" msgid "Your information will only be used in accordance with our privacy policy" msgstr "Ваша інформація буде використана згідно політики конфіденційності" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "Ваше ім'я" @@ -5241,13 +5297,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "Ваш пароль" @@ -5256,15 +5312,15 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль було змінено" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "Ваш телефон" @@ -5286,7 +5342,12 @@ msgstr "Ваш перелік" msgid "Your token has been generated" msgstr "Ваш пароль було змінено" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Ваші поновлення" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5298,8 +5359,8 @@ msgstr "Ваші поновлення" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5317,13 +5378,15 @@ msgid "all" msgstr "всі" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5350,7 +5413,7 @@ msgstr "наприклад ‘%s’ чи ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "Вибоїна 30 см на вул. Зеленій біля пошти." -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5389,6 +5452,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "позначено як не відповідальність ради" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "Увійти або створити обліковий запис" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5425,12 +5497,12 @@ msgstr "вийти" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "місцевий орган" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "шпильки немає так як користувач не використав мапу" @@ -5447,11 +5519,11 @@ msgstr "цей тип локальної проблеми" msgid "today" msgstr "сьогодні" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5467,12 +5539,12 @@ msgstr "користувач з тієї ж ради що й проблема - msgid "user is problem owner" msgstr "користувач є власником проблеми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "Адреса вже в чорному списку" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "Видалити з переліку" @@ -5689,8 +5761,31 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#~ msgid "Enter a password" -#~ msgstr "Введіть пароль" +#~ msgid "No let me sign in by email" +#~ msgstr "Ні я залогінюсь через е-mail" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr "Ні я залогінюсь через е-mail" + +#~ msgid "Edit other users' details" +#~ msgstr "Редагувати інші подробиці про користувача" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Вкажіть поштовий код UK або назву вулиці та місця" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Запам'ятати мене на цьому комп'ютері" + +#~ msgid "Now to submit your report…" +#~ msgstr "Тепер відправити ваше сповіщення …" + +#~ msgid "Now to submit your update…" +#~ msgstr "Тепер щоб відправити ваше поновлення…" + +#~ 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 "Вказання імені і паролю не обов'язкове, проте це дозволить вам більш легко сповіщати про проблеми, залишати поновлення та керувати вашими сповіщеннями" #~ msgid "Password:" #~ msgstr "Пароль:" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 6d200d66179..faf7fbaafbe 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "與" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -164,7 +164,7 @@ msgstr "" msgid "(not sent to council)" msgstr "不要向地方政府送出" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(任選)" @@ -184,9 +184,9 @@ msgstr "兩個都送出" msgid "(we also have RSS feeds for problems within %s)" msgstr "在 %s 內之問題RSS 訂閱" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "選擇分類" @@ -222,7 +222,7 @@ msgstr "" msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "%s saved." msgstr "" @@ -231,34 +231,24 @@ msgstr "" msgid "%s live problems" msgstr "%s 現場問題" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "No Let me confirm my report by email" msgstr " 我要利用電子郵件確認我的申報 " -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, fuzzy msgid "No Let me confirm my report by email/text" msgstr " 我要利用電子郵件確認我的申報 " -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "No Let me confirm my update by email" msgstr " 我要用電子郵件收到更新通知" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "No Let me confirm my update by email/text" msgstr " 我要用電子郵件收到更新通知" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "No let me sign in by email" -msgstr " 我要用電子郵件登入" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "No let me sign in by email or text" -msgstr " 我要用電子郵件登入" - #: templates/web/base/report/_inspect.html:197 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -267,12 +257,15 @@ msgstr "" msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "Yes I have a password" msgstr " 我有密碼" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "申報問題" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -339,9 +332,9 @@ msgstr "(沒有電話號碼)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -351,16 +344,15 @@ msgstr "" msgid "Add user" msgstr "新增使用者" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -368,7 +360,7 @@ msgstr "" msgid "Added %s" msgstr "新增 %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -388,7 +380,8 @@ msgstr "%s創建之 %d通知, 種類 %s, 參數 %s / %s" msgid "Alert %d disabled (created %s)" msgstr "%d 關閉通知 " -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "通知我此事後續" @@ -456,34 +449,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "本問題已解決之更新標註" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "匿名" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "匿名" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "匿名:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -520,7 +515,7 @@ msgstr "分派給外部機:" msgid "Assign to subdivision:" msgstr "交派給下級單位:" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -554,6 +549,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -566,12 +565,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "待核可" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "回上層" @@ -585,10 +584,8 @@ msgid "Ban user" msgstr "標記警告用戶" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -625,7 +622,6 @@ msgid "Can't see the map? Skip this step" msgstr "無法顯示地圖? 略過本步驟" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -658,7 +654,7 @@ msgstr "類別" msgid "Category and State" msgstr "類別" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -668,6 +664,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -728,7 +725,7 @@ msgstr "選擇民眾可理解的類別 (例如., \"路面坑 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -757,6 +754,10 @@ msgstr "選擇確認電子郵件上的連結以作登入" msgid "Click the link in that email to sign in." msgstr "選擇確認電子郵件上的連結以作登入" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -769,7 +770,7 @@ msgstr "選擇確認電子郵件上的連結以作登入" msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "由地方政府關閉" @@ -799,18 +800,17 @@ msgid "Cobrand:" msgstr "聯合品牌:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "設定" @@ -824,8 +824,7 @@ msgstr "確認" msgid "Confirm account" msgstr "確認帳戶" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -844,7 +843,7 @@ msgstr "確認" msgid "Confirmed" msgstr "已確認" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -855,16 +854,20 @@ msgstr "已確認:" msgid "Contact %s" msgstr "聯絡 %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "連絡我們" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "連結本團隊" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -874,12 +877,12 @@ msgstr "" msgid "Coordinates:" msgstr "協同單位:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "找不到該戶用" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "找不到此地點" @@ -915,6 +918,11 @@ msgstr "建立" msgid "Create a report" msgstr "創建申報" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "登入或新建帳戶" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -924,18 +932,15 @@ msgstr "創建類別" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -953,7 +958,7 @@ msgstr "建立" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -979,7 +984,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "目前未創建內文" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "無法聨絡上的客戶" @@ -1007,6 +1012,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1016,7 +1025,7 @@ msgstr "" msgid "Delete" msgstr "刪除" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1028,8 +1037,8 @@ msgstr "刪除模版" msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1045,17 +1054,18 @@ msgstr "描述" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "細節" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1087,8 +1097,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1097,11 +1107,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "您是否有 %s密碼? " @@ -1113,7 +1119,7 @@ msgstr "" msgid "Don’t know" msgstr "不知道" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "不喜歡此表單?" @@ -1121,7 +1127,7 @@ msgstr "不喜歡此表單?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or click to upload" msgstr "" @@ -1165,34 +1171,36 @@ msgstr "編輯" msgid "Edit body details" msgstr "編輯有關單位細節" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "編輯有關單位細節" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "編輯有關單位細節" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "更新" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1225,20 +1233,20 @@ msgstr "編輯器" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "電子郵件" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "密碼(任選):" @@ -1251,6 +1259,15 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "取消電郵通知" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "選擇確認電子郵件上的連結以作登入" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1337,11 +1354,6 @@ msgstr "輸入街道名稱 " msgid "Enter a nearby UK postcode, or street name and area" msgstr "輸入本區的郵編,街名或區域。" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "輸入本區的郵編,街名或區域。" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1392,11 +1404,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1439,6 +1451,8 @@ msgstr "其它資料:" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "其它資料:" @@ -1461,6 +1475,11 @@ msgstr "無法送出留言" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1538,17 +1557,22 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "更多資訊,請詳見如何使用 FixMyStreet 地圖標記(英文)" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "密碼" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "忘記您的密碼?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "轉寄給外部機構" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "轉寄願望給外部機構" @@ -1606,7 +1630,7 @@ msgstr "走" msgid "Going to send questionnaire?" msgstr "即將送出問卷?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1674,7 +1698,7 @@ msgstr "隱藏" msgid "Hide all reports and updates" msgstr "標記警告申報與用戶" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1697,11 +1721,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "隱藏地圖標示" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1726,7 +1750,7 @@ msgstr "首頁" msgid "How to report a problem" msgstr "如何申報問題 " -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "如何成功地送出申報" @@ -1791,7 +1815,7 @@ msgstr "" "\n" "如果你想這樣,請確保你在有關單位中使用同一類別。" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1918,7 +1942,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1938,8 +1962,8 @@ msgstr "無效的權責單位數值 %s" msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1951,13 +1975,6 @@ msgstr "最快方式是 先查看問答集 ,看看答案是 msgid "It’s on its way to the council right now." msgstr "正呈送給地方政府中" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "新增類別承辦人" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1997,6 +2014,7 @@ msgstr "上回更新:" msgid "Last update:" msgstr "上一次更新:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2023,7 +2041,7 @@ msgstr "列出所有申報的問題 " msgid "Loading reports…" msgstr "完結之申報 " -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "載入中...." @@ -2049,23 +2067,22 @@ msgstr "當地問題 " msgid "Locate the problem on a map of the area" msgstr "在地圖上標記問題之區域" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2077,7 +2094,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "地圖" @@ -2085,7 +2102,7 @@ msgstr "地圖" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2093,7 +2110,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "地圖" @@ -2105,11 +2122,11 @@ msgstr "標註為關閉" msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "標註用戶哪些行為您將要給予警告標記." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "留言" @@ -2129,24 +2146,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2155,6 +2173,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "一個工作天內協調出部門" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2180,9 +2203,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "名字" @@ -2195,6 +2218,12 @@ msgstr "名字" msgid "Name:" msgstr "名字:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "更新內容有 %s 字數限制,請簡化您的更新。" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2264,6 +2293,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2350,11 +2381,18 @@ msgstr "" msgid "Next" msgstr "下一步" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "下一步" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2367,6 +2405,11 @@ msgstr "下一步" msgid "No" msgstr "無" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "確認帳戶" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2375,7 +2418,7 @@ msgstr "" msgid "No body" msgstr "無有關單位" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "未選擇地方政府" @@ -2408,7 +2451,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "查無結果" @@ -2486,16 +2529,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "現在送出您的申報 …" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "現在送出您更新的申報 … 您是否有本站帳密?" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2504,15 +2537,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "好了" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2564,6 +2597,14 @@ msgstr "Open311 規範 " msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or search for a different location" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2572,15 +2613,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2617,15 +2658,13 @@ msgstr "上級 " msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "密碼(任選):" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "永久連結" @@ -2644,16 +2683,22 @@ msgid "Phone Reporter:" msgstr "已申報 %s" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "電話號碼" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "電話號碼(非必填)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "申請內容有 %s 字數限制,請簡化您的申報。" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2665,12 +2710,14 @@ msgstr "已申報 %s" msgid "Phone:" msgstr "電話" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2684,7 +2731,7 @@ msgstr "電話" msgid "Photo" msgstr "照片" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "要求提供照片" @@ -2692,12 +2739,12 @@ msgstr "要求提供照片" msgid "Photo required" msgstr "要求提供照片" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2718,7 +2765,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "在地圖上作標記" @@ -2738,7 +2785,7 @@ msgstr "請再次確認您的密碼" msgid "Please check your email address is correct" msgstr "請確認您電郵地址無誤" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2748,15 +2795,15 @@ msgid "Please check your phone number is correct" msgstr "請確認您電郵地址無誤" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "請選擇類別" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2781,12 +2828,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "請勿濫用本服務,濫用將造成您的政府輕視其它使用者之意見 " #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2795,8 +2842,8 @@ msgstr "請寫下您的留言" msgid "Please enter a mobile number" msgstr "請輸入您的電話號碼" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2806,22 +2853,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "請輸入密碼" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "請輸入有效電子郵件" @@ -2830,14 +2877,14 @@ msgstr "請輸入有效電子郵件" msgid "Please enter a valid email address" msgstr "請輸入有效的電子郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "請輸入您的電話號碼" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "請填寫進一步細節" @@ -2847,39 +2894,39 @@ msgstr "請填寫進一步細節" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "請輸入您的電子郵件" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "請輸入您的大名" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "請輸入您的姓氐" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "請輸入您的電話號碼" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "請輸入您的別名" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "請輸入您的稱呼" @@ -2906,8 +2953,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "請選擇您是否願意收到其它問卷" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2919,7 +2966,7 @@ msgstr "請注意這個更新不會送到地方政府" msgid "Please note your report has not yet been sent." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has not yet been sent. Choose a category and add further information below, then submit." msgstr "請注意您的申報還未送出. 選擇合適類別及進一步資訊,再予送出。" @@ -2933,12 +2980,12 @@ msgstr "" msgid "Please note:" msgstr "請加註記" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "如果您是再次申報,請說明原因" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2971,15 +3018,15 @@ msgstr "請選擇更新通知方式" msgid "Please state whether or not the problem has been fixed" msgstr "請敍明該問題是否已解決" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2987,9 +3034,7 @@ msgstr "" msgid "Please write a message" msgstr "諘寫下您的留言" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "張貼" @@ -2998,19 +3043,19 @@ msgstr "張貼" msgid "Postcode or street name and area" msgstr "輸入本區的郵編,街名或區域。" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "匿名張貼 %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "由 %s 在 %s 張貼" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by %s (%s) at %s" msgstr "由%s (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by %s at %s" msgstr "由%s 在%s" @@ -3045,14 +3090,10 @@ msgstr "隱私與cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "私人" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "問題" @@ -3075,7 +3116,7 @@ msgstr "%s 問題已送達到地方政府 %s " msgid "Problem breakdown by state" msgstr "本站出現故障問題 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "問題標註為開放" @@ -3084,7 +3125,6 @@ msgid "Problem state change based on survey results" msgstr "依調查結果呈現的問題改善" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "問題" @@ -3111,7 +3151,7 @@ msgstr "FixMyStreet 最近回報的已修復問題 " msgid "Problems within %.1fkm of %s" msgstr "該地點 %.1f公里內的問題 " -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3137,26 +3177,26 @@ msgstr "在 %s, %s的問題 " msgid "Property address:" msgstr "公物地址:" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "提供更新資訊" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a 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/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3225,7 +3265,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3250,7 +3290,7 @@ msgstr "最近當地問題更新的RSS訂閱" msgid "Receive email when updates are left on this problem." msgstr "透過電子郵件收取該問題之更新消息" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3297,9 +3337,9 @@ msgstr "移除標記" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3331,14 +3371,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "申報問題" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3349,14 +3389,14 @@ msgstr "申報問題" msgid "Report abuse" msgstr "申報濫用" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "申報問題" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3384,8 +3424,8 @@ msgstr "申報,檢視,或討論在地問題" msgid "Report, view, or discuss local problems" msgstr "申報,檢視,或討論在地問題" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "在%s 匿名申報 " @@ -3394,8 +3434,8 @@ msgstr "在%s 匿名申報 " msgid "Reported before" msgstr "之前的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "由%s 的 %s 申報" @@ -3404,31 +3444,31 @@ msgstr "由%s 的 %s 申報" msgid "Reported by:" msgstr "由  申報" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "%s 種類之申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿名申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "%s 透過 %s 在 %s類別的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "透過 %s 在 %s類別的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " @@ -3439,7 +3479,7 @@ msgstr "已申報 %s" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3448,17 +3488,23 @@ msgstr "申報問題" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "申報" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "申請內容有 %s 字數限制,請簡化您的申報。" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "申請內容有 %s 字數限制,請簡化您的申報。" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "待核實之申報" @@ -3480,7 +3526,7 @@ msgstr "" msgid "Reports published" msgstr "己公開之申報" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3543,20 +3589,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "%s的回應模版" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "正確地點?" @@ -3568,15 +3614,15 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "左轉 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3587,7 +3633,7 @@ msgstr "右轉 " msgid "Rotating this photo will discard unsaved changes to the report." msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "衛星" @@ -3601,8 +3647,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3617,7 +3663,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3657,13 +3703,12 @@ msgstr "查無此用戶" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3694,7 +3739,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3711,11 +3756,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "送回申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "%s 稍後送給%s" @@ -3748,9 +3793,9 @@ msgid "Share" msgstr "分享" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3758,19 +3803,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3782,7 +3827,7 @@ msgstr "" msgid "Show my name publicly" msgstr "公開我的姓名" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3796,17 +3841,17 @@ msgstr "顯示舊文" msgid "Show older reports" msgstr "搜尋申報" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3814,20 +3859,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "登入" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3836,6 +3881,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "登入或新建帳戶" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "請輸入密碼" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3882,15 +3932,15 @@ msgstr "抱歉這個wasn’t 為有效的網址連結" msgid "Sorry, there has been an error confirming your problem." msgstr "抱歉無法確認你的問題" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "抱歉,我們無法找到此位置" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3900,7 +3950,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "抱歉,我們無法解析此地點,請重試一次" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "抱歉,我們無法儲存你的照片,請重試一次" @@ -3944,13 +3994,13 @@ msgstr "問始日:" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "陳述" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3970,15 +4020,14 @@ msgid "State:" msgstr "陳述:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "陳述" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4008,7 +4057,7 @@ msgstr "街景圖" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "子類別:%s" @@ -4017,21 +4066,22 @@ msgstr "子類別:%s" msgid "Subdivision/Body" msgstr "下屬單位/機關" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "主旨" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "主旨:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "送出" @@ -4083,8 +4133,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4119,18 +4168,22 @@ msgstr "" msgid "Survey Results" msgstr "調查結果" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "模版 «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "模版" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "內文" @@ -4141,6 +4194,7 @@ msgstr "文字版" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4174,7 +4228,7 @@ msgstr "感謝上傳照片,現在需要知道問題的地點位置,請在上 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 "謝謝,很高興知道此問題己修復了。請問您過去是否曾申報過問題? " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 " @@ -4188,7 +4242,6 @@ msgstr "這地點似乎不在台灣; 請再試 一次。" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "抱歉此郵遞區號無法辨識" @@ -4201,28 +4254,28 @@ msgstr "問題被標註為送出" msgid "That problem will now be resent." msgstr "此問題將重新送出" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "此申報無法在 %s上檢視 " -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "該申報已遭FixMyStreet 移除 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "該申報已遭FixMyStreet 移除 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4372,7 +4425,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "用戶無法在地點上標示問題,但可以看到他們輸入的地點" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "該申報已遭FixMyStreet 移除 " @@ -4392,7 +4445,7 @@ msgstr "" msgid "There are no reports to show." msgstr "沒有申報可顯示" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4409,15 +4462,19 @@ msgstr "本頁出現錯誤,請再試一次" msgid "There was a problem with your email/password combination. Please try again." msgstr "您的電子郵件/密碼不符,請重試一次" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "您的申報有問題,請重試一次" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, fuzzy msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "您的電子郵件與密碼不相符,如果您遺忘密碼或尚未註冊,請在申請表單上填入電子郵件" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "您的申報有問題,請重試一次" @@ -4425,10 +4482,19 @@ msgstr "您的申報有問題,請重試一次" msgid "There were problems with your report. Please see below." msgstr "您的申報有問題,請見下方說明" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "您的更新有問題,請見下方說明" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4457,15 +4523,6 @@ msgstr "" msgid "These will be sent to %s and also published online for others to see, in accordance with our privacy policy." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: 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執行正在安裝中尚未完全,未來將作無預警的更動" @@ -4502,10 +4559,10 @@ msgstr "當用戶沒有選擇類別時,電子郵件將送到負責該區域的 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:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "本項資訊必填" @@ -4544,7 +4601,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "此問題尚待審核" @@ -4560,7 +4617,7 @@ msgstr "該申報目前注記為解決狀態" msgid "This report is currently marked as open." msgstr "該申報目前注記為開放狀態" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "該申報目前注記為開放狀態" @@ -4577,7 +4634,6 @@ msgid "Time spent (in minutes):" msgstr "花費時間(以分鐘計):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -4661,7 +4717,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4671,7 +4727,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "再試一次" @@ -4707,7 +4763,7 @@ msgstr "" msgid "Unconfirmed" msgstr "未確認的" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "未知的" @@ -4715,18 +4771,18 @@ msgstr "未知的" msgid "Unknown alert type" msgstr "未知的通知類別" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "未知的錯誤" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "未知的問題編號  " @@ -4745,7 +4801,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "更新" @@ -4753,11 +4809,11 @@ msgstr "更新" msgid "Update %s created for problem %d; by %s" msgstr "由%s 更新%s 申報之問題%s  " -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "下方更新 為匿名提供%s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "由%d 在 %s 所提供的更新" @@ -4797,24 +4853,24 @@ msgstr "更新之狀態" msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "由%s (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by %s at %s" msgstr "由%s 在%s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "已更新!" @@ -4825,7 +4881,7 @@ msgstr "已更新!" msgid "Updates" msgstr "更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "更新內容有 %s 字數限制,請簡化您的更新。" @@ -4880,28 +4936,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "電子郵件列入濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "電子郵件己在濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "移除用戶的標記警告" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "給用戶標記警告" @@ -4927,10 +4983,8 @@ msgid "User:" msgstr "使用者" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "使用者" @@ -4978,6 +5032,10 @@ msgstr "檢視里/區之申報 " msgid "View wards" msgstr "其它地區:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5009,7 +5067,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -5071,7 +5129,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5099,17 +5157,15 @@ msgstr "您是否願意4週後再收到另一份問卷?以提醒您確認最 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 -msgid "Wrong location? Just click again on the map." -msgstr "錯誤的地? 請再次點擊此地圖" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: 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:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5123,11 +5179,11 @@ msgstr "錯誤的地? 請再次點擊此地圖" msgid "Yes" msgstr "是" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "你申訴此問題遭不必要之和諧 " -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5135,11 +5191,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "您檢舉下列問題的申報遭到濫用,包含個人資料或相關問題 " -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "您檢舉下列問題之更為濫用,包括個人資料或相似" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can make a new report in the same location." msgstr "您可在本站上檢視問題." @@ -5157,7 +5213,7 @@ msgstr "您可以新增某位用戶到濫用者名單,它會自動隱藏(不 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on %s" msgstr "您可寫信給%s詢求技術支援。" @@ -5182,11 +5238,11 @@ msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件,把 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "您可以刪除某一單位如果不想讓它在本站激活" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "您受到拒絕,請填寫上方表格。" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have %s saved to submit." msgstr "" @@ -5194,7 +5250,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" msgstr "您已回覆過本問卷。如果您有問題,請保持聯絡, 或是檢視 您作的申報\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)" @@ -5279,11 +5335,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "您的電子郵件" @@ -5292,9 +5348,9 @@ msgstr "您的電子郵件" msgid "Your email address" msgstr "您的電子郵件" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "您的電子郵件" @@ -5303,9 +5359,7 @@ msgstr "您的電子郵件" msgid "Your information will only be used in accordance with our privacy policy" msgstr "您的個人資料,將會依照本站隱私權政策作處理使用" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "姓名" @@ -5321,13 +5375,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "密碼" @@ -5336,15 +5390,15 @@ msgstr "密碼" msgid "Your password has been changed" msgstr "密碼已更新" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "電話號碼" @@ -5366,7 +5420,12 @@ msgstr "" msgid "Your token has been generated" msgstr "密碼已更新" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "更新" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5378,8 +5437,8 @@ msgstr "更新" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5398,13 +5457,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5430,7 +5491,7 @@ msgstr "例如 ‘%s’ 或 ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5469,6 +5530,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "標註為非本區政府職責範圍" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or create an account" +msgstr "登入或新建帳戶" + +#: templates/web/base/auth/create.html:13 +msgid "or sign in" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5505,12 +5575,12 @@ msgstr "登出" msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "當地地府" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "地圖上無標記,用戶未使用地圖" @@ -5527,11 +5597,11 @@ msgstr "此類在地問題" msgid "today" msgstr "今天" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5547,12 +5617,12 @@ msgstr "用戶來同一問題的地方政府- %d" msgid "user is problem owner" msgstr "%d 天數" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "電子郵件己在濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "電子郵件列入濫發名單" @@ -5700,8 +5770,35 @@ msgid "report" msgid_plural "reports" msgstr[0] "" -#~ msgid "Enter a password" -#~ msgstr "請輸入密碼" +#~ msgid "No let me sign in by email" +#~ msgstr " 我要用電子郵件登入" + +#, fuzzy +#~ msgid "No let me sign in by email or text" +#~ msgstr " 我要用電子郵件登入" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "編輯有關單位細節" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "輸入本區的郵編,街名或區域。" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "新增類別承辦人" + +#~ msgid "Now to submit your report…" +#~ msgstr "現在送出您的申報 …" + +#~ msgid "Now to submit your update…" +#~ msgstr "現在送出您更新的申報 … 您是否有本站帳密?" + +#~ 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 "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。  " + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "錯誤的地? 請再次點擊此地圖" #~ msgid "Password:" #~ msgstr "密碼:" diff --git a/templates/web/zurich/auth/general.html b/templates/web/zurich/auth/general.html index 29fff2600c8..0f82e8f4784 100644 --- a/templates/web/zurich/auth/general.html +++ b/templates/web/zurich/auth/general.html @@ -31,7 +31,7 @@

[% loc('Sign in') %]

-

[% loc('No let me sign in by email') %]

+

Neu Registrieren