diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-04-29 19:06:01 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-05-03 12:06:21 +0100 |
| commit | 92b253904062edd533e55c22824de6fd01e2f7c1 (patch) | |
| tree | d18f49ff98e87a2aeb6ca6eacc3217183141ec9e /locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po | |
| parent | 5faa1946bda79c31aab04778cb4eb01afa18b473 (diff) | |
Version 2.6.v2.6
Include the usual generate new .pot file, gettext-merge, push to
Transifex, pull from Transifex step.
Diffstat (limited to 'locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po | 1374 |
1 files changed, 719 insertions, 655 deletions
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 46ff24740..67d0044b7 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# mySociety <transifex@mysociety.org>, 2018 +# mySociety <transifex@mysociety.org>, 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety <transifex@mysociety.org>, 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>, 2019\n" "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n" "Language: ms\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " dan " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " dan " msgid " or " msgstr " atau " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan daripada %s" @@ -48,7 +48,7 @@ msgstr "%d suntingan daripada %s" msgid "%d to %d of %d" msgstr "%d kepada %d daripada %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" @@ -163,11 +163,11 @@ msgstr "(tidak dihantar kepada majlis)" msgid "(optional)" msgstr "(tidak diwajibkan)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" @@ -176,13 +176,13 @@ msgstr "(hantar kepada kedua-dua)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n" " This is probably why \"area covered\" is empty (below).<br>\n" @@ -206,11 +206,11 @@ msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "<span>%s</span> saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -259,21 +259,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a <strong>body</strong> for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Tambahkan cara hubungan dengan borang dibawah" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Tambah badan" @@ -294,8 +294,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Tambah kategori baru" @@ -310,27 +310,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Tambah pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "Added %s" msgstr "%s telah ditambahi" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +367,6 @@ msgstr "Maklumkan aku sebarang kemas kini masa depan" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -414,11 +413,15 @@ msgstr "Semua laporan antara %s dan %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on <strong>all of your reports and updates</strong> across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -437,9 +440,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Tanpa Nama:" @@ -448,29 +451,29 @@ msgstr "Tanpa Nama:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Kawasan dilintungi" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -491,11 +494,11 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Ditugaskan kepada %s" @@ -507,8 +510,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -524,7 +527,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -545,11 +548,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Mengunggu penyederhanaan" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Balik" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -557,10 +560,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -569,17 +572,17 @@ msgstr "Badan" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Badan" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Badan:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -595,7 +598,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -606,15 +609,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -627,7 +630,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -637,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -666,11 +669,11 @@ msgstr "Menukar Kata Laluan" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -681,17 +684,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -723,9 +726,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -769,17 +776,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Sah" @@ -800,9 +807,9 @@ msgstr "" msgid "Confirmation" msgstr "Pengesahan" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Disahkan" @@ -832,7 +839,11 @@ msgstr "Menghubungi pasukan" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -841,12 +852,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Tidak dapat mencari lokasi" @@ -854,9 +865,11 @@ msgstr "Tidak dapat mencari lokasi" msgid "Council" msgstr "Majlis" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" @@ -885,8 +898,8 @@ msgstr "Laporan baru" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kategori baru" @@ -894,15 +907,15 @@ msgstr "Kategori baru" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -916,7 +929,7 @@ msgstr "" msgid "Created" msgstr "Diwujudkan" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -939,12 +952,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Belum ada badan wujud pada masa kini." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -972,32 +985,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1013,18 +1026,18 @@ msgstr "Huraian" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Perincian" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1035,7 +1048,7 @@ msgstr "Perincian:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Didelegasikan" @@ -1044,24 +1057,24 @@ msgstr "Didelegasikan" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1070,7 +1083,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1078,7 +1091,7 @@ msgstr "" msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1086,19 +1099,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories <strong>can have the same contact</strong> (email address).\n" @@ -1106,8 +1119,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1115,23 +1128,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Menyunting" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Edit perincian badah" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1139,15 +1152,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1170,28 +1183,28 @@ msgstr "Sedang edit masalah %d" msgid "Editing update %d" msgstr "Sedang mengemaskini %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Sedang edit pengguna %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Emel" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1220,37 +1233,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Emel:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable <strong>Always fetch all problems</strong> if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable <strong>Convert location from Easting/Northing</strong> if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable <strong>Open311 problem-fetching</strong> if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1258,8 +1271,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1267,16 +1280,16 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1284,7 +1297,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endpoint" @@ -1306,10 +1319,6 @@ msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" @@ -1323,13 +1332,13 @@ msgstr "Masukkan perincian masalah tersebut" msgid "Error" msgstr "Ralat" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Contoh poskod %s" @@ -1341,11 +1350,11 @@ msgstr "Contoh:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1362,7 +1371,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1383,25 +1392,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1424,11 +1433,12 @@ msgstr "" msgid "Filter report list" msgstr "Tapis senarai laporan" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Pertama kali" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1448,9 +1458,9 @@ msgstr "Diselesai - Majlis" msgid "Fixed - User" msgstr "Diselesai - Pengguna" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Tanda sebagai dipadam" @@ -1458,8 +1468,8 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Ditanda" @@ -1467,7 +1477,7 @@ msgstr "Ditanda" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditanda" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1476,7 +1486,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Ditanda:" @@ -1492,7 +1502,7 @@ msgstr "" msgid "For each option, <strong>Key</strong> is the value which is stored in the database for that option and <strong>Name</strong> is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Untuk maklumat lanjut, lihat <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>." @@ -1506,11 +1516,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Terlupai kata laluan anda?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1526,6 +1536,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Dapatkan kemas kini" @@ -1556,9 +1568,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1568,7 +1580,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1576,7 +1588,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf masalah dibuat dengan status dari masa ke masa" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1627,11 +1639,11 @@ msgstr "Tersembunyi" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1652,9 +1664,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Sembunyikan pin" @@ -1671,11 +1683,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Sejarah" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Home" @@ -1683,7 +1695,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Bagaimana melaporkan masalah" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" @@ -1705,7 +1717,7 @@ msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1714,8 +1726,8 @@ msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1737,13 +1749,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1755,6 +1767,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1782,34 +1798,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID tak sah" @@ -1817,7 +1833,7 @@ msgstr "ID tak sah" msgid "Illegal feed selection" msgstr "Pilihan feed yang tak sah" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1829,7 +1845,7 @@ msgstr "Dalam table penyalahguna?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1845,15 +1861,15 @@ msgstr "Termasuk perincian peribadi pelapor" msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo \"%s\" salah" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1861,7 +1877,7 @@ msgstr "" msgid "Internal notes" msgstr "Nota dalaman" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1869,12 +1885,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1895,7 +1911,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1908,8 +1924,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Editor terakhir" @@ -1925,17 +1941,17 @@ msgstr "Kemas kini terakhir:" msgid "Last update:" msgstr "Kemas kini terakhir:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1943,7 +1959,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Senaraikan semua laporan masalah" @@ -1987,16 +2003,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2004,23 +2020,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "PETA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2028,15 +2044,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Pesanan" @@ -2052,19 +2068,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2072,10 +2088,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2093,12 +2109,12 @@ msgstr "" msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2110,11 +2126,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2123,7 +2139,7 @@ msgstr "Nama" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nama:" @@ -2133,11 +2149,11 @@ msgstr "Nama:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2149,7 +2165,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2173,11 +2189,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" @@ -2213,23 +2229,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for <a href=\"%s\">%s</a> ward in <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2237,7 +2253,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Masalah baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near <a href=\"%s\">%s,%s</a>" msgstr "" @@ -2273,11 +2289,11 @@ msgstr "Negeri baru" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report <a href=\"%s\">%s</a>" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2289,10 +2305,10 @@ msgstr "Seterusnya" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2300,11 +2316,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Tidak" @@ -2312,11 +2327,7 @@ msgstr "Tidak" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Tiada badan" @@ -2324,7 +2335,7 @@ msgstr "Tiada badan" msgid "No council selected" msgstr "Tiada majlis dipilihi" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Belum ada edit yang dibuat." @@ -2341,11 +2352,11 @@ msgstr "Belum ada pengguna yang ditanda." msgid "No further updates" msgstr "Tiada kemaskini baru." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2353,12 +2364,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Tiada keputusan." -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n" " your config file is not pointing to a live MapIt service." @@ -2375,15 +2386,15 @@ msgstr "Tiada penyokong" msgid "None" msgstr "Tiada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any <strong>area</strong>.<br>\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" " Authorised staff users can be associated with the body they represent.<br>\n" @@ -2403,13 +2414,13 @@ msgstr "Belum dilaporkan" msgid "Not reported to council" msgstr "Tidak dilaporkan kepada majlis" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "ta:" @@ -2433,15 +2444,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2449,16 +2460,16 @@ msgstr "" msgid "Old state" msgstr "Keadaan lama" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2469,7 +2480,7 @@ msgstr "" msgid "Open" msgstr "Terbuka" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2477,7 +2488,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 untuk pelayan FixMyStreet mySociety" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2509,17 +2520,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Lain-lain" @@ -2544,8 +2555,8 @@ msgstr "Pemilik" msgid "Page Not Found" msgstr "Laman Tidak Dijumpai" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Induk" @@ -2559,19 +2570,19 @@ msgstr "Separa" msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2591,17 +2602,16 @@ msgstr "Nombor telefon (tidak diwajibkan)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2612,6 +2622,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2626,7 +2637,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2655,11 +2666,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Letakkan pin atas peta" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please <a href=\"#%s\">check their changes</a> and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Sila bersopan, ringkas dan tepat." @@ -2676,7 +2691,7 @@ msgstr "Sila periksa kata laluan dan cuba lagi" msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2684,11 +2699,11 @@ msgstr "Sila periksa sama ada alamat emel anda adalah betul" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Sila pilihkan kategori" @@ -2697,8 +2712,9 @@ msgstr "Sila pilihkan kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2714,13 +2730,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2728,90 +2744,90 @@ msgstr "Sila masukkan pesanan" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Sila masukkan kata laluan" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Silah masukkan emel yang benar" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Sila masukkan perincian" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Sila masukkan emel anda" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Sila masukkan nama anda" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Sila masukkan nombor telefon anda" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Sila masukkan nama kedua anda" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Sila masukkan tajuk anda" @@ -2839,7 +2855,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2865,11 +2881,11 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2905,16 +2921,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Sila tuliskan pesanan" @@ -2950,12 +2966,12 @@ msgstr "" msgid "Previous" msgstr "Sebelumnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2969,14 +2985,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Peribadi" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Masalah" @@ -2999,7 +3019,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -3007,7 +3027,7 @@ msgstr "Masalah ditanda sebagai terbukan" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Masalah-masalah" @@ -3032,7 +3052,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3057,8 +3077,8 @@ msgstr "" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Sediakan kemas kini" @@ -3084,7 +3104,7 @@ msgstr "" msgid "Public response:" msgstr "Tindak balas awam:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3109,6 +3129,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Soalan selidik %d dihantar untuk masalah %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" @@ -3132,11 +3153,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %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:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" @@ -3144,7 +3165,7 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3164,6 +3185,14 @@ msgstr "Feed RSS untuk masalah tempatan baru-baru ini" msgid "RSS feed of updates to this problem" msgstr "Feed RSS untuk kemas kini bagi masalah ini" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3183,11 +3212,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Masalah yang dilaporkan baru-baru ini" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3199,7 +3228,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3213,9 +3242,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3241,20 +3270,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3264,7 +3293,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3298,17 +3327,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3352,28 +3382,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3385,7 +3415,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3397,15 +3427,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3413,11 +3443,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's <strong>reputation</strong> is at or above this value. Set to <strong>0</strong> if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3457,20 +3487,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3482,15 +3512,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3501,23 +3531,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3526,12 +3556,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3541,7 +3571,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3550,7 +3581,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3560,7 +3591,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3576,17 +3607,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Pilihkan badan" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Pilihkan kawasan" @@ -3606,15 +3638,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3623,7 +3655,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3650,7 +3682,7 @@ msgstr "Servis:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3659,9 +3691,9 @@ msgid "Share" msgstr "Kongsi" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3669,15 +3701,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3689,7 +3721,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" @@ -3701,21 +3733,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3758,8 +3790,8 @@ msgstr "Log keluar" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3774,6 +3806,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3791,7 +3831,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3813,7 +3853,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3823,15 +3863,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3839,31 +3879,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3876,14 +3917,14 @@ msgstr "" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3899,7 +3940,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3912,7 +3953,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3920,12 +3961,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Bahagian bawah/Badan" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Tajuk" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Tajuk:" @@ -3943,7 +3984,7 @@ msgstr "Hantar" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3964,7 +4005,8 @@ msgstr "Dihantarkan" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Melanggan" @@ -3972,21 +4014,29 @@ msgstr "Melanggan" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4006,11 +4056,11 @@ msgstr "Laporan ringkasan" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform <strong>all actions</strong> within the admin." msgstr "" @@ -4028,8 +4078,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4039,7 +4089,7 @@ msgstr "" msgid "Text" msgstr "Teks" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versi teks sahaja" @@ -4083,7 +4133,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4097,11 +4147,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4113,53 +4163,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The <strong>group</strong> is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." @@ -4169,8 +4219,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." @@ -4185,12 +4235,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4236,7 +4286,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4257,20 +4307,20 @@ msgstr "" msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." @@ -4282,7 +4332,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4290,8 +4344,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4313,7 +4367,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4330,8 +4384,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" " <strong>You don't need to set them if the Send Method is email.</strong>.\n" @@ -4340,7 +4394,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4358,36 +4412,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 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:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 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:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4404,7 +4457,11 @@ msgstr "" msgid "This is the <strong>public</strong> text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4420,12 +4477,16 @@ msgstr "Masalah ini belum diselesai" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." @@ -4446,7 +4507,7 @@ msgstr "Laporan ini ditanda sebagai terbuka sekarang." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna." @@ -4457,7 +4518,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -4495,7 +4556,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Melihat lokasi tepat atas peta bagi isu ini" @@ -4524,34 +4585,34 @@ msgstr "" msgid "Total" msgstr "Jumlah" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Cuba lagi" @@ -4570,16 +4631,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4597,7 +4658,7 @@ msgstr "Jenis pemberitahuan tak diketahui" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Ralat tidak diketahui" @@ -4610,7 +4671,7 @@ msgstr "Ralat tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4623,7 +4684,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Kemas kini" @@ -4632,16 +4693,16 @@ msgstr "Kemas kini" msgid "Update %s created for problem %d; by %s" msgstr "Kemaskini %s dibuat untuk masalah %d; oleh %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Kemas kini badan" @@ -4666,7 +4727,7 @@ msgstr "Kemas kini menanda masalah sebagai diselesai" msgid "Update reopened problem" msgstr "Kemas kini masalah dibuka semula" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Status kemas kini" @@ -4684,14 +4745,14 @@ msgstr "" msgid "Updated by <strong>%s</strong> at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Dikemas kinikan!" @@ -4716,12 +4777,12 @@ msgstr "Kemas kini atas {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use <strong>confirmed</strong> to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4731,15 +4792,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4748,48 +4809,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Pengguna ditanda" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4798,20 +4859,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Pengguna" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Nilai dikemaskinikan" @@ -4845,12 +4906,12 @@ msgstr "Melihat laporan dengan kawasan pentadbiran" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Melihat lokasi" @@ -4885,7 +4946,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka" @@ -4900,7 +4961,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgid "We will only use your personal information in accordance with our <a href=\"%s\">privacy policy.</a>" msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4915,8 +4976,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Bila diedit" @@ -4936,14 +5001,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." msgstr "" @@ -4964,15 +5025,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4981,20 +5046,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ya" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5002,7 +5066,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5015,7 +5079,7 @@ msgstr "" msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5023,7 +5087,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -5041,15 +5105,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Anda menolak; sila isikan kotak di atas" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5115,7 +5179,7 @@ msgstr "" msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." msgstr "Anda perlu <a href=\"%s\">tambah badan</a>(seperti majlis atau jabatan) sebelum laporan mana-mana boleh dihantar." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5140,9 +5204,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emel Anda" @@ -5158,10 +5223,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" -msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita" +msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Nama anda" @@ -5177,7 +5242,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5200,7 +5265,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Nombor telefon anda" @@ -5225,7 +5290,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5242,25 +5307,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5294,8 +5358,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "edit pengguna" @@ -5304,12 +5368,12 @@ msgstr "edit pengguna" msgid "from %s different users" msgstr "dari %s pengguna lain" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "kemaskini yang lepas %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "kurang dari seminit" @@ -5320,7 +5384,7 @@ msgid "n/a" msgstr "tiada" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5360,7 +5424,7 @@ msgstr "pemasukan asal: “%s”" msgid "other areas:" msgstr "kawasan lain:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5368,7 +5432,7 @@ msgstr "" msgid "sign out" msgstr "log keluar" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" @@ -5385,19 +5449,19 @@ msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "jenis masalah tempatan ini" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5413,11 +5477,11 @@ msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d" msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5426,31 +5490,31 @@ msgstr "" msgid "ward" msgstr "kawasan pentadbiran" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d hari" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minit" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,13 +5526,13 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d penyokong" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d minggu" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5528,7 +5592,7 @@ msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" msgstr[0] "<big>%s</big> laporan dikemaskini" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5546,7 +5610,7 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" |