From 7123594ac13e6a0f232d0074dbbe7b2c91389aa8 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 15 Apr 2020 11:53:22 +0100 Subject: Version 3.0.1. --- CHANGELOG.md | 46 +- README.md | 2 +- bin/site-specific-install.sh | 2 +- docs/_posts/2020-05-06-v3.0.1.md | 68 ++ locale/FixMyStreet.po | 154 ++--- locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 909 +++++++++++++------------- locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 399 +++++------ locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po | 238 +++---- locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 652 ++++++------------ locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po | 195 +++--- 40 files changed, 4229 insertions(+), 4286 deletions(-) create mode 100644 docs/_posts/2020-05-06-v3.0.1.md diff --git a/CHANGELOG.md b/CHANGELOG.md index ad53ca547..4382c7bc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,32 +1,48 @@ ## Releases * Unreleased + +* v3.0.1 (6th May 2020) + - New features: + - Provide access to staff-only categories in admin. #2925 #2958 + - Allow anonymous updating if anonymous reporting enabled. - Admin improvements: - - order unsent reports by confirmed date + - Order unsent reports by confirmed date. #2911 - Disable staff private tickbox on new reports if category is private. #2961 - - Move stats from main admin index to stats index. - - Speed up dashboard export and report search. + - Move stats from main admin index to stats index. #2982 + - Speed up dashboard export and report search. #2988 - Allow a template to be an initial update on reports. #2973 - - Bugfixes + - Bugfixes: - Application user in Docker container can't install packages. #2914 - Look at all categories when sending reports. - - Provide access to staff-only categories in admin. + - Fixes the To header when sending emails about inactive accounts. #2935 + - Recent reports, use same query regardless of cache. #2926 #2999 + - Match body construction on Around with New setup. + - Only one duplicate call in progress at once. #2941 + - Stop double escape in Google Maps URL. + - Refactor/stop double escape in report nav link. #2956 - Maintain group on pin move with same category in multiple groups. #2962 - Remove unnecessary margin-right on #postcodeForm. #3010 - Fix sorting by most commented on /around map view. #3013 - Development improvements: - - Refactor Script::Report into an object. - - Move summary failures to a separate script. - - Add script to export/import body data. - - Add fetch script that does combined job of fetch-comments and fetch-reports. - - Show error page when submitting with web param to /import. - - Add a daemon option for sending reports and updates. - - Update Getopt::Long::Descriptive to stop warning. + - Refactor Script::Report into an object. #2927 + - Move summary failures to a separate script. #2927 + - Add generic import categories from JSON script. + - Add script to export/import body data. #2905 + - Add fetch script that does combined job of fetch-comments and fetch-reports. #2689 + - Allow fetch script to parallelize fetching. #2689 + - Do all retry timeout or skip checks in database. #2947 + - Show error page when submitting with web param to /import. #2233 + - Add a daemon option for sending reports and updates. #2924 + - Update Getopt::Long::Descriptive to stop warning. #3003 - Open311 improvements: - - match response templates on external status code over state - - Add flag to protect category/group names from Open311 overwrite. + - Allow save/drop of row extra during sending. #2788 + - Match response templates on external status code over state. #2921 + - Add flag to protect category/group names from Open311 overwrite. #2986 + - Documentation: + - Remove part about restricting access to /admin. #2937 - UK: - - Added junction lookup, so you can search for things like "M60, Junction 2" + - Added junction lookup, so you can search for things like "M60, Junction 2". #2918 * v3.0 (4th March 2020) - Security: diff --git a/README.md b/README.md index 2218737ee..48ce92860 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 3.0; see CHANGELOG.md for a version history. +Platform is now at version 3.0.1; see CHANGELOG.md for a version history. ## Installation diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 20e0eb813..af52dbdbc 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:-v3.0} +VERSION=${VERSION_OVERRIDE:-v3.0.1} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/docs/_posts/2020-05-06-v3.0.1.md b/docs/_posts/2020-05-06-v3.0.1.md new file mode 100644 index 000000000..0ac1e6304 --- /dev/null +++ b/docs/_posts/2020-05-06-v3.0.1.md @@ -0,0 +1,68 @@ +--- +layout: post +title: Version 3.0.1 +author: matthew +--- + +
+
+ +First of all, I hope you are all safe wherever you may be. We held a couple of +FixMyStreet user groups recently for body users of FixMyStreet in the UK, and +someone from a large body said that their FixMyStreet installation was proving +really useful in these times, as they were making far fewer internal reports +due to the UK lockdown. + +Admist all this, we continue to develop the software, and today are releasing +**version 3.0.1**, a bugfix release with a couple of new features. + +### Admin improvements + +You can now provide an automatic initial update on reports made in a particular +category to a particular body, perhaps to provide information on timings or +similar. Make sure the body has a user to associate comments with, and then add +a response template in the Open state with auto-response checked, restricted to +a list of categories if you wish. After that, the template will be used to +provide an initial update on new reports made. + +We have also added "staff-only" categories, which are categories that staff +users can see but normal users cannot. One council is using this to provide +emergency categories that their contact centre staff can use to make reports +after manual triage. + +The dashboard export and report search should now be quicker, after some +investigation that area. We've also moved the overall stats off the index page +to the stats page, so the index page loads more quickly. + +### Bugfixes + +Thanks to those of you letting us know about bugs or problems. Those we have +fixed include an incorrect To header on emails about inactive accounts, a +couple of issues with the front page recent reports list showing different +results depending on whether the cache was used or not, and a double escape in +the Google Maps URL. + +Others we have fixed include maintaining the category group on pin move with +same category in multiple groups, and fixing sorting by most commented on +the `/around` map view. + +### Development improvements + +As well as the cron scripts, this release now includes a dæmon that you +can use to send reports and updates. Using the dæmon will mean reports +and updates are sent almost immediately after they are confirmed, but will +require a bit more setup, as you'll need to set it up as a dæmon running +all the time in your system. We've provided an example config file for systemd +to hopefully help with that. If you do run the dæmon, be sure to remove +the lines of your crontab that send reports and updates :) + +Alongside that, `send-reports` no longer prints out failures in verbose mode, +there is a separate `send-reports-failure-summary` script to do that. Also the +fetch-comments and fetch-reports scripts have been consolidated into one +`fetch` script, which can also now parallelize fetching. + +### Upgrading + +A full list of changes can be seen in the +[changelog](https://github.com/mysociety/fixmystreet/releases/tag/v3.0.1) as usual. + diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 1a7551107..2f9446010 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: 2020-03-03 15:29+0000\n" +"POT-Creation-Date: 2020-05-06 13:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716 perllib/FixMyStreet/Script/Reports.pm:174 +#: perllib/FixMyStreet/DB/Result/Problem.pm:714 perllib/FixMyStreet/DB/Result/Problem.pm:716 perllib/FixMyStreet/Queue/Item/Report.pm:194 msgid " and " msgstr "" @@ -156,7 +156,7 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 perllib/FixMyStreet/App/Controller/Report/New.pm:764 templates/web/zurich/admin/bodies/form.html:27 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 perllib/FixMyStreet/App/Controller/Report/New.pm:769 templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "" @@ -193,7 +193,7 @@ msgstr "" msgid "%s saved." msgstr "" -#: templates/web/base/status/stats.html:18 templates/web/zurich/admin/index.html:4 +#: templates/web/base/status/stats.html:17 templates/web/zurich/admin/index.html:4 msgid "%s live problems" msgstr "" @@ -253,7 +253,7 @@ msgstr "" msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:101 +#: templates/web/base/admin/bodies/contact-form.html:108 msgid "Add another parent category" msgstr "" @@ -317,7 +317,7 @@ msgstr "" msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" -#: templates/web/base/main_nav_items.html:39 +#: templates/web/base/main_nav_items.html:31 msgid "Admin" msgstr "" @@ -564,11 +564,11 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:6 +#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:14 msgid "Category fix rate for problems > 4 weeks old" msgstr "" @@ -775,7 +775,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 templates/web/zurich/admin/bodies/contact-form.html:51 +#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/zurich/admin/bodies/contact-form.html:51 msgid "Create category" msgstr "" @@ -1126,7 +1126,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:21 +#: perllib/FixMyStreet/Cobrand/UK.pm:22 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -1208,7 +1208,7 @@ msgstr "" msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:107 templates/web/base/admin/reports/edit.html:134 templates/web/base/admin/update_edit.html:97 templates/web/base/report/update/moderation_diff.html:8 +#: templates/web/base/admin/bodies/contact-form.html:114 templates/web/base/admin/reports/edit.html:134 templates/web/base/admin/update_edit.html:97 templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" @@ -1373,7 +1373,7 @@ msgstr "" msgid "Grant access to the admin" msgstr "" -#: templates/web/base/admin/index.html:82 +#: templates/web/base/admin/stats/index.html:7 msgid "Graph of problem creation by status over time" msgstr "" @@ -1393,11 +1393,11 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/admin/stats/index.html:15 templates/web/base/admin/stats/index.html:9 +#: templates/web/base/admin/stats/index.html:17 templates/web/base/admin/stats/index.html:23 msgid "Heatmap" msgstr "" -#: templates/web/base/main_nav_items.html:32 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 +#: templates/web/base/main_nav_items.html:24 templates/web/zurich/about/faq-de-ch.html:1 templates/web/zurich/footer.html:22 templates/web/zurich/nav_over_content.html:8 msgid "Help" msgstr "" @@ -1589,7 +1589,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:117 +#: templates/web/base/admin/bodies/contact-form.html:124 msgid "If you’ve made changes, leave a note explaining what, for other admins to see." msgstr "" @@ -1725,7 +1725,7 @@ msgstr "" msgid "Loading reports…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 templates/web/base/report/new/category_wrapper.html:9 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "" @@ -1737,7 +1737,7 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/main_nav_items.html:24 templates/web/base/main_nav_items.html:29 +#: templates/web/base/main_nav_items.html:16 templates/web/base/main_nav_items.html:21 msgid "Local alerts" msgstr "" @@ -1931,7 +1931,7 @@ msgstr "" msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321 msgid "New category contact added" msgstr "" @@ -2234,7 +2234,7 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 perllib/FixMyStreet/App/Controller/Report.pm:703 perllib/FixMyStreet/App/Controller/Report.pm:706 perllib/FixMyStreet/App/Controller/Report/New.pm:1423 perllib/FixMyStreet/App/Controller/Report/New.pm:765 perllib/FixMyStreet/App/Controller/Report/New.pm:766 perllib/FixMyStreet/DB/Result/Problem.pm:641 perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/DB/Result/Problem.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:672 perllib/FixMyStreet/Script/Reports.pm:168 perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 perllib/FixMyStreet/App/Controller/Report.pm:703 perllib/FixMyStreet/App/Controller/Report.pm:706 perllib/FixMyStreet/App/Controller/Report/New.pm:1427 perllib/FixMyStreet/App/Controller/Report/New.pm:770 perllib/FixMyStreet/App/Controller/Report/New.pm:771 perllib/FixMyStreet/DB/Result/Problem.pm:641 perllib/FixMyStreet/DB/Result/Problem.pm:648 perllib/FixMyStreet/DB/Result/Problem.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:672 perllib/FixMyStreet/Queue/Item/Report.pm:132 perllib/FixMyStreet/Queue/Item/Report.pm:195 msgid "Other" msgstr "" @@ -2262,7 +2262,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:91 +#: templates/web/base/admin/bodies/contact-form.html:98 msgid "Parent categories" msgstr "" @@ -2380,7 +2380,7 @@ msgid "Please check your phone number is correct" msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1029 perllib/FixMyStreet/App/Controller/Report/New.pm:1073 templates/web/base/js/translation_strings.html:21 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1034 perllib/FixMyStreet/App/Controller/Report/New.pm:1077 templates/web/base/js/translation_strings.html:21 msgid "Please choose a category" msgstr "" @@ -2388,7 +2388,7 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/templates/edit.html:13 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/templates/edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2404,7 +2404,7 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #. ("JS") -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293 perllib/FixMyStreet/DB/Result/Comment.pm:143 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298 perllib/FixMyStreet/DB/Result/Comment.pm:143 templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" @@ -2416,7 +2416,7 @@ msgstr "" msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436 msgid "Please enter a name for this body" msgstr "" @@ -2459,7 +2459,7 @@ msgid "Please enter your first name" msgstr "" #. ("JS") -#: perllib/FixMyStreet/Cobrand/UK.pm:343 templates/web/base/js/translation_strings.html:19 +#: perllib/FixMyStreet/Cobrand/UK.pm:337 templates/web/base/js/translation_strings.html:19 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 "" @@ -2642,7 +2642,7 @@ msgstr "" msgid "Priority" msgstr "" -#: templates/web/base/main_nav_items.html:35 +#: templates/web/base/main_nav_items.html:27 msgid "Privacy" msgstr "" @@ -2650,7 +2650,7 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/bodies/body.html:90 templates/web/base/admin/reports/edit.html:157 templates/web/base/report/inspect/information.html:3 templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/admin/bodies/body.html:90 templates/web/base/admin/reports/edit.html:157 templates/web/base/report/inspect/information.html:3 templates/web/base/report/new/form_user_loggedin.html:69 msgid "Private" msgstr "" @@ -2690,11 +2690,11 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats/index.html:5 templates/web/base/admin/stats/state.html:12 templates/web/zurich/admin/index.html:9 +#: templates/web/base/admin/stats/index.html:13 templates/web/base/admin/stats/state.html:12 templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:244 msgid "Problem marked as open." msgstr "" @@ -2726,15 +2726,15 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:905 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 +#: perllib/FixMyStreet/Cobrand/Default.pm:905 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "Problems within %s ward" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "Problems within %s ward, %s" msgstr "" @@ -2751,6 +2751,10 @@ msgstr "" msgid "Protect from Open311 changes" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:69 +msgid "Protect this category's name and group(s) from Open311 changes" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form-wrapper.html:9 templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -2807,19 +2811,19 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 +#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290 +#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2827,11 +2831,11 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:906 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:233 +#: perllib/FixMyStreet/Cobrand/Default.pm:906 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:239 +#: perllib/FixMyStreet/Cobrand/UK.pm:233 msgid "RSS feed of problems within %s ward" msgstr "" @@ -2929,12 +2933,12 @@ msgid "Report ID:" msgstr "" #. ("JS") -#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:89 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:89 templates/web/base/navigation/_report.html:6 templates/web/base/navigation/_report.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:90 templates/web/base/main_nav_items.html:4 +#: templates/web/base/js/translation_strings.html:90 templates/web/base/navigation/_report.html:4 msgid "Report a problem here" msgstr "" @@ -2947,7 +2951,7 @@ msgid "Report anonymously" msgstr "" #. ("JS") -#: templates/web/base/js/translation_strings.html:91 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40 +#: templates/web/base/js/translation_strings.html:91 templates/web/base/navigation/_report.html:2 templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" @@ -3066,11 +3070,11 @@ msgstr "" msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3152,11 +3156,11 @@ msgstr "" msgid "Roles" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 perllib/FixMyStreet/App/Controller/Admin.pm:448 templates/web/base/admin/reports/edit.html:171 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/reports/edit.html:106 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 perllib/FixMyStreet/App/Controller/Admin.pm:416 templates/web/base/admin/reports/edit.html:171 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/reports/edit.html:106 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 templates/web/base/admin/reports/edit.html:172 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 templates/web/base/admin/reports/edit.html:172 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/reports/edit.html:107 msgid "Rotate Right" msgstr "" @@ -3173,7 +3177,7 @@ msgstr "" msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 templates/web/base/admin/manifesttheme/form.html:58 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/roles/form.html:21 templates/web/base/admin/templates/edit.html:84 templates/web/base/admin/triage/_inspect.html:69 templates/web/base/admin/users/index.html:83 templates/web/base/report/_inspect.html:78 templates/web/base/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:51 templates/web/zurich/admin/templates/edit.html:32 +#: templates/web/base/admin/bodies/contact-form.html:131 templates/web/base/admin/manifesttheme/form.html:58 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:41 templates/web/base/admin/roles/form.html:21 templates/web/base/admin/templates/edit.html:84 templates/web/base/admin/triage/_inspect.html:69 templates/web/base/admin/users/index.html:83 templates/web/base/report/_inspect.html:78 templates/web/base/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:51 templates/web/zurich/admin/templates/edit.html:32 msgid "Save changes" msgstr "" @@ -3306,7 +3310,7 @@ msgstr "" msgid "Short Name" msgstr "" -#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:27 templates/web/base/report/_main.html:35 +#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:27 templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3363,7 +3367,7 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/create.html:72 templates/web/base/auth/general.html:4 templates/web/base/auth/general.html:94 templates/web/base/main_nav_items.html:14 templates/web/zurich/auth/general.html:23 templates/web/zurich/auth/general.html:8 +#: templates/web/base/auth/create.html:72 templates/web/base/auth/general.html:4 templates/web/base/auth/general.html:94 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:23 templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "" @@ -3415,7 +3419,7 @@ msgstr "" msgid "Sorry! You’ve hit the limit of images that can be attached to one report." msgstr "" -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95 perllib/FixMyStreet/Cobrand/UK.pm:85 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3431,7 +3435,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:249 perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 perllib/FixMyStreet/Geocode/OSM.pm:53 perllib/FixMyStreet/Geocode/URL.pm:19 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:249 perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 perllib/FixMyStreet/Geocode/OSM.pm:53 msgid "Sorry, we could not find that location." msgstr "" @@ -3503,7 +3507,7 @@ msgstr "" msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:680 perllib/FixMyStreet/Cobrand/Zurich.pm:413 templates/web/base/admin/index.html:77 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:61 +#: perllib/FixMyStreet/Cobrand/Default.pm:680 perllib/FixMyStreet/Cobrand/Zurich.pm:413 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:61 msgid "Stats" msgstr "" @@ -3535,7 +3539,7 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/base/auth/2fa/form-add.html:14 templates/web/base/auth/2fa/form.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:65 templates/web/base/report/form/user_loggedout_password.html:29 templates/web/base/report/new/form_report.html:21 templates/web/base/report/new/form_user_loggedin.html:71 templates/web/base/report/new/login_success_form.html:17 templates/web/base/report/new/oauth_email_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:73 +#: templates/web/base/auth/2fa/form-add.html:14 templates/web/base/auth/2fa/form.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:65 templates/web/base/report/form/user_loggedout_password.html:29 templates/web/base/report/new/form_report.html:21 templates/web/base/report/new/form_user_loggedin.html:73 templates/web/base/report/new/login_success_form.html:17 templates/web/base/report/new/oauth_email_form.html:20 templates/web/base/report/new/report_import.html:103 templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" @@ -3580,7 +3584,7 @@ msgstr "" msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:116 +#: templates/web/base/admin/bodies/contact-form.html:123 msgid "Summarise your changes" msgstr "" @@ -3592,7 +3596,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: templates/web/base/admin/stats/index.html:7 templates/web/base/dashboard/index.html:21 +#: templates/web/base/admin/stats/index.html:15 templates/web/base/dashboard/index.html:21 msgid "Summary statistics" msgstr "" @@ -3604,7 +3608,7 @@ msgstr "" msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/stats/index.html:4 templates/web/base/admin/stats/questionnaire.html:1 +#: templates/web/base/admin/stats/index.html:12 templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3680,15 +3684,15 @@ 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:157 perllib/FixMyStreet/Cobrand/TransportFocus.pm:88 perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 perllib/FixMyStreet/Cobrand/KiitC.pm:157 perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265 msgid "That problem will now be resent." msgstr "" @@ -3736,7 +3740,7 @@ msgstr "" msgid "The name is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:69 templates/web/base/admin/bodies/contact-form.html:70 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102 +#: templates/web/base/admin/bodies/contact-form.html:76 templates/web/base/admin/bodies/contact-form.html:77 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -3836,7 +3840,7 @@ msgstr "" msgid "The uploaded CSV file must contain a header row, and records can have the following fields:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:101 +#: perllib/FixMyStreet/Queue/Item/Report.pm:117 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3890,11 +3894,11 @@ msgstr "" msgid "There was a problem with your login information." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:911 perllib/FixMyStreet/App/Controller/Report/Update.pm:147 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 perllib/FixMyStreet/App/Controller/Report/Update.pm:161 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:354 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3902,7 +3906,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417 msgid "There were problems with your update. Please see below." msgstr "" @@ -3964,15 +3968,15 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:176 +#: perllib/FixMyStreet/Queue/Item/Report.pm:196 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:179 +#: perllib/FixMyStreet/Queue/Item/Report.pm:199 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:1087 perllib/FixMyStreet/App/Controller/Report/New.pm:1159 perllib/FixMyStreet/App/Controller/Report/New.pm:1206 perllib/FixMyStreet/Cobrand/UK.pm:50 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 perllib/FixMyStreet/App/Controller/Report/New.pm:1163 perllib/FixMyStreet/App/Controller/Report/New.pm:1210 perllib/FixMyStreet/Cobrand/UK.pm:51 msgid "This information is required" msgstr "" @@ -4034,7 +4038,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:92 +#: perllib/FixMyStreet/Queue/Item/Report.pm:108 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4078,7 +4082,7 @@ msgstr "" msgid "To provide an update, please sign in." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:100 +#: perllib/FixMyStreet/Queue/Item/Report.pm:116 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4236,7 +4240,7 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:271 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364 perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 perllib/FixMyStreet/Cobrand/Zurich.pm:837 perllib/FixMyStreet/Cobrand/Zurich.pm:862 perllib/FixMyStreet/Cobrand/Zurich.pm:935 +#: perllib/FixMyStreet/App/Controller/Admin.pm:239 perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366 perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 perllib/FixMyStreet/App/Controller/Admin/Users.pm:572 perllib/FixMyStreet/Cobrand/Zurich.pm:837 perllib/FixMyStreet/Cobrand/Zurich.pm:862 perllib/FixMyStreet/Cobrand/Zurich.pm:935 msgid "Updated!" msgstr "" @@ -4333,7 +4337,7 @@ msgstr "" msgid "Users with this role can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359 msgid "Values updated" msgstr "" @@ -4397,7 +4401,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:185 +#: perllib/FixMyStreet/Queue/Item/Report.pm:149 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4618,7 +4622,7 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/auth/2fa/intro.html:12 templates/web/base/auth/change_password.html:13 templates/web/base/auth/generate_token.html:15 templates/web/base/auth/generate_token.html:23 templates/web/base/auth/generate_token.html:31 templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18 +#: templates/web/base/auth/2fa/intro.html:12 templates/web/base/auth/change_password.html:13 templates/web/base/auth/generate_token.html:15 templates/web/base/auth/generate_token.html:23 templates/web/base/auth/generate_token.html:31 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" @@ -4736,7 +4740,7 @@ msgstr "" msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:220 perllib/FixMyStreet/DB/Result/User.pm:344 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2 +#: perllib/FixMyStreet/DB/Result/Comment.pm:220 perllib/FixMyStreet/DB/Result/User.pm:344 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -4784,7 +4788,7 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:114 templates/web/base/admin/stats/questionnaire.html:15 templates/web/base/admin/stats/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54 templates/web/base/admin/stats/questionnaire.html:15 templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" @@ -4848,7 +4852,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:169 +#: perllib/FixMyStreet/Queue/Item/Report.pm:133 msgid "this type of local problem" msgstr "" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index abf40a7ec..c3619f74a 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2020-03-03 15:29+0000\n" +"POT-Creation-Date: 2020-05-06 13:37+0100\n" "PO-Revision-Date: 2019-04-29 18:03+0000\n" "Last-Translator: ButterflyOfFire, 2019\n" "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n" @@ -23,7 +23,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:714 #: perllib/FixMyStreet/DB/Result/Problem.pm:716 -#: perllib/FixMyStreet/Script/Reports.pm:174 +#: perllib/FixMyStreet/Queue/Item/Report.pm:194 msgid " and " msgstr "و" @@ -182,8 +182,8 @@ msgstr "(أرسل لكليهما)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 #: templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "--إختر تصنيف--" @@ -227,7 +227,7 @@ msgstr "" msgid "%s saved." msgstr "" -#: templates/web/base/status/stats.html:18 +#: templates/web/base/status/stats.html:17 #: templates/web/zurich/admin/index.html:4 msgid "%s live problems" msgstr "%s المشاكل الحالية" @@ -293,7 +293,7 @@ msgstr "" msgid "Add a contact using the form below." msgstr "أضف عنوان اتصال عبر النموذج التالي." -#: templates/web/base/admin/bodies/contact-form.html:101 +#: templates/web/base/admin/bodies/contact-form.html:108 #, fuzzy msgid "Add another parent category" msgstr "أضف تصنيفاً" @@ -370,7 +370,7 @@ msgstr "أُضيف %s" msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "اضافة التقرير للقائمة القصيرة خاصتك سيحذفه من %s’s القائمة القصيرة." -#: templates/web/base/main_nav_items.html:39 +#: templates/web/base/main_nav_items.html:31 msgid "Admin" msgstr "المدير" @@ -680,12 +680,12 @@ msgstr "تصنيف" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’" #: templates/web/base/admin/stats/fix_rate.html:1 -#: templates/web/base/admin/stats/index.html:6 +#: templates/web/base/admin/stats/index.html:14 msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" @@ -944,7 +944,7 @@ msgstr "انشئ بلاغ" msgid "Create an account" msgstr "إنشاء حساب" -#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/bodies/contact-form.html:131 #: templates/web/zurich/admin/bodies/contact-form.html:51 msgid "Create category" msgstr "انشء تصنيف" @@ -1386,7 +1386,7 @@ msgstr "نقطة النهاية" msgid "Enter a Zürich street name" msgstr "أدخل اسم شارع في زيورخ" -#: perllib/FixMyStreet/Cobrand/UK.pm:21 +#: perllib/FixMyStreet/Cobrand/UK.pm:22 msgid "Enter a nearby UK postcode, or street name and area" msgstr "أدخل أقرب صندوق بريد بريطاني، أو اسم الشارع والحي" @@ -1481,7 +1481,7 @@ msgstr "فريق خارجي" msgid "Extra Fields" msgstr "حقول إضافية" -#: templates/web/base/admin/bodies/contact-form.html:107 +#: templates/web/base/admin/bodies/contact-form.html:114 #: templates/web/base/admin/reports/edit.html:134 #: templates/web/base/admin/update_edit.html:97 #: templates/web/base/report/update/moderation_diff.html:8 @@ -1687,7 +1687,7 @@ msgstr "هل تريد أن ترسل سؤال؟" msgid "Grant access to the admin" msgstr "إعطاء تصريح للأدمن" -#: templates/web/base/admin/index.html:82 +#: templates/web/base/admin/stats/index.html:7 msgid "Graph of problem creation by status over time" msgstr "الرسم البياني للإبلاغ عن المشكلات حسب الحالة مع مرور الوقت" @@ -1707,12 +1707,12 @@ msgstr "هل أصلحت هذه المشكلة؟" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "هل أبلغت عن مشكلة لأحد المجالس من قبل، أم هذه هي المرة الأولى؟" -#: templates/web/base/admin/stats/index.html:15 -#: templates/web/base/admin/stats/index.html:9 +#: templates/web/base/admin/stats/index.html:17 +#: templates/web/base/admin/stats/index.html:23 msgid "Heatmap" msgstr "" -#: templates/web/base/main_nav_items.html:32 +#: templates/web/base/main_nav_items.html:24 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1937,7 +1937,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:117 +#: templates/web/base/admin/bodies/contact-form.html:124 msgid "If you’ve made changes, leave a note explaining what, for other admins to see." msgstr "" @@ -2084,7 +2084,7 @@ msgstr "عرض جميع المشكلات المبلّغ عنها" msgid "Loading reports…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 #: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "جارٍ التحميل..." @@ -2102,8 +2102,8 @@ msgstr "مواجز RSS وتنبيهات البريد الإلكتروني الم msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "مواجز RSS وتنبيهات البريد الإلكتروني المحلية لـ ’%s‘" -#: templates/web/base/main_nav_items.html:24 -#: templates/web/base/main_nav_items.html:29 +#: templates/web/base/main_nav_items.html:16 +#: templates/web/base/main_nav_items.html:21 msgid "Local alerts" msgstr "التنبيهات المحلية" @@ -2340,7 +2340,7 @@ msgstr "" msgid "New body added" msgstr "تمت إضافة هيئة جديدة" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321 msgid "New category contact added" msgstr "تمت إضافة جهة اتصال جديدة للفئة" @@ -2699,15 +2699,15 @@ msgstr "الترتيب" #: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 #: perllib/FixMyStreet/App/Controller/Report.pm:703 #: perllib/FixMyStreet/App/Controller/Report.pm:706 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1423 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:765 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:766 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:770 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:771 #: perllib/FixMyStreet/DB/Result/Problem.pm:641 #: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/DB/Result/Problem.pm:663 #: perllib/FixMyStreet/DB/Result/Problem.pm:672 -#: perllib/FixMyStreet/Script/Reports.pm:168 -#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Queue/Item/Report.pm:132 +#: perllib/FixMyStreet/Queue/Item/Report.pm:195 msgid "Other" msgstr "أخرى" @@ -2737,7 +2737,7 @@ msgstr "لم يتم العثور على الصفحة" msgid "Parent" msgstr "العنصر الرئيسي" -#: templates/web/base/admin/bodies/contact-form.html:91 +#: templates/web/base/admin/bodies/contact-form.html:98 #, fuzzy msgid "Parent categories" msgstr "فئات أخرى" @@ -2899,8 +2899,8 @@ msgstr "" #. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1029 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1073 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077 #: templates/web/base/js/translation_strings.html:21 msgid "Please choose a category" msgstr "الرجاء اختيار فئة" @@ -2910,7 +2910,7 @@ msgstr "الرجاء اختيار فئة" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312 #: templates/web/base/admin/bodies/body.html:12 #: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/templates/edit.html:13 @@ -2933,7 +2933,7 @@ msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة است #. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" @@ -2952,7 +2952,7 @@ msgstr "يرجى إدخال رقم هاتف خلوي" msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436 msgid "Please enter a name for this body" msgstr "الرجاء ادخال اسم لهذه الهيئة." @@ -3014,7 +3014,7 @@ msgid "Please enter your first name" msgstr "الرجاء إدخال الاسم الأول" #. ("JS") -#: perllib/FixMyStreet/Cobrand/UK.pm:343 +#: perllib/FixMyStreet/Cobrand/UK.pm:337 #: templates/web/base/js/translation_strings.html:19 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 "الرجاء إدخال الاسم الكامل؛ فالمجالس تحتاج هذه المعلومة - إذا كنت لا ترغب في إظهار اسمك على الموقع، فألغِ تحديد هذا المربع الموجود بالأسفل" @@ -3219,7 +3219,7 @@ msgstr "أولويات" msgid "Priority" msgstr "أولوية" -#: templates/web/base/main_nav_items.html:35 +#: templates/web/base/main_nav_items.html:27 msgid "Privacy" msgstr "الخصوصية" @@ -3232,7 +3232,7 @@ msgstr "الخصوصية وملفات تعريف الارتباط" #: templates/web/base/admin/bodies/body.html:90 #: templates/web/base/admin/reports/edit.html:157 #: templates/web/base/report/inspect/information.html:3 -#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedin.html:69 msgid "Private" msgstr "خاص" @@ -3276,13 +3276,13 @@ msgstr "حذف من القائمة القصيرة" msgid "Problem %s sent to council %s" msgstr "تم إرسال المشكلة %s إلى المجلس %s" -#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/index.html:13 #: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "تصنيف المشكلة حسب الحالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:244 msgid "Problem marked as open." msgstr "تم وضع علامة \"مفتوح\" على المشكلة." @@ -3318,16 +3318,16 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:905 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 -#: perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271 -#: perllib/FixMyStreet/Cobrand/UK.pm:283 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 msgid "Problems within %s" msgstr "المشكلات ضمن حدود %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "Problems within %s ward" msgstr "المشكلات ضمن حدود دائرة %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "Problems within %s ward, %s" msgstr "" @@ -3347,6 +3347,10 @@ msgstr "عنوان الملكية:" msgid "Protect from Open311 changes" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:69 +msgid "Protect this category's name and group(s) from Open311 changes" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form-wrapper.html:9 #: templates/web/base/report/update-form.html:9 @@ -3417,11 +3421,11 @@ msgstr "تمت تعبئة الاستبيان بواسطة المبلّغ عن ا msgid "RSS feed" msgstr "موجز RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 +#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 msgid "RSS feed for %s" msgstr "موجز RSS لـ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290 +#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 msgid "RSS feed for %s ward, %s" msgstr "موجز RSS لدائرة %s، %s" @@ -3429,11 +3433,11 @@ msgstr "موجز RSS لدائرة %s، %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306 msgid "RSS feed of %s" msgstr "موجز RSS لـ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 msgid "RSS feed of %s, within %s ward" msgstr "موجز RSS لـ %s، ضمن حدود دائرة %s" @@ -3443,11 +3447,11 @@ msgstr "موجز RSS للمشكلات القريبة" #: perllib/FixMyStreet/Cobrand/Default.pm:906 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 -#: perllib/FixMyStreet/Cobrand/UK.pm:233 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "RSS feed of problems within %s" msgstr "موجز RSS للمشكلات الموجودة ضمن حدود %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:239 +#: perllib/FixMyStreet/Cobrand/UK.pm:233 msgid "RSS feed of problems within %s ward" msgstr "موجز RSS للمشكلات الموجودة ضمن حدود دائرة %s" @@ -3560,15 +3564,16 @@ msgstr "معرف البلاغ:" #. ("JS") #: templates/web/base/header_logo.html:2 #: templates/web/base/js/translation_strings.html:89 -#: templates/web/base/main_nav_items.html:6 -#: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 +#: templates/web/base/navigation/_report.html:6 +#: templates/web/base/navigation/_report.html:8 +#: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "الإبلاغ عن مشكلة" #. ("JS") #: templates/web/base/js/translation_strings.html:90 -#: templates/web/base/main_nav_items.html:4 +#: templates/web/base/navigation/_report.html:4 msgid "Report a problem here" msgstr "" @@ -3584,7 +3589,7 @@ msgstr "تم الإبلاغ عنها بدون تحديد الهوية في %s" #. ("JS") #: templates/web/base/js/translation_strings.html:91 -#: templates/web/base/main_nav_items.html:2 +#: templates/web/base/navigation/_report.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" @@ -3725,11 +3730,11 @@ msgstr "تم نشر التقارير" msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3818,15 +3823,15 @@ msgstr "" msgid "Roles" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 -#: perllib/FixMyStreet/App/Controller/Admin.pm:448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin.pm:416 #: templates/web/base/admin/reports/edit.html:171 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/reports/edit.html:106 msgid "Rotate Left" msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 #: templates/web/base/admin/reports/edit.html:172 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/reports/edit.html:107 @@ -3848,7 +3853,7 @@ msgstr "القمر الصناعي" msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/bodies/contact-form.html:131 #: templates/web/base/admin/manifesttheme/form.html:58 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:41 @@ -4011,7 +4016,7 @@ msgstr "مشاركة" msgid "Short Name" msgstr "" -#: templates/web/base/main_nav_items.html:18 +#: templates/web/base/main_nav_items.html:10 #: templates/web/base/report/_main.html:149 #: templates/web/base/report/_main.html:27 #: templates/web/base/report/_main.html:35 @@ -4081,7 +4086,7 @@ msgstr "" #: templates/web/base/auth/create.html:72 #: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:94 -#: templates/web/base/main_nav_items.html:14 +#: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" @@ -4141,8 +4146,8 @@ msgstr "" msgid "Sorry! You’ve hit the limit of images that can be attached to one report." msgstr "" -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95 -#: perllib/FixMyStreet/Cobrand/UK.pm:85 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإحدى تبعيات التاج البريطاني، ونحن لا نغطي ذلك." @@ -4162,7 +4167,7 @@ msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة." #: perllib/FixMyStreet/App/Controller/Report/New.pm:249 #: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 -#: perllib/FixMyStreet/Geocode/OSM.pm:53 perllib/FixMyStreet/Geocode/URL.pm:19 +#: perllib/FixMyStreet/Geocode/OSM.pm:53 msgid "Sorry, we could not find that location." msgstr "عذرًا، لم نستطع العثور على هذا الموقع." @@ -4270,7 +4275,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:680 #: perllib/FixMyStreet/Cobrand/Zurich.pm:413 -#: templates/web/base/admin/index.html:77 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 #: templates/web/zurich/admin/stats/index.html:1 @@ -4320,9 +4324,10 @@ msgstr "الموضوع:" #: templates/web/base/report/form/user_loggedout_by_email.html:65 #: templates/web/base/report/form/user_loggedout_password.html:29 #: templates/web/base/report/new/form_report.html:21 -#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedin.html:73 #: templates/web/base/report/new/login_success_form.html:17 #: templates/web/base/report/new/oauth_email_form.html:20 +#: templates/web/base/report/new/report_import.html:103 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "تقديم" @@ -4386,7 +4391,7 @@ msgstr "" msgid "Summarise the problem" msgstr "لخص المشكلة" -#: templates/web/base/admin/bodies/contact-form.html:116 +#: templates/web/base/admin/bodies/contact-form.html:123 msgid "Summarise your changes" msgstr "لخص تغييراتك" @@ -4408,7 +4413,7 @@ msgstr "ملخص" msgid "Summary reports" msgstr "ملخص التقارير" -#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/admin/stats/index.html:15 #: templates/web/base/dashboard/index.html:21 msgid "Summary statistics" msgstr "خلاصة الإحصائيات" @@ -4421,7 +4426,7 @@ msgstr "مستخدم خارق" msgid "Superusers have permission to perform all actions within the admin." msgstr "المستخدم الخارق له ترخيص لتنفيذ strong>كل اعمال التي يمكن للأدمن عملها." -#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/index.html:12 #: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "نتائج التصفح" @@ -4511,16 +4516,16 @@ msgstr "لا يبدو أن هذا الموقع يقع في المملكة الم #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 #: perllib/FixMyStreet/Cobrand/KiitC.pm:157 -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:88 -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272 msgid "That problem has been marked as sent." msgstr "تم وضع علامة على هذه المشكلة بأنها أُرسلت." -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265 msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." @@ -4574,8 +4579,8 @@ msgstr "" msgid "The name is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:69 -#: templates/web/base/admin/bodies/contact-form.html:70 +#: templates/web/base/admin/bodies/contact-form.html:76 +#: templates/web/base/admin/bodies/contact-form.html:77 #: templates/web/base/admin/bodies/form.html:101 #: templates/web/base/admin/bodies/form.html:102 msgid "" @@ -4688,7 +4693,7 @@ msgstr "" msgid "The uploaded CSV file must contain a header row, and records can have the following fields:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:101 +#: perllib/FixMyStreet/Queue/Item/Report.pm:117 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "تعذر على المستخدم تحديد موقع المشكلة على الخريطة، ولكن يجب البحث عن المنطقة حول الموقع الذي أدخله" @@ -4750,12 +4755,12 @@ msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء msgid "There was a problem with your login information." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:911 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:147 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161 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:354 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376 msgid "There was a problem with your update. Please try again." msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى." @@ -4763,7 +4768,7 @@ msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة م msgid "There were problems with your report. Please see below." msgstr "حدثت مشكلات في التقرير. الرجاء الاطلاع على ما يلي." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417 msgid "There were problems with your update. Please see below." msgstr "حدثت مشكلات في التحديث. الرجاء الاطلاع على ما يلي." @@ -4841,18 +4846,18 @@ msgstr "" "ستُرسل إلى هذه الهيئة تقارير المشكلات التي تقع في منطقة التغطية فقط.\n" " لن تتلقى الهيئة أي تقارير ما لم تكن تغطي منطقة واحدة على الأقل." -#: perllib/FixMyStreet/Script/Reports.pm:176 +#: perllib/FixMyStreet/Queue/Item/Report.pm:196 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "أُرسلت رسالة البريد الإلكتروني إلى كلا المجلسين اللذين يغطيان موقع المشكلة، وبما أن المستخدم لم يحدد فئة المشكلة، فالرجاء تجاهلها إذا لم تكن المجلس المختص بمعالجة هذه المشكلة، أو أعلمنا بفئة المشكلة لنضيفها إلى النظام." -#: perllib/FixMyStreet/Script/Reports.pm:179 +#: perllib/FixMyStreet/Queue/Item/Report.pm:199 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:1087 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1159 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1206 -#: perllib/FixMyStreet/Cobrand/UK.pm:50 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210 +#: perllib/FixMyStreet/Cobrand/UK.pm:51 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" @@ -4917,7 +4922,7 @@ msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:92 +#: perllib/FixMyStreet/Queue/Item/Report.pm:108 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، تم تقديمها بواسطة المستخدم." @@ -4974,7 +4979,7 @@ msgstr "" msgid "To provide an update, please sign in." msgstr "أو سجل دخولك" -#: perllib/FixMyStreet/Script/Reports.pm:100 +#: perllib/FixMyStreet/Queue/Item/Report.pm:116 msgid "To view a map of the precise location of this issue" msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذه المشكلة" @@ -5167,8 +5172,8 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:271 -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:239 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 @@ -5291,8 +5296,8 @@ msgid "Users with this role can perform the following actions within their assig msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه في مناطقهم او هيئاتهم المعينة." #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359 msgid "Values updated" msgstr "تم تحديث القيم" @@ -5367,7 +5372,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "نحتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسفل." -#: perllib/FixMyStreet/Script/Reports.pm:185 +#: perllib/FixMyStreet/Queue/Item/Report.pm:149 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "نعتقد أن هذه المشكلة هي المسؤولة عن %s؛ ولكن لا توجد لدينا أي تفاصيل اتصال لهم. إذا كنت تعرف عنوان اتصال مناسبًا، فالرجاء التواصل معنا." @@ -5629,7 +5634,7 @@ msgstr "التقارير" #: templates/web/base/auth/generate_token.html:15 #: templates/web/base/auth/generate_token.html:23 #: templates/web/base/auth/generate_token.html:31 -#: templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18 +#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "حسابك" @@ -5773,7 +5778,7 @@ msgstr "الكل" #: perllib/FixMyStreet/DB/Result/Comment.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:344 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 #: templates/web/base/admin/update_edit.html:92 #: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" @@ -5828,7 +5833,7 @@ msgstr "آخر تحديث %s" msgid "less than a minute" msgstr "أقل من دقيقة واحدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:114 +#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54 #: templates/web/base/admin/stats/questionnaire.html:15 #: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" @@ -5910,7 +5915,7 @@ msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يست msgid "this location" msgstr "هذا الموقع" -#: perllib/FixMyStreet/Script/Reports.pm:169 +#: perllib/FixMyStreet/Queue/Item/Report.pm:133 msgid "this type of local problem" msgstr "هذا النوع من المشكلة المحلية" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index da7988c64..8ade8d99e 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2020-03-03 15:29+0000\n" +"POT-Creation-Date: 2020-05-06 13:37+0100\n" "PO-Revision-Date: 2019-04-29 18:03+0000\n" "Last-Translator: mySociety , 2019\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n" @@ -22,7 +22,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:714 #: perllib/FixMyStreet/DB/Result/Problem.pm:716 -#: perllib/FixMyStreet/Script/Reports.pm:174 +#: perllib/FixMyStreet/Queue/Item/Report.pm:194 msgid " and " msgstr "и" @@ -175,8 +175,8 @@ msgstr "(изпратен към двата района)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 #: templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "-- Изберете категория --" @@ -216,7 +216,7 @@ msgstr "" msgid "%s saved." msgstr "" -#: templates/web/base/status/stats.html:18 +#: templates/web/base/status/stats.html:17 #: templates/web/zurich/admin/index.html:4 msgid "%s live problems" msgstr "%s отворени сигнали" @@ -282,7 +282,7 @@ msgstr "" msgid "Add a contact using the form below." msgstr "Добавете контакт като използвате формата по-долу." -#: templates/web/base/admin/bodies/contact-form.html:101 +#: templates/web/base/admin/bodies/contact-form.html:108 #, fuzzy msgid "Add another parent category" msgstr "Добавяне на нова категория" @@ -359,7 +359,7 @@ msgstr "Добавено %s" msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" -#: templates/web/base/main_nav_items.html:39 +#: templates/web/base/main_nav_items.html:31 msgid "Admin" msgstr "" @@ -669,12 +669,12 @@ msgstr "Категория" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" #: templates/web/base/admin/stats/fix_rate.html:1 -#: templates/web/base/admin/stats/index.html:6 +#: templates/web/base/admin/stats/index.html:14 msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" @@ -931,7 +931,7 @@ msgstr "Подай сигнал" msgid "Create an account" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/bodies/contact-form.html:131 #: templates/web/zurich/admin/bodies/contact-form.html:51 msgid "Create category" msgstr "Създай категория" @@ -1366,7 +1366,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "Въведете име на улица в близост до вас" -#: perllib/FixMyStreet/Cobrand/UK.pm:21 +#: perllib/FixMyStreet/Cobrand/UK.pm:22 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -1461,7 +1461,7 @@ msgstr "" msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:107 +#: templates/web/base/admin/bodies/contact-form.html:114 #: templates/web/base/admin/reports/edit.html:134 #: templates/web/base/admin/update_edit.html:97 #: templates/web/base/report/update/moderation_diff.html:8 @@ -1667,7 +1667,7 @@ msgstr "Ще изпратите ли анкетата?" msgid "Grant access to the admin" msgstr "" -#: templates/web/base/admin/index.html:82 +#: templates/web/base/admin/stats/index.html:7 msgid "Graph of problem creation by status over time" msgstr "Графика на създадените сигнали по статус във времето" @@ -1689,12 +1689,12 @@ msgstr "" "Подавали ли сте сигнал за нередност към общината преди или сега \n" "подавате за първи път?" -#: templates/web/base/admin/stats/index.html:15 -#: templates/web/base/admin/stats/index.html:9 +#: templates/web/base/admin/stats/index.html:17 +#: templates/web/base/admin/stats/index.html:23 msgid "Heatmap" msgstr "" -#: templates/web/base/main_nav_items.html:32 +#: templates/web/base/main_nav_items.html:24 #: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 @@ -1913,7 +1913,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:117 +#: templates/web/base/admin/bodies/contact-form.html:124 msgid "If you’ve made changes, leave a note explaining what, for other admins to see." msgstr "" @@ -2060,7 +2060,7 @@ msgstr "Показване на всички сигнали" msgid "Loading reports…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 #: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Зареждане..." @@ -2078,8 +2078,8 @@ msgstr "RSS и имейл известия за сигнали" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS и имейл известия за сигнали за ‘%s’" -#: templates/web/base/main_nav_items.html:24 -#: templates/web/base/main_nav_items.html:29 +#: templates/web/base/main_nav_items.html:16 +#: templates/web/base/main_nav_items.html:21 msgid "Local alerts" msgstr "Известия" @@ -2315,7 +2315,7 @@ msgstr "" msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321 msgid "New category contact added" msgstr "Категорията е добавена" @@ -2663,15 +2663,15 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99 #: perllib/FixMyStreet/App/Controller/Report.pm:703 #: perllib/FixMyStreet/App/Controller/Report.pm:706 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1423 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:765 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:766 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:770 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:771 #: perllib/FixMyStreet/DB/Result/Problem.pm:641 #: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/DB/Result/Problem.pm:663 #: perllib/FixMyStreet/DB/Result/Problem.pm:672 -#: perllib/FixMyStreet/Script/Reports.pm:168 -#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Queue/Item/Report.pm:132 +#: perllib/FixMyStreet/Queue/Item/Report.pm:195 msgid "Other" msgstr "Други" @@ -2701,7 +2701,7 @@ msgstr "Страницата не е намерена" msgid "Parent" msgstr "Община" -#: templates/web/base/admin/bodies/contact-form.html:91 +#: templates/web/base/admin/bodies/contact-form.html:98 #, fuzzy msgid "Parent categories" msgstr "Създай категория" @@ -2863,8 +2863,8 @@ msgstr "" #. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1029 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1073 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077 #: templates/web/base/js/translation_strings.html:21 msgid "Please choose a category" msgstr "Моля изберете категория" @@ -2874,7 +2874,7 @@ msgstr "Моля изберете категория" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312 #: templates/web/base/admin/bodies/body.html:12 #: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/templates/edit.html:13 @@ -2894,7 +2894,7 @@ msgstr "Моля не обиждайте никого - обиждайки Об #. ("JS") #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:143 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" @@ -2913,7 +2913,7 @@ msgstr "" msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436 msgid "Please enter a name for this body" msgstr "" @@ -2975,7 +2975,7 @@ msgid "Please enter your first name" msgstr "Моля въведете име" #. ("JS") -#: perllib/FixMyStreet/Cobrand/UK.pm:343 +#: perllib/FixMyStreet/Cobrand/UK.pm:337 #: templates/web/base/js/translation_strings.html:19 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 "Моля въведете цялото си име, общината се нуждае от тази информация - ако не желаете името Ви да се появява на сайта, моля махнете отметката по-долу" @@ -3180,7 +3180,7 @@ msgstr "" msgid "Priority" msgstr "" -#: templates/web/base/main_nav_items.html:35 +#: templates/web/base/main_nav_items.html:27 msgid "Privacy" msgstr "" @@ -3193,7 +3193,7 @@ msgstr "" #: templates/web/base/admin/bodies/body.html:90 #: templates/web/base/admin/reports/edit.html:157 #: templates/web/base/report/inspect/information.html:3 -#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedin.html:69 msgid "Private" msgstr "Лично" @@ -3236,13 +3236,13 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "Сигналът %s е подаден към общината %s " -#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/index.html:13 #: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Разделяне на сигналите по статуси" -#: perllib/FixMyStreet/App/Controller/Admin.pm:276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:244 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -3278,16 +3278,16 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:905 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 -#: perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271 -#: perllib/FixMyStreet/Cobrand/UK.pm:283 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 msgid "Problems within %s" msgstr "Сигнали в %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:240 +#: perllib/FixMyStreet/Cobrand/UK.pm:234 msgid "Problems within %s ward" msgstr "Сигнали в квартал %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 +#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283 msgid "Problems within %s ward, %s" msgstr "" @@ -3307,6 +3307,10 @@ msgstr "Адрес на имота:" msgid "Protect from Open311 changes" msgstr "" +#: templates/web/base/admin/bodies/contact-form.html:69 +msgid "Protect this category's name and group(s) from Open311 changes" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form-wrapper.html:9 #: templates/web/base/report/update-form.html:9 @@ -3377,11 +3381,11 @@ msgstr "Анкетата е попълнена от потребителя, по msgid "RSS feed" msgstr "RSS абонамент" -#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 +#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 msgid "RSS feed for %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290 +#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284 msgid "RSS feed for %s ward, %s" msgstr "RSS абонамент за квартал %s, %s" @@ -3389,11 +3393,11 @@ msgstr "RSS абонамент за квартал %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 +#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306 msgid "RSS feed of %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317 +#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 msgid "RSS feed of %s, within %s ward" msgstr "RSS абонамент за %s, в квартал %s" @@ -3403,11 +3407,11 @@ msgstr "RSS абонамент за последни проблеми наоко #: perllib/FixMyStreet/Cobrand/Default.pm:906 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 -#: perllib/FixMyStreet/Cobrand/UK.pm:233 +#: perllib/FixMyStreet/Cobrand/UK.pm:227 msgid "RSS feed of problems within %s" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:239 +#: perllib/FixMyStreet/Cobrand/UK.pm:233 msgid "RSS feed of problems within %s ward" msgstr "RSS абонамент за проблеми в квартал %s" @@ -3519,15 +3523,16 @@ msgstr "" #. ("JS") #: templates/web/base/header_logo.html:2 #: templates/web/base/js/translation_strings.html:89 -#: templates/web/base/main_nav_items.html:6 -#: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 +#: templates/web/base/navigation/_report.html:6 +#: templates/web/base/navigation/_report.html:8 +#: templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Подайте сигнал" #. ("JS") #: templates/web/base/js/translation_strings.html:90 -#: templates/web/base/main_nav_items.html:4 +#: templates/web/base/navigation/_report.html:4 msgid "Report a problem here" msgstr "" @@ -3543,7 +3548,7 @@ msgstr "Публикувано от анонимен потребител в %s" #. ("JS") #: templates/web/base/js/translation_strings.html:91 -#: templates/web/base/main_nav_items.html:2 +#: templates/web/base/navigation/_report.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" @@ -3684,11 +3689,11 @@ msgstr "Публикувани сигнали" msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3777,15 +3782,15 @@ msgstr "" msgid "Roles" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 -#: perllib/FixMyStreet/App/Controller/Admin.pm:448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 +#: perllib/FixMyStreet/App/Controller/Admin.pm:416 #: templates/web/base/admin/reports/edit.html:171 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/reports/edit.html:106 msgid "Rotate Left" msgstr "Завъртане наляво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:444 +#: perllib/FixMyStreet/App/Controller/Admin.pm:412 #: templates/web/base/admin/reports/edit.html:172 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/reports/edit.html:107 @@ -3807,7 +3812,7 @@ msgstr "" msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:124 +#: templates/web/base/admin/bodies/contact-form.html:131 #: templates/web/base/admin/manifesttheme/form.html:58 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:41 @@ -3970,7 +3975,7 @@ msgstr "Сподели" msgid "Short Name" msgstr "" -#: templates/web/base/main_nav_items.html:18 +#: templates/web/base/main_nav_items.html:10 #: templates/web/base/report/_main.html:149 #: templates/web/base/report/_main.html:27 #: templates/web/base/report/_main.html:35 @@ -4040,7 +4045,7 @@ msgstr "" #: templates/web/base/auth/create.html:72 #: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:94 -#: templates/web/base/main_nav_items.html:14 +#: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" @@ -4098,8 +4103,8 @@ msgstr "" msgid "Sorry! You’ve hit the limit of images that can be attached to one report." msgstr "" -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95 -#: perllib/FixMyStreet/Cobrand/UK.pm:85 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100 +#: perllib/FixMyStreet/Cobrand/UK.pm:86 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -4119,7 +4124,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:249 #: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47 -#: perllib/FixMyStreet/Geocode/OSM.pm:53 perllib/FixMyStreet/Geocode/URL.pm:19 +#: perllib/FixMyStreet/Geocode/OSM.pm:53 msgid "Sorry, we could not find that location." msgstr "" @@ -4225,7 +4230,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:680 #: perllib/FixMyStreet/Cobrand/Zurich.pm:413 -#: templates/web/base/admin/index.html:77 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 #: templates/web/zurich/admin/stats/index.html:1 @@ -4275,9 +4279,10 @@ msgstr "Тема:" #: templates/web/base/report/form/user_loggedout_by_email.html:65 #: templates/web/base/report/form/user_loggedout_password.html:29 #: templates/web/base/report/new/form_report.html:21 -#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedin.html:73 #: templates/web/base/report/new/login_success_form.html:17 #: templates/web/base/report/new/oauth_email_form.html:20 +#: templates/web/base/report/new/report_import.html:103 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Изпращане" @@ -4340,7 +4345,7 @@ msgstr "" msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:116 +#: templates/web/base/admin/bodies/contact-form.html:123 msgid "Summarise your changes" msgstr "" @@ -4362,7 +4367,7 @@ msgstr "Обобщение" msgid "Summary reports" msgstr "Обобщена справка" -#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/admin/stats/index.html:15 #: templates/web/base/dashboard/index.html:21 msgid "Summary statistics" msgstr "" @@ -4375,7 +4380,7 @@ msgstr "" msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/index.html:12 #: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Резултати от проучване" @@ -4464,16 +4469,16 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 #: perllib/FixMyStreet/Cobrand/KiitC.pm:157 -#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:88 -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "That postcode was not recognised, sorry." msgstr "Моля да ни извините, този пощенски код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -4523,8 +4528,8 @@ msgstr "" msgid "The name is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)." msgstr "" -#: templates/web/base/admin/bodies/contact-form.html:69 -#: templates/web/base/admin/bodies/contact-form.html:70 +#: templates/web/base/admin/bodies/contact-form.html:76 +#: templates/web/base/admin/bodies/contact-form.html:77 #: templates/web/base/admin/bodies/form.html:101 #: templates/web/base/admin/bodies/form.html:102 msgid "" @@ -4632,7 +4637,7 @@ msgstr "" msgid "The uploaded CSV file must contain a header row, and records can have the following fields:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:101 +#: perllib/FixMyStreet/Queue/Item/Report.pm:117 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -4694,12 +4699,12 @@ msgstr "Възникна проблем при визуализирането н msgid "There was a problem with your login information." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:911 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:147 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:916 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161 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:354 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376 msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." @@ -4707,7 +4712,7 @@ msgstr "Възникна проблем с вашата актуализация msgid "There were problems with your report. Please see below." msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417 msgid "There were problems with your update. Please see below." msgstr "Възникнаха проблеми с вашата актуализация. Моля вижте по-долу." @@ -4775,18 +4780,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:176 +#: perllib/FixMyStreet/Queue/Item/Report.pm:196 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Този имейл е изпратен към двете общини покриващи адреса на сигнала, тъй като потребителя не е го е категоризирал. Моля не го взимайте под внимание ако не сте правилната община, която е отговорна за този сигнал или ни съобщете под каква категория попада този сигнал, така че да може да я добавим в системата." -#: perllib/FixMyStreet/Script/Reports.pm:179 +#: perllib/FixMyStreet/Queue/Item/Report.pm:199 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:1087 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1159 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1206 -#: perllib/FixMyStreet/Cobrand/UK.pm:50 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210 +#: perllib/FixMyStreet/Cobrand/UK.pm:51 msgid "This information is required" msgstr "Тази информация е необходима" @@ -4851,7 +4856,7 @@ msgstr "Този сигнал е означен със статус отворе msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:92 +#: perllib/FixMyStreet/Queue/Item/Report.pm:108 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Тази страница съдържа и снимка, изпратена от нашия потребител." @@ -4907,7 +4912,7 @@ msgstr "" msgid "To provide an update, please sign in." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:100 +#: perllib/FixMyStreet/Queue/Item/Report.pm:116 msgid "To view a map of the precise location of this issue" msgstr "За да видите точното местоположение на проблема върху картата" @@ -5099,8 +5104,8 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:271 -#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364 +#: perllib/FixMyStreet/App/Controller/Admin.pm:239 +#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382 #: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45 @@ -5222,8 +5227,8 @@ msgid "Users with this role can perform the following actions within their assig msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311 -#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359 msgid "Values updated" msgstr "Актуализиране на стойностите" @@ -5298,7 +5303,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:185 +#: perllib/FixMyStreet/Queue/Item/Report.pm:149 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -5556,7 +5561,7 @@ msgstr "Вашите Сигнали" #: templates/web/base/auth/generate_token.html:15 #: templates/web/base/auth/generate_token.html:23 #: templates/web/base/auth/generate_token.html:31 -#: templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18 +#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" @@ -5699,7 +5704,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Comment.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:344 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161 #: templates/web/base/admin/update_edit.html:92 #: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" @@ -5754,7 +5759,7 @@ msgstr "Последно обновено %s" msgid "less than a minute" msgstr "преди по-малко от минута" -#: perllib/FixMyStreet/App/Controller/Admin.pm:114 +#: perllib/FixMyStreet/App/Controller/Admin/Stats.pm:54 #: templates/web/base/admin/stats/questionnaire.html:15 #: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" @@ -5836,7 +5841,7 @@ msgstr "мястото не е било отбелязано на картата msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:169 +#: perllib/FixMyStreet/Queue/Item/Report.pm:133 msgid "this type of local problem" msgstr "този тип сигнали" diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po index 6f92d2f1b..54bd060ca 100644 --- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2020-03-03 15:29+0000\n" +"POT-Creation-Date: 2020-05-06 13:37+0100\n" "PO-Revision-Date: 2019-04-29 18:03+0000\n" "Last-Translator: Eduard Molist Gallifa , 2019\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\n" @@ -23,7 +23,7 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:714 #: perllib/FixMyStreet/DB/Result/Problem.pm:716 -#: perllib/FixMyStreet/Script/Reports.pm:174 +#: perllib/FixMyStreet/Queue/Item/Report.pm:194 msgid " and " msgstr "i" @@ -182,8 +182,8 @@ msgstr "(enviat als dos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(també tenim canals RSS per incidències sobre %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 #: templates/web/zurich/admin/bodies/form.html:27 msgid "-- Pick a category --" msgstr "-- Tria una categoria --" @@ -226,7 +226,7 @@ msgstr " %s notificacions