aboutsummaryrefslogtreecommitdiffstats
path: root/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po')
-rw-r--r--locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po1617
1 files changed, 938 insertions, 679 deletions
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9aaf9f886..96c034e19 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2017-09-13 15:40+0100\n"
+"POT-Creation-Date: 2017-12-15 17:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: mySociety <transifex@mysociety.org>, 2017\n"
"Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:632
-#: perllib/FixMyStreet/Script/Reports.pm:197
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
+#: perllib/FixMyStreet/Script/Reports.pm:196
msgid " and "
msgstr " dan "
@@ -32,6 +32,10 @@ msgstr " dan "
msgid " or "
msgstr " atau "
+#: templates/web/base/report/_inspect.html:152
+msgid "%d characters maximum"
+msgstr ""
+
#: templates/web/base/admin/edit-league.html:12
msgid "%d edits by %s"
msgstr "%d suntingan daripada %s"
@@ -64,7 +68,7 @@ msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
msgstr "%s cara hubungan majlis &ndash; %s disahkan, %s belum disah"
#. ("%s is the site name")
-#: templates/web/base/alert/index.html:7
+#: templates/web/base/alert/index.html:8
msgid ""
"%s has a variety of RSS feeds and email alerts for local\n"
"problems, including alerts for all problems within a particular ward, or all\n"
@@ -72,7 +76,7 @@ msgid ""
msgstr ""
#. ("%s is the site name")
-#: templates/web/base/alert/index.html:11
+#: templates/web/base/alert/index.html:12
msgid ""
"%s has a variety of RSS feeds and email alerts for local problems, including\n"
"alerts for all problems within a particular ward or council, or all problems\n"
@@ -83,6 +87,11 @@ msgstr ""
msgid "%s live updates"
msgstr "%s update secara langsung"
+#: templates/web/base/dashboard/index.html:159
+#: templates/web/base/dashboard/index.html:163
+msgid "%s opened, %s closed, %s fixed"
+msgstr ""
+
#: templates/web/base/status/stats.html:25
msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
msgstr "%s soalan selidik dihantar &ndash; %s dijawabi (%s%%)"
@@ -91,7 +100,7 @@ msgstr "%s soalan selidik dihantar &ndash; %s dijawabi (%s%%)"
msgid "%s ref:&nbsp;%s"
msgstr "%s ruj;&nbsp;%s"
-#: perllib/FixMyStreet/Map/OSM.pm:38
+#: perllib/FixMyStreet/Map/OSM.pm:44
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr ""
@@ -99,11 +108,6 @@ msgstr ""
msgid "(Defect &amp; location of defect)"
msgstr ""
-#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users.html:32
-msgid "(Email in abuse table)"
-msgstr "(Emel dalam jadual penyalahguna)"
-
#: templates/web/zurich/admin/report_edit-sdm.html:62
#: templates/web/zurich/admin/report_edit.html:90
msgid "(No name)"
@@ -139,7 +143,7 @@ msgstr ""
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)"
-#: templates/web/base/reports/index.html:69
+#: templates/web/base/reports/index.html:82
msgid "(no longer exists)"
msgstr ""
@@ -161,8 +165,8 @@ msgstr "(hantar kepada kedua-dua)"
msgid "(we also have RSS feeds for problems within %s)"
msgstr "Feed RSS untuk masalah dalam %s"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:245
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:674
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:252
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:688
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
msgid "-- Pick a category --"
msgstr "-- Pilih kategori --"
@@ -175,14 +179,6 @@ msgstr ""
msgid "10 inch pothole on Example St, near post box"
msgstr ""
-#: templates/web/base/dashboard/index.html:153
-msgid "14-30 days old"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:152
-msgid "7-14 days old"
-msgstr ""
-
#: templates/web/base/admin/body-form.html:50
#: templates/web/base/admin/body-form.html:51
msgid ""
@@ -194,16 +190,16 @@ msgstr ""
"Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
"Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
-#: templates/web/base/dashboard/index.html:15
+#: templates/web/base/dashboard/index.html:18
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:48
+#: templates/web/base/reports/_list-filters.html:56
msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
msgstr ""
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:78
msgid "<span>%s</span> saved."
msgstr ""
@@ -212,33 +208,52 @@ msgstr ""
msgid "<strong>%s</strong> live problems"
msgstr "<strong>%s</strong> masalah"
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:2
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:5
msgid "<strong>No</strong> Let me confirm my report by email"
msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel"
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:2
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:3
+#, fuzzy
+msgid "<strong>No</strong> Let me confirm my report by email/text"
+msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel"
+
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:5
msgid "<strong>No</strong> Let me confirm my update by email"
msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
-#: templates/web/base/auth/general.html:106
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:3
+#, fuzzy
+msgid "<strong>No</strong> Let me confirm my update by email/text"
+msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
+
+#: templates/web/base/auth/general.html:110
#: templates/web/zurich/auth/general.html:51
msgid "<strong>No</strong> let me sign in by email"
msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
-#: templates/web/base/report/_inspect.html:170
+#: templates/web/base/auth/general.html:108
+#, fuzzy
+msgid "<strong>No</strong> let me sign in by email or text"
+msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
+
+#: templates/web/base/report/_inspect.html:177
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:172
+#: templates/web/base/report/_inspect.html:179
msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
msgstr ""
-#: templates/web/base/auth/general.html:82
+#: templates/web/base/auth/general.html:79
#: templates/web/base/report/new/form_user_loggedout_password.html:3
#: templates/web/base/report/update/form_user_loggedout_password.html:2
msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>Ya</strong> Aku ada kata laluan"
+#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50
+msgid "Add"
+msgstr ""
+
#: templates/web/base/admin/body-form.html:3
#: templates/web/base/admin/body-form.html:4
msgid ""
@@ -252,11 +267,17 @@ 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:140
-#: templates/web/zurich/admin/body-form.html:52
+#: templates/web/base/admin/body-form.html:139
+#: templates/web/zurich/admin/body-form.html:51
msgid "Add body"
msgstr "Tambah badan"
+#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:7
+#, fuzzy
+msgid "Add email address"
+msgstr "Melarang alamat emel"
+
#: templates/web/base/admin/reportextrafields/index.html:24
msgid "Add extra fields"
msgstr ""
@@ -279,11 +300,17 @@ msgstr "Tambah kategori baru"
msgid "Add option"
msgstr "(tidak diwajibkan)"
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:7
+#, fuzzy
+msgid "Add phone number"
+msgstr "Nombor telefon anda"
+
#: templates/web/base/report/_item.html:10
#: templates/web/base/report/_item.html:16
-#: templates/web/base/report/_main.html:140
-#: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:30
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:15
+#: templates/web/base/report/_main.html:26
msgid "Add to shortlist"
msgstr ""
@@ -293,23 +320,23 @@ msgstr ""
msgid "Add user"
msgstr "Tambah pengguna"
-#: perllib/FixMyStreet/Cobrand/Default.pm:735
+#: perllib/FixMyStreet/Cobrand/Default.pm:718
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:737
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:736
+#: perllib/FixMyStreet/Cobrand/Default.pm:719
msgid "Add/edit response templates"
msgstr ""
-#: templates/web/base/my/my.html:67
+#: templates/web/base/my/my.html:109
msgid "Added %s"
msgstr "%s telah ditambahi"
-#: templates/web/base/report/_main.html:149
+#: templates/web/base/report/_main.html:141
msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
msgstr ""
@@ -333,9 +360,10 @@ msgstr "Pemberitahuan %d dihenti (dibuat pada %s)"
msgid "Alert me to future updates"
msgstr "Maklumkan aku sebarang kemas kini masa depan"
-#: templates/web/base/dashboard/index.html:138
-#: templates/web/base/dashboard/index.html:21
#: 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:63
#: templates/web/base/reports/_list-filters.html:3
msgid "All"
msgstr ""
@@ -344,12 +372,13 @@ msgstr ""
msgid "All Reports"
msgstr "Semua Laporan"
-#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/admin/stats/index.html:5
msgid "All Reports as CSV"
msgstr ""
#: templates/web/base/admin/category-multiselect.html:5
#: templates/web/base/admin/responsepriorities/list.html:20
+#: templates/web/base/admin/templates.html:19
msgid "All categories"
msgstr ""
@@ -365,17 +394,17 @@ msgstr ""
#: templates/web/base/main_nav_items.html:0
#: templates/web/base/main_nav_items.html:27
#: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20
+#: templates/web/zurich/admin/stats/index.html:13
+#: templates/web/zurich/footer.html:20
#: templates/web/zurich/nav_over_content.html:6
msgid "All reports"
msgstr "Semua laporan"
-#: templates/web/base/admin/stats.html:5
-#: templates/web/zurich/admin/stats.html:8
+#: templates/web/zurich/admin/stats/index.html:8
msgid "All reports between %s and %s"
msgstr "Semua laporan antara %s dan %s"
-#: templates/web/base/reports/index.html:23
+#: templates/web/base/reports/index.html:25
msgid "All time"
msgstr ""
@@ -413,7 +442,8 @@ msgid "Are you sure you want to cancel this upload?"
msgstr ""
#: templates/web/base/admin/report_edit.html:84
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/admin/template_edit.html:75
+#: templates/web/base/js/translation_strings.html:73
#: templates/web/base/report/display_tools.html:6
msgid "Are you sure?"
msgstr ""
@@ -424,7 +454,7 @@ msgstr ""
msgid "Area covered"
msgstr "Kawasan dilintungi"
-#: templates/web/base/admin/user-form.html:64
+#: templates/web/base/admin/user-form.html:82
msgid "Area:"
msgstr ""
@@ -438,7 +468,7 @@ msgid "Assign to competent body:"
msgstr ""
#: templates/web/zurich/admin/report_edit.html:169
-#: templates/web/zurich/admin/stats.html:36
+#: templates/web/zurich/admin/stats/index.html:36
msgid "Assign to different category:"
msgstr "Ditugaskan kepada kategori lain:"
@@ -450,7 +480,7 @@ msgstr "Ditugaskan kepada badan luaran:"
msgid "Assign to subdivision:"
msgstr "Ditugaskan kepada bahagian bawah:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
msgid "Assign users to areas"
msgstr ""
@@ -466,12 +496,17 @@ msgstr ""
msgid "At the moment only searching for and looking at reports work."
msgstr ""
-#: templates/web/base/admin/user-form.html:78
-#: templates/web/base/admin/user-form.html:79
+#: templates/web/base/admin/user-form.html:96
+#: templates/web/base/admin/user-form.html:97
msgid "Authorised staff users can be associated with the categories in which they operate."
msgstr ""
-#: templates/web/base/admin/template_edit.html:22
+#: templates/web/base/admin/templates.html:9
+#, fuzzy
+msgid "Auto Response"
+msgstr "Tidak Bertanggungjawab"
+
+#: templates/web/base/admin/template_edit.html:64
msgid "Auto-response:"
msgstr ""
@@ -479,18 +514,10 @@ msgstr ""
msgid "Available categories"
msgstr ""
-#: templates/web/base/reports/index.html:84
+#: templates/web/base/reports/index.html:112
msgid "Average time between a problem being reported and being fixed, last 100 reports."
msgstr ""
-#: templates/web/base/dashboard/index.html:109
-msgid "Average time to council marking fixed (days)"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:117
-msgid "Average time to first council state change (days)"
-msgstr ""
-
#: templates/web/base/report/new/after_photo.html:6
msgid "Avoid personal information and vehicle number plates"
msgstr ""
@@ -504,20 +531,21 @@ msgstr "Mengunggu penyederhanaan"
msgid "Back"
msgstr "Balik"
-#: templates/web/base/report/_main.html:6
+#: templates/web/base/report/_main.html:2
msgid "Back to all reports"
msgstr ""
#: templates/web/base/admin/report_blocks.html:18
-msgid "Ban email address"
-msgstr "Melarang alamat emel"
+#, fuzzy
+msgid "Ban user"
+msgstr "Tanda pengguna"
-#: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:734
+#: perllib/FixMyStreet/Cobrand/Default.pm:633
+#: perllib/FixMyStreet/Cobrand/Default.pm:717
#: perllib/FixMyStreet/Cobrand/Zurich.pm:396
#: templates/web/base/admin/bodies.html:1
#: templates/web/base/admin/report_edit.html:55
-#: templates/web/zurich/header.html:56
+#: templates/web/zurich/header.html:50
msgid "Bodies"
msgstr "Badan"
@@ -528,14 +556,10 @@ msgstr "Badan"
msgid "Body"
msgstr "Badan"
-#: templates/web/base/admin/user-form.html:36
+#: templates/web/base/admin/user-form.html:54
msgid "Body:"
msgstr "Badan:"
-#: templates/web/base/admin/stats.html:87
-msgid "By Date"
-msgstr "Dengan Tarikh"
-
#: templates/web/base/admin/extra-metadata-form.html:36
msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
msgstr ""
@@ -548,8 +572,9 @@ msgstr ""
msgid "Can't see the map? <em>Skip this step</em>"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:650
+#: perllib/FixMyStreet/Cobrand/Default.pm:633
#: templates/web/base/admin/responsepriorities/list.html:8
+#: templates/web/base/admin/templates.html:7
msgid "Categories"
msgstr ""
@@ -560,30 +585,36 @@ msgstr ""
#: templates/web/base/admin/body.html:72
#: templates/web/base/admin/contact-form.html:19
-#: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:48
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:99
+#: templates/web/base/report/_inspect.html:54
#: templates/web/base/report/_item.html:92
-#: templates/web/base/report/new/category.html:6
+#: templates/web/base/report/new/category.html:12
#: templates/web/base/report/new/category_wrapper.html:3
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
#: templates/web/zurich/admin/reports.html:13
-#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/admin/stats/index.html:50
msgid "Category"
msgstr "Kategori"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:956
+#: templates/web/base/dashboard/index.html:102
+#, fuzzy
+msgid "Category and State"
+msgstr "Kategori"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:975
msgid "Category changed from ‘%s’ to ‘%s’"
msgstr ""
-#: templates/web/base/admin/stats.html:58
-#: templates/web/base/admin/stats_fix_rate.html:1
+#: templates/web/base/admin/stats/fix_rate.html:1
+#: templates/web/base/admin/stats/index.html:6
msgid "Category fix rate for problems > 4 weeks old"
msgstr "Kategori rata masalah diselesai > 4 minggu"
#: templates/web/base/admin/report_edit.html:119
-#: templates/web/base/dashboard/index.html:29
+#: templates/web/base/dashboard/index.html:39
#: templates/web/zurich/admin/body.html:43
#: templates/web/zurich/admin/contact-form.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -591,17 +622,17 @@ msgstr "Kategori rata masalah diselesai > 4 minggu"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/Script/Reports.pm:188
+#: perllib/FixMyStreet/Script/Reports.pm:187
msgid "Category: %s"
msgstr "Kategori: %s"
-#: templates/web/base/my/my.html:24
-msgid "Change email"
+#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44
+#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
+msgid "Change"
msgstr ""
#: templates/web/base/auth/change_email.html:1
#: templates/web/base/auth/change_email.html:3
-#: templates/web/base/auth/change_email.html:30
msgid "Change email address"
msgstr ""
@@ -609,10 +640,16 @@ msgstr ""
#: templates/web/base/auth/change_password.html:16
#: templates/web/base/auth/change_password.html:4
#: templates/web/base/auth/change_password.html:43
-#: templates/web/base/my/my.html:23
+#: templates/web/base/my/my.html:63
msgid "Change password"
msgstr "Menukar Kata Laluan"
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:3
+#, fuzzy
+msgid "Change phone number"
+msgstr "Nombor telefon anda"
+
#: templates/web/base/admin/contact-form.html:80
msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
msgstr ""
@@ -634,19 +671,14 @@ msgid ""
" 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:103
+#: templates/web/base/report/_inspect.html:109
msgid "Choose another"
msgstr ""
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:72
msgid "Clear offline data"
msgstr ""
-#: templates/web/base/admin/stats.html:72
-#: templates/web/base/admin/stats.html:78
-msgid "Click here or enter as dd/mm/yyyy"
-msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy"
-
#: templates/web/base/around/_report_banner.html:2
msgid "Click map to report a problem"
msgstr "Klik peta untuk melaporkan masalah"
@@ -674,18 +706,19 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134
#: perllib/FixMyStreet/Cobrand/Zurich.pm:194
#: perllib/FixMyStreet/Cobrand/Zurich.pm:965
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:11
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
#: templates/web/base/admin/states/index.html:103
#: templates/web/base/admin/states/index.html:27
#: templates/web/base/admin/states/index.html:33
+#: templates/web/base/dashboard/index.html:112
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:16
-#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/admin/stats/index.html:31
msgid "Closed"
msgstr "Ditutup"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:826
+#: perllib/FixMyStreet/DB/Result/Problem.pm:844
msgid "Closed by council"
msgstr "Ditutup oleh majlis"
@@ -700,16 +733,17 @@ msgid "Cobrand"
msgstr "Cobrand"
#: templates/web/base/admin/report_edit.html:92
-#: templates/web/base/admin/update_edit.html:52
+#: templates/web/base/admin/update_edit.html:54
msgid "Cobrand data:"
msgstr "Data Cobrand"
#: templates/web/base/admin/report_edit.html:91
-#: templates/web/base/admin/update_edit.html:51
+#: templates/web/base/admin/update_edit.html:53
msgid "Cobrand:"
msgstr "Cobrand:"
#: templates/web/base/admin/extra-metadata-form.html:14
+#: templates/web/base/auth/smsform.html:24
msgid "Code"
msgstr ""
@@ -717,7 +751,7 @@ msgstr ""
msgid "Collapse map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:646
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr "Konfigurasi"
@@ -726,7 +760,7 @@ msgstr "Konfigurasi"
msgid "Confirm"
msgstr "Sah"
-#: templates/web/base/auth/token.html:1
+#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
msgid "Confirm account"
msgstr "Mengesahkan Akaun"
@@ -745,14 +779,10 @@ msgstr "Pengesahan"
#: templates/web/base/admin/contact-form.html:56
#: templates/web/zurich/admin/contact-form.html:12
-#: templates/web/zurich/admin/stats.html:40
+#: templates/web/zurich/admin/stats/index.html:40
msgid "Confirmed"
msgstr "Disahkan"
-#: templates/web/base/admin/stats.html:5
-msgid "Confirmed reports between %s and %s"
-msgstr "Laporan disahkan antara %s dan %s"
-
#: templates/web/base/admin/list_updates.html:39
#: templates/web/base/admin/problem_row.html:36
#: templates/web/base/admin/report_edit.html:78
@@ -779,8 +809,8 @@ msgstr "Menghubungi pasukan"
msgid "Coordinates:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1773
#: perllib/FixMyStreet/App/Controller/Admin.pm:1801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1830
msgid "Could not find user"
msgstr "Tidak dapat mencari pengguna"
@@ -798,43 +828,16 @@ msgstr "Majlis"
msgid "Council contacts for %s"
msgstr "Hubungan Majlis untuk %s"
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:83
-msgid "Council has marked as closed"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:57
-msgid "Council has marked as fixed"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:80
-msgid "Council has marked as in progress"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:82
-msgid "Council has marked as investigating"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:81
-msgid "Council has marked as planned"
-msgstr ""
-
#: templates/web/base/report/_council_sent_info.html:6
msgid "Council ref:&nbsp;%s"
msgstr "Rujukan majlis:&nbsp;%s"
-#: templates/web/base/admin/stats.html:92
+#: templates/web/base/dashboard/index.html:50
msgid "Council:"
msgstr "Majlis:"
-#: templates/web/base/admin/stats.html:12
-#: templates/web/base/admin/stats.html:32
-#: templates/web/zurich/admin/stats.html:45
-#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/admin/stats/index.html:45
+#: templates/web/zurich/admin/stats/index.html:50
msgid "Count"
msgstr "Kiraan"
@@ -856,39 +859,44 @@ msgstr "Kategori baru"
msgid "Create priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
msgid "Create reports/updates as anonymous user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:719
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
msgid "Create reports/updates as the council"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:717
+#: perllib/FixMyStreet/Cobrand/Default.pm:700
msgid "Create reports/updates on a user's behalf"
msgstr ""
-#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/admin/template_edit.html:71
#: templates/web/zurich/admin/template_edit.html:29
msgid "Create template"
msgstr ""
#: templates/web/base/admin/problem_row.html:34
-#: templates/web/base/admin/templates.html:12
+#: templates/web/zurich/admin/templates.html:10
msgid "Created"
msgstr "Diwujudkan"
#: templates/web/base/admin/list_updates.html:38
#: templates/web/base/admin/report_edit.html:77
-#: templates/web/base/admin/update_edit.html:53
+#: templates/web/base/admin/update_edit.html:55
#: templates/web/zurich/admin/update_edit.html:29
msgid "Created:"
msgstr "Diwujudkan:"
-#: templates/web/base/admin/stats.html:31
-msgid "Current state"
+#: templates/web/base/auth/generate_token.html:27
+#, fuzzy
+msgid "Current token:"
msgstr "Keadaan semasa"
+#: templates/web/base/dashboard/index.html:91
+msgid "Currently grouped by %s"
+msgstr ""
+
#: templates/web/base/admin/bodies.html:9
#: templates/web/base/admin/index.html:17
msgid "Currently no bodies have been created."
@@ -899,14 +907,14 @@ msgstr "Belum ada badan wujud pada masa kini."
msgid "Customer not contactable"
msgstr ""
-#: templates/web/base/dashboard/index.html:5
#: templates/web/base/dashboard/index.html:7
+#: templates/web/base/dashboard/index.html:9
#: templates/web/base/reports/index.html:15
#: templates/web/base/reports/index.html:18
msgid "Dashboard"
msgstr "Papan pemuka"
-#: templates/web/zurich/admin/stats.html:35
+#: templates/web/zurich/admin/stats/index.html:35
msgid "Dealt with by subdivision within 5 working days"
msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
@@ -918,12 +926,12 @@ msgstr ""
msgid "Default priority"
msgstr ""
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:78
msgid "Defect type"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1078
-#: templates/web/base/admin/template_edit.html:50
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1104
+#: templates/web/base/admin/template_edit.html:75
#: templates/web/zurich/admin/template_edit.html:33
msgid "Delete template"
msgstr ""
@@ -934,8 +942,8 @@ msgstr ""
msgid "Deleted"
msgstr "Dipadam"
-#: templates/web/base/report/_main.html:114
-#: templates/web/base/report/update.html:68
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:71
msgid "Describe why you are moderating this"
msgstr ""
@@ -951,6 +959,10 @@ msgstr "Huraian"
msgid "Description:"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Report.pm:350
+msgid "Detailed information is limited to %d characters."
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:33
#: templates/web/zurich/report/new/fill_in_details_form.html:45
msgid "Details"
@@ -963,6 +975,10 @@ msgstr "Perincian"
msgid "Details:"
msgstr "Perincian:"
+#: templates/web/base/dashboard/index.html:103
+msgid "Device and Site"
+msgstr ""
+
#: templates/web/base/admin/body.html:92
msgid "Devolved"
msgstr "Didelegasikan"
@@ -976,8 +992,8 @@ msgstr ""
msgid "Diligency prize league table"
msgstr "Jadual liga hadiah ketekunan"
-#: templates/web/base/report/_main.html:118
-#: templates/web/base/report/update.html:70
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:73
msgid "Discard changes"
msgstr ""
@@ -986,7 +1002,7 @@ msgid "Do not send email alerts on fetched comments to problem creator"
msgstr ""
#. ("%s is the site name")
-#: templates/web/base/auth/general.html:60
+#: templates/web/base/auth/general.html:57
#: templates/web/base/report/new/form_user_loggedout.html:25
#: templates/web/base/report/new/oauth_email_form.html:18
#: templates/web/base/report/update-form.html:30
@@ -994,7 +1010,7 @@ msgstr ""
msgid "Do you have a %s password?"
msgstr ""
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:93
msgid "Do you want to automatically raise a defect?"
msgstr ""
@@ -1014,11 +1030,11 @@ msgstr ""
msgid "Drag and drop photos here or <u>click to upload</u>"
msgstr ""
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:104
msgid "Duplicate of"
msgstr ""
-#: templates/web/base/report/_inspect.html:108
+#: templates/web/base/report/_inspect.html:114
msgid "Duplicates"
msgstr ""
@@ -1038,9 +1054,10 @@ msgstr ""
#: templates/web/base/admin/list_updates.html:42
#: templates/web/base/admin/problem_row.html:41
#: templates/web/base/admin/responsepriorities/list.html:28
-#: templates/web/base/admin/templates.html:22
+#: templates/web/base/admin/templates.html:28
#: templates/web/base/admin/users.html:34
#: templates/web/zurich/admin/problem_row.html:48
+#: templates/web/zurich/admin/templates.html:20
msgid "Edit"
msgstr "Menyunting"
@@ -1050,33 +1067,33 @@ msgstr "Menyunting"
msgid "Edit body details"
msgstr "Edit perincian badah"
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
msgid "Edit other users' details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
msgid "Edit other users' permissions"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
msgid "Edit report category"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
msgid "Edit report priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
msgid "Edit reports"
msgstr ""
#: templates/web/base/admin/report_edit.html:0
#: templates/web/base/admin/report_edit.html:14
-#: templates/web/base/admin/report_edit.html:4
+#: templates/web/base/admin/report_edit.html:5
#: templates/web/zurich/admin/report_edit-sdm.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:5
+#: templates/web/zurich/admin/report_edit-sdm.html:6
#: templates/web/zurich/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit.html:5
+#: templates/web/zurich/admin/report_edit.html:6
msgid "Editing problem %d"
msgstr "Sedang edit masalah %d"
@@ -1097,7 +1114,6 @@ msgstr "Editor"
#: templates/web/base/admin/category_edit.html:28
#: templates/web/base/admin/flagged.html:38
#: templates/web/base/admin/users.html:17
-#: templates/web/base/auth/general.html:51
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:15
#: templates/web/zurich/auth/general.html:24
@@ -1105,17 +1121,20 @@ msgstr "Editor"
msgid "Email"
msgstr "Emel"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1749
-msgid "Email added to abuse list"
-msgstr "Emel ditambahkan kepada senarai penyalahguna"
-
#: templates/web/base/admin/contact-form.html:38
#: templates/web/base/alert/_list.html:74
-#: templates/web/base/report/new/form_user_loggedin.html:32
+#: templates/web/base/auth/change_email.html:37
+#: templates/web/base/report/new/form_user_loggedin.html:38
#: templates/web/base/report/update/form_name.html:23
msgid "Email address"
msgstr ""
+#: templates/web/base/report/new/form_user_loggedin.html:71
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:34
+#, fuzzy
+msgid "Email address (optional)"
+msgstr "Kata Laluan (tidah diwajibkan)"
+
#: templates/web/base/tokens/confirm_alert.html:6
msgid "Email alert created"
msgstr ""
@@ -1124,19 +1143,18 @@ msgstr ""
msgid "Email alert deleted"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1746
-msgid "Email already in abuse list"
-msgstr "Emel telah dalam senarai penyalahguna"
+#: templates/web/base/admin/user-form.html:22
+msgid "Email verified:"
+msgstr ""
-#: templates/web/base/admin/report_edit.html:129
-#: templates/web/base/admin/update_edit.html:35
-#: templates/web/base/admin/user-form.html:19
+#: templates/web/base/admin/report_edit.html:138
+#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36
#: templates/web/zurich/admin/body.html:48
#: templates/web/zurich/admin/contact-form.html:6
msgid "Email:"
msgstr "Emel:"
-#: perllib/FixMyStreet/Script/Reports.pm:112
+#: perllib/FixMyStreet/Script/Reports.pm:111
msgid "Email: %s"
msgstr "Emel: %s"
@@ -1149,16 +1167,17 @@ 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/body-form.html:123
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/stats.html:77
-msgid "End Date:"
+#: templates/web/base/dashboard/index.html:77
+#, fuzzy
+msgid "End Date"
msgstr "Tarikh Akhir:"
#: templates/web/base/admin/open311-form-fields.html:21
@@ -1179,14 +1198,14 @@ msgid "Enter a nearby postcode, or street name and area"
msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan"
#: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14
-#: templates/web/base/around/postcode_form.html:5
-#: templates/web/base/around/postcode_form.html:6
+#: templates/web/base/around/postcode_form.html:7
+#: templates/web/base/around/postcode_form.html:8
msgid "Enter a nearby street name and area"
msgstr "Masukkan nama jalan dan kawasan terdekat"
-#: templates/web/base/auth/general.html:118
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:35
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
+#: templates/web/base/auth/general.html:123
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:45
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:17
#: templates/web/zurich/auth/general.html:65
msgid "Enter a password"
msgstr "Masukkan kata laluan"
@@ -1204,8 +1223,8 @@ msgstr "Masukkan perincian masalah tersebut"
msgid "Error"
msgstr "Ralat"
-#: templates/web/base/reports/_list-filters.html:31
#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:47
msgid "Everything"
msgstr ""
@@ -1230,7 +1249,7 @@ msgstr ""
msgid "Explain what’s wrong"
msgstr ""
-#: templates/web/base/dashboard/index.html:147
+#: templates/web/base/dashboard/index.html:104
msgid "Export as CSV"
msgstr ""
@@ -1246,7 +1265,7 @@ msgstr ""
msgid "External ID"
msgstr ""
-#: templates/web/base/admin/body-form.html:89
+#: templates/web/base/admin/body-form.html:88
msgid "External URL"
msgstr ""
@@ -1258,7 +1277,7 @@ msgstr ""
msgid "External team"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:673
+#: perllib/FixMyStreet/Cobrand/Default.pm:656
#: templates/web/base/admin/reportextrafields/edit.html:1
#: templates/web/base/admin/reportextrafields/index.html:1
#, fuzzy
@@ -1270,7 +1289,7 @@ msgstr "Data tambahan:"
msgid "Extra data:"
msgstr "Data tambahan:"
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:150
#: templates/web/base/report/_item.html:108
msgid "Extra details"
msgstr ""
@@ -1300,21 +1319,22 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133
#: templates/web/base/admin/states/index.html:29
-#: templates/web/base/admin/stats_fix_rate.html:4
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:113
msgid "Fixed"
msgstr "Diselesai"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:62
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:66
msgid "Fixed - Council"
msgstr "Diselesai - Majlis"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:63
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:67
msgid "Fixed - User"
msgstr "Diselesai - Pengguna"
-#: templates/web/base/admin/body-form.html:97
+#: templates/web/base/admin/body-form.html:96
#: templates/web/base/admin/responsepriorities/edit.html:53
-#: templates/web/zurich/admin/body-form.html:36
+#: templates/web/zurich/admin/body-form.html:35
msgid "Flag as deleted"
msgstr "Tanda sebagai dipadam"
@@ -1322,7 +1342,7 @@ msgstr "Tanda sebagai dipadam"
msgid "Flag user"
msgstr "Tanda pengguna"
-#: perllib/FixMyStreet/Cobrand/Default.pm:644
+#: perllib/FixMyStreet/Cobrand/Default.pm:627
#: templates/web/base/admin/users.html:20
msgid "Flagged"
msgstr "Ditanda"
@@ -1331,7 +1351,7 @@ msgstr "Ditanda"
msgid "Flagged reports and users"
msgstr "Laporan dan pengguna ditanda"
-#: templates/web/base/admin/user-form.html:94
+#: templates/web/base/admin/user-form.html:112
msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
msgstr ""
@@ -1339,8 +1359,8 @@ msgstr ""
msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
msgstr ""
-#: templates/web/base/admin/report_edit.html:135
-#: templates/web/base/admin/user-form.html:100
+#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/user-form.html:118
msgid "Flagged:"
msgstr "Ditanda:"
@@ -1360,7 +1380,7 @@ msgstr ""
msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
msgstr "Untuk maklumat lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>."
-#: templates/web/base/auth/general.html:97
+#: templates/web/base/auth/general.html:94
#: templates/web/base/report/new/form_user_loggedout_password.html:20
#: templates/web/base/report/update/form_user_loggedout_password.html:19
msgid "Forgotten your password?"
@@ -1380,8 +1400,12 @@ msgstr ""
msgid "Frequently Asked Questions"
msgstr "Soalan lazim"
-#: templates/web/base/admin/stats.html:102
-msgid "Get Count"
+#: templates/web/base/auth/generate_token.html:1
+#: templates/web/base/auth/generate_token.html:2
+#: templates/web/base/auth/generate_token.html:20
+#: templates/web/base/auth/generate_token.html:33
+#: templates/web/base/my/my.html:65
+msgid "Generate token"
msgstr ""
#: templates/web/base/around/_updates.html:3
@@ -1414,12 +1438,12 @@ msgstr ""
#: templates/web/base/admin/index.html:28
#: templates/web/base/admin/index.html:34
#: templates/web/base/admin/index.html:49
-#: templates/web/base/alert/index.html:34
-#: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:49
-#: templates/web/base/reports/_list-filters.html:64
-#: templates/web/base/reports/index.html:75
-#: templates/web/zurich/admin/stats.html:26
+#: templates/web/base/alert/index.html:35
+#: templates/web/base/around/postcode_form.html:15
+#: templates/web/base/reports/_list-filters.html:57
+#: templates/web/base/reports/_list-filters.html:72
+#: templates/web/base/reports/index.html:89
+#: templates/web/zurich/admin/stats/index.html:26
msgid "Go"
msgstr "Pergi"
@@ -1427,7 +1451,7 @@ msgstr "Pergi"
msgid "Going to send questionnaire?"
msgstr "Teruskan dengan menghantar soalan selidik?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
msgid "Grant access to the admin"
msgstr ""
@@ -1435,6 +1459,15 @@ msgstr ""
msgid "Graph of problem creation by status over time"
msgstr "Graf masalah dibuat dengan status dari masa ke masa"
+#: templates/web/base/dashboard/index.html:93
+#, fuzzy
+msgid "Group by %s"
+msgstr "dari %s"
+
+#: templates/web/base/dashboard/index.html:98
+msgid "Group by:"
+msgstr ""
+
#: templates/web/base/questionnaire/index.html:48
msgid "Has this problem been fixed?"
msgstr "Adakan masalah ini telah diselesai?"
@@ -1455,21 +1488,26 @@ msgstr "Bantuan"
msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
msgstr ""
+#: templates/web/base/around/on_map_list_items.html:8
+#, fuzzy
+msgid "Here are some other nearby reports:"
+msgstr "Foto laporan terdekat baru-baru ini "
+
#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hi %s"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:911
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:60
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
-#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/stats/index.html:32
#: templates/web/zurich/admin/update_edit.html:18
msgid "Hidden"
msgstr "Tersembunyi"
-#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/_main.html:105
msgid "Hide entire report"
msgstr ""
@@ -1490,21 +1528,18 @@ msgstr ""
msgid "Hide my name on this report"
msgstr ""
-#: templates/web/base/around/display_location.html:67
-msgid "Hide old"
-msgstr "Sembunyikan lama"
-
-#: templates/web/base/around/display_location.html:62
+#: templates/web/base/around/display_location.html:60
+#: templates/web/base/around/display_location.html:68
#: templates/web/base/js/translation_strings.html:55
msgid "Hide pins"
msgstr "Sembunyikan pin"
-#: templates/web/base/report/update.html:15
+#: templates/web/base/report/update.html:13
msgid "Hide update completely?"
msgstr ""
#: templates/web/base/report/_report_meta_info.html:3
-#: templates/web/base/report/update.html:55
+#: templates/web/base/report/update.html:58
msgid "Hide your name?"
msgstr ""
@@ -1516,7 +1551,7 @@ msgstr ""
msgid "History"
msgstr "Sejarah"
-#: templates/web/base/around/display_location.html:75
+#: templates/web/base/around/display_location.html:73
msgid "Home"
msgstr "Home"
@@ -1573,12 +1608,20 @@ msgstr ""
msgid "If ticked the user won’t see an input field, just the ‘Description’ text."
msgstr ""
+#: templates/web/base/admin/template_edit.html:59
+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
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/auth/generate_token.html:39
+msgid "If you generate a new token the existing token will no longer work."
+msgstr ""
+
#: templates/web/base/questionnaire/completed.html:8
msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
msgstr ""
@@ -1587,7 +1630,7 @@ msgstr ""
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 ""
-#: templates/web/base/admin/template_edit.html:29
+#: templates/web/base/admin/template_edit.html:39
msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
msgstr ""
@@ -1596,7 +1639,7 @@ msgstr ""
msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
msgstr ""
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
msgstr ""
@@ -1668,11 +1711,7 @@ msgstr ""
msgid "Include reporter personal details"
msgstr "Termasuk perincian peribadi pelapor"
-#: templates/web/base/admin/stats.html:83
-msgid "Include unconfirmed reports"
-msgstr "Termasuk laporan yang belum disahkan"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:351
+#: perllib/FixMyStreet/App/Controller/Open311.pm:352
msgid "Incorrect has_photo value \"%s\""
msgstr "Nilai has_photo \"%s\" salah"
@@ -1684,7 +1723,7 @@ msgstr ""
msgid "Inspection required"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:698
msgid "Instruct contractors to fix problems"
msgstr ""
@@ -1696,26 +1735,18 @@ msgstr "Nota dalaman"
msgid "Internet glitch"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:336
+#: perllib/FixMyStreet/App/Controller/Open311.pm:337
msgid "Invalid agency_responsible value %s"
msgstr "Nilai agency_responsible %s salah"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1607
-msgid "Invalid end date"
-msgstr "Tarikh berakhir yang tak sah"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:429
+#: perllib/FixMyStreet/App/Controller/Open311.pm:430
msgid "Invalid format %s specified."
msgstr "Format dinyatakan %s salah"
-#: perllib/FixMyStreet/App/Controller/Report.pm:409
+#: perllib/FixMyStreet/App/Controller/Report.pm:423
msgid "Invalid location. New location must be covered by the same council."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1603
-msgid "Invalid start date"
-msgstr "Tarikh mula yang tak sah"
-
#: templates/web/base/contact/blurb.html:2
msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
msgstr ""
@@ -1734,7 +1765,7 @@ msgstr ""
msgid "Jurisdiction unknown"
msgstr ""
-#: templates/web/base/auth/general.html:93
+#: templates/web/base/auth/general.html:90
#: templates/web/base/report/new/form_user_loggedout_password.html:16
#: templates/web/base/report/update/form_user_loggedout_password.html:15
#: templates/web/zurich/auth/general.html:40
@@ -1759,12 +1790,7 @@ msgstr ""
msgid "Languages"
msgstr ""
-#: templates/web/base/dashboard/index.html:50
-msgid "Last 4 weeks"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:49
-#: templates/web/base/reports/index.html:38
+#: templates/web/base/reports/index.html:40
msgid "Last 7 days"
msgstr ""
@@ -1790,18 +1816,14 @@ msgstr "Kemas kini terakhir:"
msgid "Latitude/Longitude:"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:61
+#: templates/web/base/reports/_list-filters.html:69
msgid "Least recently updated"
msgstr ""
-#: templates/web/base/admin/body-form.html:129
+#: templates/web/base/admin/body-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 ""
-#: templates/web/base/dashboard/index.html:151
-msgid "Less than 7 days old"
-msgstr ""
-
#: templates/web/base/admin/extra-metadata-form.html:47
msgid "List"
msgstr ""
@@ -1810,13 +1832,13 @@ msgstr ""
msgid "List all reported problems"
msgstr "Senaraikan semua laporan masalah"
-#: templates/web/base/report/new/category_wrapper.html:4
+#: templates/web/base/report/new/category_wrapper.html:8
msgid "Loading..."
msgstr "Loading..."
#: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
-#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1
#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
#: templates/web/base/tokens/confirm_alert.html:1
msgid "Local RSS feeds and email alerts"
@@ -1848,12 +1870,15 @@ msgstr ""
msgid "Log in with Twitter"
msgstr ""
-#: templates/web/base/js/translation_strings.html:62
+#: templates/web/base/js/translation_strings.html:65
msgid "Log in with email"
msgstr ""
-#: templates/web/base/dashboard/index.html:146
-#: templates/web/base/dashboard/index.html:38
+#: templates/web/base/js/translation_strings.html:63
+msgid "Log in with email/text"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:81
msgid "Look up"
msgstr ""
@@ -1861,11 +1886,11 @@ msgstr ""
msgid "MAP"
msgstr "PETA"
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:699
msgid "Manage shortlist"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:56
+#: templates/web/base/reports/_list-filters.html:64
msgid "Manual order"
msgstr ""
@@ -1877,11 +1902,11 @@ msgstr ""
msgid "Mark as sent"
msgstr ""
-#: templates/web/base/admin/user-form.html:92
+#: templates/web/base/admin/user-form.html:110
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:697
msgid "Markup problem details"
msgstr ""
@@ -1901,45 +1926,45 @@ msgstr ""
msgid "Missing bodies:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:437
+#: perllib/FixMyStreet/App/Controller/Open311.pm:438
msgid "Missing jurisdiction_id"
msgstr "Kehilangan jurisdiction_id"
-#: templates/web/base/report/_main.html:134
+#: templates/web/base/report/_main.html:126
msgid "Moderate"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:693
msgid "Moderate report details"
msgstr ""
-#: templates/web/base/report/_main.html:134
+#: templates/web/base/report/_main.html:126
msgid "Moderate this report"
msgstr ""
-#: templates/web/base/report/update.html:12
+#: templates/web/base/report/update.html:10
msgid "Moderate this update"
msgstr ""
-#: templates/web/base/report/_main.html:73
-#: templates/web/base/report/update.html:58
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:61
msgid "Moderated by %s at %s"
msgstr ""
-#: templates/web/zurich/admin/stats.html:34
+#: templates/web/zurich/admin/stats/index.html:34
msgid "Moderated by division within one working day"
msgstr ""
-#: templates/web/base/report/_main.html:113
-#: templates/web/base/report/update.html:66
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:69
msgid "Moderation reason:"
msgstr ""
-#: templates/web/base/admin/stats.html:11
+#: templates/web/base/dashboard/index.html:101
msgid "Month"
msgstr "Bulan"
-#: templates/web/base/reports/_list-filters.html:62
+#: templates/web/base/reports/_list-filters.html:70
msgid "Most commented"
msgstr ""
@@ -1957,9 +1982,9 @@ msgstr ""
#: templates/web/base/admin/states/index.html:108
#: templates/web/base/admin/states/index.html:11
#: templates/web/base/admin/users.html:16
-#: templates/web/base/auth/general.html:108
-#: templates/web/base/report/new/form_user_loggedin.html:42
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:7
+#: templates/web/base/auth/general.html:113
+#: templates/web/base/report/new/form_user_loggedin.html:49
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:11
#: templates/web/base/report/update/form_name.html:27
#: templates/web/zurich/admin/body-form.html:4
#: templates/web/zurich/auth/general.html:60
@@ -1970,19 +1995,23 @@ msgstr "Nama"
#: templates/web/base/admin/report_edit.html:127
#: 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/zurich/admin/stats.html:41
+#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35
+#: templates/web/zurich/admin/stats/index.html:41
msgid "Name:"
msgstr "Nama:"
-#: perllib/FixMyStreet/Script/Reports.pm:111
+#: perllib/FixMyStreet/Script/Reports.pm:110
msgid "Name: %s"
msgstr "Nama: %s"
-#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_inspect.html:44
msgid "Navigate to this problem"
msgstr ""
+#: templates/web/base/report/_inspect.html:39
+msgid "Nearest calculated address:"
+msgstr ""
+
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
#: perllib/FixMyStreet/Geocode/OSM.pm:145
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
@@ -1992,12 +2021,12 @@ msgstr ""
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:538
-#: perllib/FixMyStreet/Cobrand/Default.pm:566
+#: perllib/FixMyStreet/Cobrand/Default.pm:521
+#: perllib/FixMyStreet/Cobrand/Default.pm:549
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr ""
-#: perllib/FixMyStreet/Script/Alerts.pm:316
+#: perllib/FixMyStreet/Script/Alerts.pm:341
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -2011,19 +2040,23 @@ msgstr ""
msgid "Nearly done! Now check your email&hellip;"
msgstr ""
+#: templates/web/base/auth/smsform.html:19
+msgid "Nearly done! Now check your phone&hellip;"
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131
msgid "New"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:262
+#: perllib/FixMyStreet/App/Controller/Admin.pm:230
msgid "New body added"
msgstr "Badan baru ditambahi"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:354
msgid "New category contact added"
msgstr "Kategori hubungan baru ditambahi"
-#: templates/web/base/auth/change_email.html:26
+#: templates/web/base/auth/change_email.html:39
msgid "New email address:"
msgstr ""
@@ -2044,6 +2077,11 @@ msgstr ""
msgid "New password:"
msgstr ""
+#: templates/web/base/auth/change_phone.html:38
+#, fuzzy
+msgid "New phone number:"
+msgstr "Nombor telefon anda"
+
#: templates/web/base/admin/responsepriorities/edit.html:4
#: templates/web/base/admin/responsepriorities/list.html:34
msgid "New priority"
@@ -2073,18 +2111,19 @@ msgstr "Masalah baru dalam sempadan {{NAME}} dalam FixMyStreet"
msgid "New reports"
msgstr "Laporan baru"
-#: templates/web/base/admin/questionnaire.html:24
#: templates/web/base/admin/states/index.html:91
+#: templates/web/base/admin/stats/questionnaire.html:24
msgid "New state"
msgstr "Negeri baru"
#: templates/web/base/admin/template_edit.html:4
-#: templates/web/base/admin/templates.html:28
+#: templates/web/base/admin/templates.html:34
#: templates/web/zurich/admin/template_edit.html:9
+#: templates/web/zurich/admin/templates.html:26
msgid "New template"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:58
+#: templates/web/base/reports/_list-filters.html:66
msgid "Newest"
msgstr ""
@@ -2092,7 +2131,7 @@ msgstr ""
msgid "Next"
msgstr "Seterusnya"
-#: perllib/FixMyStreet/Cobrand/Default.pm:1237
+#: perllib/FixMyStreet/Cobrand/Default.pm:1222
#: templates/web/base/admin/category_edit.html:4
#: templates/web/base/admin/list_updates.html:32
#: templates/web/base/admin/list_updates.html:34
@@ -2104,22 +2143,18 @@ msgstr "Seterusnya"
#: templates/web/base/questionnaire/creator_fixed.html:16
#: templates/web/base/questionnaire/index.html:106
#: templates/web/base/questionnaire/index.html:55
-#: templates/web/base/report/_inspect.html:92
+#: templates/web/base/report/_inspect.html:98
msgid "No"
msgstr "Tidak"
-#: templates/web/base/admin/user-form.html:66
+#: templates/web/base/admin/user-form.html:84
msgid "No area"
msgstr ""
-#: templates/web/base/admin/user-form.html:37
+#: templates/web/base/admin/user-form.html:55
msgid "No body"
msgstr "Tiada badan"
-#: templates/web/base/admin/stats.html:93
-msgid "No council"
-msgstr "Tiada majlis"
-
#: perllib/FixMyStreet/DB/Result/Problem.pm:372
msgid "No council selected"
msgstr "Tiada majlis dipilihi"
@@ -2149,6 +2184,10 @@ msgstr ""
msgid "No inspections in the selected date range."
msgstr ""
+#: templates/web/base/around/on_map_list_items.html:13
+msgid "No reports to show on map, here are some nearby:"
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:37
msgid "No result returned"
msgstr "Tiada keputusan."
@@ -2171,15 +2210,15 @@ msgstr "Tiada penyokong"
msgid "None"
msgstr "Tiada"
-#: templates/web/base/admin/user-form.html:58
-#: templates/web/base/admin/user-form.html:59
+#: templates/web/base/admin/user-form.html:76
+#: templates/web/base/admin/user-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:28
-#: templates/web/base/admin/user-form.html:29
+#: templates/web/base/admin/user-form.html:46
+#: templates/web/base/admin/user-form.html:47
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"
@@ -2198,7 +2237,7 @@ msgstr ""
msgid "Not for my subdivision"
msgstr "Bukan untuk bahagian bawah aku"
-#: templates/web/base/admin/questionnaire.html:6
+#: templates/web/base/admin/stats/questionnaire.html:6
msgid "Not reported before"
msgstr "Belum dilaporkan"
@@ -2212,10 +2251,6 @@ msgstr "Tidak dilaporkan kepada majlis"
msgid "Note"
msgstr "Nota"
-#: templates/web/base/admin/stats.html:51
-msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
-msgstr ""
-
#: templates/web/zurich/admin/body.html:55
#: templates/web/zurich/admin/contact-form.html:19
msgid "Note:"
@@ -2243,37 +2278,46 @@ msgstr ""
msgid "Now to submit your update&hellip;"
msgstr "Hantarkan kemas kini anda sekarang&hellip;"
-#: templates/web/base/reports/index.html:98
+#: templates/web/base/reports/index.html:127
msgid "Number of problems reported in each category, in the last 7 days."
msgstr ""
+#: templates/web/base/reports/index.html:99
+msgid "Number of problems reported in each ward, in the last 7 days."
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:43
msgid "OK"
msgstr "OK"
-#: templates/web/base/js/translation_strings.html:70
+#: templates/web/base/js/translation_strings.html:74
msgid "Offline data cleared"
msgstr ""
-#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/js/translation_strings.html:71
msgid "Offline update data saved"
msgstr ""
-#: templates/web/base/admin/questionnaire.html:24
+#: templates/web/base/admin/stats/questionnaire.html:24
msgid "Old state"
msgstr "Keadaan lama"
-#: templates/web/base/reports/_list-filters.html:59
+#: templates/web/base/reports/_list-filters.html:67
msgid "Oldest"
msgstr ""
+#: perllib/FixMyStreet/SendReport/Email.pm:89
+msgid "On behalf of %s"
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:174
#: perllib/FixMyStreet/Cobrand/Zurich.pm:905
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:10
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:70
#: templates/web/base/admin/states/index.html:102
#: templates/web/base/admin/states/index.html:25
#: templates/web/base/admin/states/index.html:32
#: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:111
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/update_edit.html:18
@@ -2312,23 +2356,30 @@ msgstr ""
msgid "Order"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:675
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:676
-#: perllib/FixMyStreet/DB/Result/Problem.pm:579
-#: perllib/FixMyStreet/DB/Result/Problem.pm:586
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:689
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:690
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:719
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:722
+#: perllib/FixMyStreet/DB/Result/Problem.pm:588
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
#: perllib/FixMyStreet/DB/Result/Problem.pm:610
-#: perllib/FixMyStreet/Script/Reports.pm:183
-#: perllib/FixMyStreet/Script/Reports.pm:198
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/Script/Reports.pm:182
+#: perllib/FixMyStreet/Script/Reports.pm:197
msgid "Other"
msgstr "Lain-lain"
-#: templates/web/base/reports/index.html:107
+#: templates/web/base/reports/index.html:136
msgid "Other categories"
msgstr ""
-#: templates/web/base/reports/index.html:92
+#: templates/web/base/reports/index.html:107
+#, fuzzy
+msgid "Other wards"
+msgstr "kawasan lain:"
+
+#: templates/web/base/reports/index.html:120
msgid "Overall average"
msgstr ""
@@ -2346,19 +2397,19 @@ msgstr "Laman Tidak Dijumpai"
msgid "Parent"
msgstr "Induk"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:61
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
msgid "Partial"
msgstr "Separa"
-#: templates/web/base/auth/general.html:111
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:28
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:6
+#: templates/web/base/auth/general.html:116
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:38
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:10
#: templates/web/zurich/auth/general.html:32
#: templates/web/zurich/auth/general.html:63
msgid "Password (optional)"
msgstr "Kata Laluan (tidah diwajibkan)"
-#: templates/web/base/auth/general.html:84
+#: templates/web/base/auth/general.html:81
msgid "Password:"
msgstr "Kata Laluan:"
@@ -2366,7 +2417,7 @@ msgstr "Kata Laluan:"
msgid "Permalink"
msgstr "Permalink"
-#: templates/web/base/admin/user-form.html:144
+#: templates/web/base/admin/user-form.html:162
msgid "Permissions:"
msgstr ""
@@ -2374,19 +2425,24 @@ msgstr ""
msgid "Phone Reporter:"
msgstr ""
+#: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/new/form_user_loggedin.html:33
#: templates/web/zurich/report/new/fill_in_details_form.html:65
msgid "Phone number"
msgstr "Nombor telefon"
-#: templates/web/base/report/new/form_user_loggedin.html:59
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:25
+#: templates/web/base/report/new/form_user_loggedin.html:67
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:30
msgid "Phone number (optional)"
msgstr "Nombor telefon (tidak diwajibkan)"
-#: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:134
-#: templates/web/base/admin/user-form.html:21
-#: templates/web/zurich/admin/stats.html:39
+#: templates/web/base/admin/user-form.html:30
+msgid "Phone verified:"
+msgstr ""
+
+#: templates/web/base/admin/report_edit.html:135
+#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47
+#: templates/web/zurich/admin/stats/index.html:39
msgid "Phone:"
msgstr "Telefon:"
@@ -2402,7 +2458,7 @@ msgstr "Telefon:"
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
-#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/admin/stats/index.html:37
#: templates/web/zurich/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:36
#: templates/web/zurich/report/new/fill_in_details_form.html:38
@@ -2428,12 +2484,17 @@ msgstr ""
msgid "Photos of recent nearby reports"
msgstr "Foto laporan terdekat baru-baru ini "
-#: templates/web/base/reports/index.html:63
-#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:76
+#: templates/web/base/reports/index.html:79
msgid "Pick your council"
msgstr ""
-#: templates/web/base/around/display_location.html:76
+#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:69
+msgid "Pick your ward"
+msgstr ""
+
+#: templates/web/base/around/display_location.html:74
#: templates/web/base/js/translation_strings.html:30
msgid "Place pin on map"
msgstr "Letakkan pin atas peta"
@@ -2455,25 +2516,34 @@ msgstr "Sila bersopan, ringkas dan tepat."
msgid "Please check the passwords and try again"
msgstr "Sila periksa kata laluan dan cuba lagi"
-#: templates/web/base/auth/change_email.html:15
-#: templates/web/base/auth/change_email.html:18
-#: templates/web/base/auth/general.html:39
-#: templates/web/base/auth/general.html:45
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:9
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:27
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Sila periksa sama ada alamat emel anda adalah betul"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:329
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:873
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:896
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1334
+#: perllib/FixMyStreet/DB/Result/User.pm:198
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:7
+#, fuzzy
+msgid "Please check your phone number is correct"
+msgstr "Sila periksa sama ada alamat emel anda adalah betul"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:297
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:905
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:928
#: perllib/FixMyStreet/DB/Result/Problem.pm:383
-#: templates/web/base/js/translation_strings.html:9
+#: templates/web/base/js/translation_strings.html:10
msgid "Please choose a category"
msgstr "Sila pilihkan kategori"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:377
+#: perllib/FixMyStreet/App/Controller/Admin.pm:345
#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
+#: templates/web/base/admin/template_edit.html:13
msgid "Please correct the errors below"
msgstr ""
@@ -2488,39 +2558,47 @@ msgstr ""
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:330
+#: perllib/FixMyStreet/App/Controller/Admin.pm:298
#: perllib/FixMyStreet/DB/Result/Comment.pm:128
-#: templates/web/base/js/translation_strings.html:2
+#: templates/web/base/js/translation_strings.html:3
msgid "Please enter a message"
msgstr "Sila masukkan pesanan"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1305
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1469
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1332
+#: perllib/FixMyStreet/DB/Result/User.pm:200
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:4
+#, fuzzy
+msgid "Please enter a mobile number"
+msgstr "Sila masukkan nombor telefon anda"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1365
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1461
msgid "Please enter a name"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:497
+#: perllib/FixMyStreet/App/Controller/Admin.pm:465
msgid "Please enter a name for this body"
msgstr ""
#: templates/web/base/auth/change_password.html:22
#: templates/web/base/auth/change_password.html:25
-#: templates/web/base/js/translation_strings.html:19
+#: templates/web/base/js/translation_strings.html:20
msgid "Please enter a password"
msgstr "Sila masukkan kata laluan"
#: perllib/FixMyStreet/App/Controller/Contact.pm:115
#: perllib/FixMyStreet/DB/Result/Problem.pm:366
-#: templates/web/base/js/translation_strings.html:3
+#: templates/web/base/js/translation_strings.html:4
msgid "Please enter a subject"
msgstr "Sila masukkan tajuk"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1302
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1466
-#: perllib/FixMyStreet/App/Controller/Admin.pm:343
-#: perllib/FixMyStreet/DB/Result/User.pm:164
-#: templates/web/base/js/translation_strings.html:12
-#: templates/web/base/js/translation_strings.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1452
+#: perllib/FixMyStreet/App/Controller/Admin.pm:311
+#: perllib/FixMyStreet/DB/Result/User.pm:193
+#: templates/web/base/js/translation_strings.html:13
+#: templates/web/base/js/translation_strings.html:17
msgid "Please enter a valid email"
msgstr "Silah masukkan emel yang benar"
@@ -2529,55 +2607,62 @@ msgstr "Silah masukkan emel yang benar"
msgid "Please enter a valid email address"
msgstr "Sila masukkan alamat emel yang benah"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1446
+#, fuzzy
+msgid "Please enter a valid email or phone number"
+msgstr "Sila masukkan nombor telefon anda"
+
#: perllib/FixMyStreet/DB/Result/Problem.pm:369
-#: templates/web/base/js/translation_strings.html:4
+#: templates/web/base/js/translation_strings.html:5
msgid "Please enter some details"
msgstr "Sila masukkan perincian"
#: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/User.pm:161
-#: templates/web/base/auth/change_email.html:15
-#: templates/web/base/auth/change_email.html:17
-#: templates/web/base/auth/general.html:39
-#: templates/web/base/auth/general.html:44
-#: templates/web/base/js/translation_strings.html:11
-#: templates/web/base/js/translation_strings.html:15
+#: perllib/FixMyStreet/DB/Result/User.pm:191
+#: 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:12
+#: templates/web/base/js/translation_strings.html:16
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Sila masukkan emel anda"
-#: templates/web/base/report/new/form_user_loggedout_email.html:5
#: templates/web/zurich/report/new/fill_in_details_form.html:57
msgid "Please enter your email address"
msgstr "Sila masukkan alamat emel anda"
-#: templates/web/base/js/translation_strings.html:25
+#: templates/web/base/js/translation_strings.html:26
msgid "Please enter your first name"
msgstr "Sila masukkan nama pertama anda"
#: perllib/FixMyStreet/Cobrand/UK.pm:326
-#: templates/web/base/js/translation_strings.html:7
+#: templates/web/base/js/translation_strings.html:8
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:113
#: perllib/FixMyStreet/DB/Result/Comment.pm:125
#: perllib/FixMyStreet/DB/Result/Problem.pm:377
-#: perllib/FixMyStreet/DB/Result/User.pm:157
-#: templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/DB/Result/User.pm:186
+#: templates/web/base/js/translation_strings.html:7
msgid "Please enter your name"
msgstr "Sila masukkan nama anda"
-#: templates/web/base/js/translation_strings.html:22
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:6
+#: templates/web/base/js/translation_strings.html:23
msgid "Please enter your phone number"
msgstr "Sila masukkan nombor telefon anda"
-#: templates/web/base/js/translation_strings.html:26
+#: templates/web/base/js/translation_strings.html:27
msgid "Please enter your second name"
msgstr "Sila masukkan nama kedua anda"
-#: templates/web/base/js/translation_strings.html:24
+#: templates/web/base/js/translation_strings.html:25
msgid "Please enter your title"
msgstr "Sila masukkan tajuk anda"
@@ -2626,7 +2711,11 @@ msgstr ""
msgid "Please note:"
msgstr "Sila nota:"
-#: perllib/FixMyStreet/App/Controller/Report.pm:353
+#: perllib/FixMyStreet/App/Controller/Report.pm:385
+msgid "Please provide a duplicate ID or public update for this report."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:367
msgid "Please provide a public update for this report."
msgstr ""
@@ -2666,6 +2755,11 @@ msgstr ""
msgid "Please upload an image only"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1449
+msgid "Please verify at least one of email/phone"
+msgstr ""
+
#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Please write a message"
msgstr "Sila tuliskan pesanan"
@@ -2675,7 +2769,7 @@ msgid "Please write your update here"
msgstr "Sila tuliskan kemas kini anda di sini"
#: templates/web/base/report/update-form.html:25
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:14
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:18
#: templates/web/base/report/update/form_user_loggedout_password.html:10
msgid "Post"
msgstr "Post"
@@ -2684,15 +2778,15 @@ msgstr "Post"
msgid "Posted anonymously at %s"
msgstr "Post tanpa nama pada %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:266
msgid "Posted by %s at %s"
msgstr "Dipostkan oleh %s pada %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:243
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr "Dipostkan oleh <strong>%s</strong> (%s) pada %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:256
msgid "Posted by <strong>%s</strong> at %s"
msgstr "Dipostkan oleh <strong>%s</strong> pada %s"
@@ -2704,11 +2798,11 @@ msgstr ""
msgid "Previous"
msgstr "Sebelumnya"
-#: perllib/FixMyStreet/Cobrand/Default.pm:665
+#: perllib/FixMyStreet/Cobrand/Default.pm:648
msgid "Priorities"
msgstr ""
-#: templates/web/base/report/_inspect.html:123
+#: templates/web/base/report/_inspect.html:129
#: templates/web/base/report/_item.html:100
msgid "Priority"
msgstr ""
@@ -2725,7 +2819,7 @@ msgstr ""
#: templates/web/base/admin/body.html:88
#: templates/web/base/admin/contact-form.html:75
-#: templates/web/base/admin/report_edit.html:137
+#: templates/web/base/admin/report_edit.html:142
msgid "Private"
msgstr "Peribadi"
@@ -2749,21 +2843,21 @@ msgstr "Masalah %s dipastikan"
msgid "Problem %s sent to council %s"
msgstr "Masalah %s dihantar kepada majlis %s"
-#: templates/web/base/admin/stats.html:57
-#: templates/web/base/admin/stats_by_state.html:12
+#: templates/web/base/admin/stats/index.html:5
+#: templates/web/base/admin/stats/state.html:12
#: templates/web/zurich/admin/index.html:9
msgid "Problem breakdown by state"
msgstr "Pecahan masalah bagi negeri"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1272
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1309
msgid "Problem marked as open."
msgstr "Masalah ditanda sebagai terbukan"
-#: templates/web/base/admin/questionnaire.html:21
+#: templates/web/base/admin/stats/questionnaire.html:21
msgid "Problem state change based on survey results"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:692
#: templates/web/base/admin/flagged.html:10
msgid "Problems"
msgstr "Masalah-masalah"
@@ -2790,7 +2884,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
msgid "Problems within %.1fkm of %s"
msgstr "Masalah dalam %.1fkm dalam lokasi ini"
-#: perllib/FixMyStreet/Cobrand/Default.pm:838
+#: perllib/FixMyStreet/Cobrand/Default.pm:821
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
#: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257
#: perllib/FixMyStreet/Cobrand/UK.pm:269
@@ -2816,7 +2910,8 @@ msgstr ""
msgid "Property address:"
msgstr "Alamat bangunan"
-#: templates/web/base/report/duplicate-no-updates.html:2
+#: templates/web/base/report/display.html:57
+#: templates/web/base/report/duplicate-no-updates.html:3
#: templates/web/base/report/update-form.html:6
msgid "Provide an update"
msgstr "Sediakan kemas kini"
@@ -2825,12 +2920,12 @@ msgstr "Sediakan kemas kini"
msgid "Provide update as"
msgstr ""
-#: templates/web/base/auth/general.html:114
+#: templates/web/base/auth/general.html:119
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:31
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:9
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:41
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
@@ -2843,12 +2938,12 @@ msgstr ""
msgid "Public response:"
msgstr "Tindak balas awam:"
-#: templates/web/base/report/_inspect.html:162
+#: templates/web/base/report/_inspect.html:169
msgid "Public update:"
msgstr ""
#: templates/web/zurich/admin/report_edit.html:123
-#: templates/web/zurich/admin/stats.html:38
+#: templates/web/zurich/admin/stats/index.html:38
msgid "Publish photo"
msgstr "Terbitkan foto"
@@ -2903,7 +2998,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:839
+#: perllib/FixMyStreet/Cobrand/Default.pm:822
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "RSS feed of problems within %s"
@@ -2928,7 +3023,7 @@ msgstr "Feed RSS untuk kemas kini bagi masalah ini"
msgid "Receive email when updates are left on this problem."
msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:738
+#: perllib/FixMyStreet/DB/Result/Problem.pm:756
msgid "Received by %s moments later"
msgstr ""
@@ -2942,7 +3037,7 @@ msgstr ""
msgid "Recently reported problems"
msgstr "Masalah yang dilaporkan baru-baru ini"
-#: templates/web/base/reports/_list-filters.html:60
+#: templates/web/base/reports/_list-filters.html:68
msgid "Recently updated"
msgstr ""
@@ -2964,9 +3059,9 @@ msgstr ""
#: templates/web/base/report/_item.html:12
#: templates/web/base/report/_item.html:9
-#: templates/web/base/report/_main.html:138
-#: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:14
+#: templates/web/base/report/_main.html:22
msgid "Remove from shortlist"
msgstr ""
@@ -2974,12 +3069,16 @@ msgstr ""
msgid "Remove from site"
msgstr ""
-#: templates/web/base/admin/report_edit.html:154
-#: templates/web/base/admin/update_edit.html:69
+#: templates/web/base/admin/report_edit.html:159
+#: templates/web/base/admin/update_edit.html:71
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr ""
+#: templates/web/base/auth/generate_token.html:33
+msgid "Replace token"
+msgstr ""
+
#: templates/web/zurich/admin/report_edit.html:239
msgid "Reply to user:"
msgstr ""
@@ -3008,11 +3107,11 @@ msgstr ""
msgid "Report as"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Rss.pm:298
+#: perllib/FixMyStreet/App/Controller/Rss.pm:302
msgid "Report on %s"
msgstr ""
-#: templates/web/base/dashboard/index.html:137
+#: templates/web/base/dashboard/index.html:61
msgid "Report state:"
msgstr ""
@@ -3027,17 +3126,17 @@ msgstr ""
msgid "Report, view, or discuss local problems"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:590
+#: perllib/FixMyStreet/DB/Result/Problem.pm:599
#: templates/web/base/contact/index.html:55
msgid "Reported anonymously at %s"
msgstr ""
-#: templates/web/base/admin/questionnaire.html:5
+#: templates/web/base/admin/stats/questionnaire.html:5
#: templates/web/base/questionnaire/index.html:64
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:614
+#: perllib/FixMyStreet/DB/Result/Problem.pm:623
#: templates/web/base/contact/index.html:57
msgid "Reported by %s at %s"
msgstr ""
@@ -3051,27 +3150,27 @@ msgstr ""
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:587
+#: perllib/FixMyStreet/DB/Result/Problem.pm:596
msgid "Reported in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:611
+#: perllib/FixMyStreet/DB/Result/Problem.pm:620
msgid "Reported in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: perllib/FixMyStreet/DB/Result/Problem.pm:593
msgid "Reported via %s anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/DB/Result/Problem.pm:617
msgid "Reported via %s by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:581
+#: perllib/FixMyStreet/DB/Result/Problem.pm:590
msgid "Reported via %s in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:612
msgid "Reported via %s in the %s category by %s at %s"
msgstr ""
@@ -3080,8 +3179,8 @@ msgstr ""
msgid "Reported:"
msgstr ""
-#: templates/web/base/around/index.html:2
-#: templates/web/base/around/lookup_by_ref.html:2
+#: templates/web/base/around/index.html:3
+#: templates/web/base/around/lookup_by_ref.html:3
#: templates/web/base/js/translation_strings.html:42
#: templates/web/base/report/new/fill_in_details.html:0
#: templates/web/base/report/new/fill_in_details.html:8
@@ -3089,10 +3188,9 @@ msgstr ""
msgid "Reporting a problem"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:655
+#: perllib/FixMyStreet/Cobrand/Default.pm:638
#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
-#: templates/web/base/dashboard/index.html:134
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:46
msgid "Reports"
msgstr ""
@@ -3108,7 +3206,7 @@ msgstr ""
msgid "Reports by destination"
msgstr ""
-#: templates/web/base/admin/user-form.html:107
+#: templates/web/base/admin/user-form.html:125
msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
msgstr ""
@@ -3120,7 +3218,7 @@ msgstr ""
msgid "Reports published"
msgstr ""
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:75
msgid "Reports saved offline."
msgstr ""
@@ -3174,21 +3272,22 @@ msgid "Response Templates"
msgstr ""
#: templates/web/base/admin/templates.html:1
-#: templates/web/base/admin/templates.html:4
#: templates/web/zurich/admin/template_edit.html:1
#: templates/web/zurich/admin/template_edit.html:4
+#: templates/web/zurich/admin/templates.html:1
+#: templates/web/zurich/admin/templates.html:3
msgid "Response Templates for %s"
msgstr ""
-#: templates/web/base/report/update.html:40
+#: templates/web/base/report/update.html:38
msgid "Revert to original"
msgstr ""
-#: templates/web/base/report/_main.html:99
+#: templates/web/base/report/_main.html:95
msgid "Revert to original text"
msgstr ""
-#: templates/web/base/report/_main.html:50
+#: templates/web/base/report/_main.html:46
msgid "Revert to original title"
msgstr ""
@@ -3207,17 +3306,17 @@ msgstr ""
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1848
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1852
-#: templates/web/base/admin/report_edit.html:151
-#: templates/web/base/admin/update_edit.html:66
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1875
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1879
+#: templates/web/base/admin/report_edit.html:156
+#: templates/web/base/admin/update_edit.html:68
#: templates/web/zurich/admin/report_edit.html:118
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1848
-#: templates/web/base/admin/report_edit.html:152
-#: templates/web/base/admin/update_edit.html:67
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1875
+#: templates/web/base/admin/report_edit.html:157
+#: templates/web/base/admin/update_edit.html:69
#: templates/web/zurich/admin/report_edit.html:119
msgid "Rotate Right"
msgstr ""
@@ -3227,21 +3326,21 @@ msgid "Rotating this photo will discard unsaved changes to the report."
msgstr ""
#: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:16
+#: templates/web/base/maps/google-ol.html:2
msgid "Satellite"
msgstr ""
-#: templates/web/base/report/_inspect.html:182
+#: templates/web/base/report/_inspect.html:189
msgid "Save + close as duplicate"
msgstr ""
#: templates/web/base/admin/contact-form.html:138
#: templates/web/base/admin/reportextrafields/edit.html:64
#: templates/web/base/admin/responsepriorities/edit.html:58
-#: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:182
-#: templates/web/base/report/_main.html:117
-#: templates/web/base/report/update.html:69
+#: templates/web/base/admin/template_edit.html:71
+#: templates/web/base/report/_inspect.html:189
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:72
#: templates/web/zurich/admin/body.html:62
#: templates/web/zurich/admin/contact-form.html:22
#: templates/web/zurich/admin/template_edit.html:29
@@ -3252,12 +3351,12 @@ msgstr ""
msgid "Save new fields"
msgstr ""
-#: templates/web/base/report/_inspect.html:158
+#: templates/web/base/report/_inspect.html:165
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:72
+#: templates/web/base/js/translation_strings.html:76
msgid "Saving reports offline"
msgstr ""
@@ -3276,7 +3375,7 @@ msgstr ""
msgid "Search Users"
msgstr ""
-#: templates/web/zurich/header.html:74
+#: templates/web/zurich/header.html:68
msgid "Search reports"
msgstr ""
@@ -3287,6 +3386,7 @@ msgid "Search:"
msgstr ""
#: templates/web/base/admin/reports.html:27
+#: templates/web/base/around/lookup_by_ref.html:18
msgid "Searching found no reports."
msgstr ""
@@ -3299,7 +3399,7 @@ msgstr ""
msgid "See our privacy policy"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
msgid "See user detail for reports created as the council"
msgstr ""
@@ -3308,8 +3408,8 @@ msgstr ""
msgid "Select a body"
msgstr "Pilihkan badan"
-#: templates/web/base/admin/body-form.html:79
-#: templates/web/zurich/admin/body-form.html:26
+#: templates/web/base/admin/body-form.html:78
+#: templates/web/zurich/admin/body-form.html:25
msgid "Select an area"
msgstr "Pilihkan kawasan"
@@ -3329,11 +3429,16 @@ msgstr ""
msgid "Send extended Open311 statuses with service request updates"
msgstr ""
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:5
+msgid "Sending a confirmation text failed: \"%s\""
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
msgid "Sent report back"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:741
+#: perllib/FixMyStreet/DB/Result/Problem.pm:759
msgid "Sent to %s %s later"
msgstr "Dihantar kepada %s %s kemudian"
@@ -3342,11 +3447,11 @@ msgid "Sent:"
msgstr "Dihantar:"
#: templates/web/base/admin/report_edit.html:90
-#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats/index.html:45
msgid "Service:"
msgstr "Servis:"
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
msgid "Set to my current location"
msgstr ""
@@ -3355,9 +3460,9 @@ msgid "Share"
msgstr "Kongsi"
#: templates/web/base/main_nav_items.html:10
-#: templates/web/base/report/_main.html:140
-#: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:29
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:17
+#: templates/web/base/report/_main.html:25
msgid "Shortlist"
msgstr ""
@@ -3365,19 +3470,19 @@ msgstr ""
msgid "Shortlist all visible"
msgstr ""
-#: templates/web/base/report/_main.html:138
-#: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:25
-#: templates/web/base/reports/_list-filters.html:9
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:16
+#: templates/web/base/report/_main.html:21
+#: templates/web/base/reports/_list-filters.html:17
msgid "Shortlisted"
msgstr ""
#: templates/web/base/report/_item.html:15
-#: templates/web/base/report/_main.html:148
+#: templates/web/base/report/_main.html:140
msgid "Shortlisted by %s"
msgstr ""
-#: templates/web/base/report/update.html:20
+#: templates/web/base/report/update.html:18
msgid "Show Photo?"
msgstr ""
@@ -3385,40 +3490,37 @@ msgstr ""
msgid "Show all updates"
msgstr ""
-#: templates/web/base/report/new/form_user_loggedin.html:56
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:22
+#: templates/web/base/report/new/form_user_loggedin.html:63
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
#: templates/web/base/report/update/form_name.html:37
msgid "Show my name publicly"
msgstr "Tunjukkan nama aku secara umum"
-#: templates/web/base/report/update.html:17
+#: templates/web/base/report/update.html:15
msgid "Show name publicly?"
msgstr ""
-#: templates/web/base/around/display_location.html:69
-msgid "Show old"
-msgstr "Tunjukkan lama"
-
-#: templates/web/base/report/_main.html:83
+#: templates/web/base/report/_main.html:79
msgid "Show photo"
msgstr ""
-#: templates/web/base/around/display_location.html:60
+#: templates/web/base/around/display_location.html:58
+#: templates/web/base/around/display_location.html:66
#: templates/web/base/js/translation_strings.html:54
msgid "Show pins"
msgstr "Tunjukkan pin"
-#: templates/web/base/report/_main.html:60
+#: templates/web/base/report/_main.html:56
msgid "Show reporter&rsquo;s name"
msgstr ""
-#: templates/web/base/reports/index.html:62
+#: templates/web/base/reports/index.html:64
msgid "Show reports in your area"
msgstr ""
-#: templates/web/base/auth/general.html:119
+#: templates/web/base/auth/general.html:124
#: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:88
+#: templates/web/base/auth/general.html:85
#: templates/web/base/main_nav_items.html:6
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
@@ -3429,12 +3531,16 @@ msgstr "Log masuk"
msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
msgstr ""
+#: templates/web/base/auth/general.html:96
+msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
+msgstr ""
+
#: templates/web/base/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Log masuk atau daftarkan akaun"
-#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Log keluar"
@@ -3450,7 +3556,7 @@ msgid ""
" sent from your FixMyStreet installation."
msgstr ""
-#: templates/web/base/alert/index.html:40
+#: templates/web/base/alert/index.html:42
msgid "Some photos of recent reports"
msgstr ""
@@ -3463,15 +3569,19 @@ msgstr ""
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr ""
-#: templates/web/base/auth/token.html:8
+#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8
msgid "Sorry, that wasn&rsquo;t a valid link"
msgstr ""
+#: templates/web/base/auth/smsform.html:16
+msgid "Sorry, that wasn&rsquo;t the correct code"
+msgstr ""
+
#: templates/web/base/tokens/abuse.html:5
msgid "Sorry, there has been an error confirming your problem."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:235
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:242
#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
#: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3504,20 +3614,21 @@ msgstr ""
msgid "Sorry, you don't have permission to do that."
msgstr ""
-#: templates/web/base/reports/_list-filters.html:53
+#: templates/web/base/reports/_list-filters.html:61
msgid "Sort by"
msgstr ""
-#: templates/web/base/admin/user-form.html:47
+#: templates/web/base/admin/user-form.html:65
msgid "Staff users have permission to log in to the admin."
msgstr ""
-#: templates/web/base/admin/user-form.html:50
+#: templates/web/base/admin/user-form.html:68
msgid "Staff:"
msgstr ""
-#: templates/web/base/admin/stats.html:71
-msgid "Start Date:"
+#: templates/web/base/dashboard/index.html:73
+#, fuzzy
+msgid "Start Date"
msgstr "Tarikh bermula:"
#: templates/web/base/admin/body.html:73
@@ -3527,15 +3638,18 @@ msgstr "Tarikh bermula:"
#: 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:40
-#: templates/web/base/report/_inspect.html:82
+#: templates/web/base/admin/template_edit.html:50
+#: templates/web/base/admin/templates.html:8
+#: templates/web/base/dashboard/index.html:100
+#: templates/web/base/report/_inspect.html:88
#: templates/web/base/report/_item.html:96
#: templates/web/base/report/update/form_update.html:39
#: templates/web/zurich/admin/contact-form.html:10
msgid "State"
msgstr "Negeri"
-#: templates/web/base/report/update.html:48
+#: perllib/FixMyStreet/Script/Alerts.pm:102
+#: templates/web/base/report/update.html:49
msgid "State changed to:"
msgstr ""
@@ -3548,17 +3662,19 @@ msgstr ""
msgid "State:"
msgstr "Negeri:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:645
+#: perllib/FixMyStreet/Cobrand/Default.pm:628
#: templates/web/base/admin/states/index.html:1
#, fuzzy
msgid "States"
msgstr "Negeri"
-#: perllib/FixMyStreet/Cobrand/Default.pm:639
+#: perllib/FixMyStreet/Cobrand/Default.pm:622
#: perllib/FixMyStreet/Cobrand/Zurich.pm:391
-#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
-#: templates/web/base/admin/stats_by_state.html:1
-#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
+#: templates/web/base/admin/index.html:71
+#: templates/web/base/admin/stats/index.html:1
+#: templates/web/base/admin/stats/state.html:1
+#: templates/web/zurich/admin/stats/index.html:1
+#: templates/web/zurich/header.html:59
msgid "Stats"
msgstr "Stats"
@@ -3568,7 +3684,7 @@ msgstr "Stats"
msgid "Status"
msgstr "Status"
-#: templates/web/base/report/updates.html:10
+#: templates/web/base/report/updates.html:16
msgid "Still open, via questionnaire, %s"
msgstr "Masuk dibuka, melalui soalan selidik, %s"
@@ -3581,7 +3697,12 @@ msgstr ""
msgid "String"
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:192
+#: templates/web/base/report/new/category.html:35
+#, fuzzy
+msgid "Subcategory"
+msgstr "Subkategori: %s"
+
+#: perllib/FixMyStreet/Script/Reports.pm:191
msgid "Subcategory: %s"
msgstr "Subkategori: %s"
@@ -3598,18 +3719,19 @@ msgstr "Tajuk"
msgid "Subject:"
msgstr "Tajuk:"
+#: templates/web/base/auth/smsform.html:27
#: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/new/form_user_loggedin.html:63
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:36
+#: templates/web/base/report/new/form_user_loggedin.html:76
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:46
#: templates/web/base/report/new/form_user_loggedout_password.html:11
#: templates/web/zurich/report/new/fill_in_details_form.html:73
msgid "Submit"
msgstr "Hantar"
-#: templates/web/base/admin/report_edit.html:162
+#: templates/web/base/admin/report_edit.html:167
#: templates/web/base/admin/report_edit.html:24
-#: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:170
+#: templates/web/base/admin/update_edit.html:79
+#: templates/web/base/admin/user-form.html:188
#: templates/web/zurich/admin/report_edit-sdm.html:124
#: templates/web/zurich/admin/report_edit.html:264
#: templates/web/zurich/admin/update_edit.html:38
@@ -3651,7 +3773,7 @@ msgstr ""
msgid "Summarise your changes"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:637
+#: perllib/FixMyStreet/Cobrand/Default.pm:620
#: perllib/FixMyStreet/Cobrand/Zurich.pm:387
#: templates/web/base/admin/bodies.html:29
#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
@@ -3659,25 +3781,31 @@ msgstr ""
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:49
+#: templates/web/zurich/header.html:43
msgid "Summary"
msgstr "Ringkasan"
#: templates/web/zurich/reports/index.html:0
-#: templates/web/zurich/reports/index.html:4
+#: templates/web/zurich/reports/index.html:5
msgid "Summary reports"
msgstr "Laporan ringkasan"
-#: templates/web/base/admin/user-form.html:133
+#: templates/web/base/admin/stats/index.html:7
+#: templates/web/base/dashboard/index.html:21
+#, fuzzy
+msgid "Summary statistics"
+msgstr "Laporan ringkasan"
+
+#: templates/web/base/admin/user-form.html:151
msgid "Superuser:"
msgstr ""
-#: templates/web/base/admin/user-form.html:130
+#: templates/web/base/admin/user-form.html:148
msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
msgstr ""
-#: templates/web/base/admin/questionnaire.html:1
-#: templates/web/base/admin/stats.html:56
+#: templates/web/base/admin/stats/index.html:4
+#: templates/web/base/admin/stats/questionnaire.html:1
msgid "Survey Results"
msgstr "Hasil Kajian"
@@ -3685,14 +3813,14 @@ msgstr "Hasil Kajian"
msgid "Template &laquo;%s&raquo;"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:661
+#: perllib/FixMyStreet/Cobrand/Default.pm:644
#: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/zurich/header.html:69
+#: templates/web/zurich/header.html:63
msgid "Templates"
msgstr ""
#: templates/web/base/admin/list_updates.html:12
-#: templates/web/base/admin/templates.html:11
+#: templates/web/zurich/admin/templates.html:9
msgid "Text"
msgstr "Teks"
@@ -3700,7 +3828,7 @@ msgstr "Teks"
msgid "Text only version"
msgstr "Versi teks sahaja"
-#: templates/web/base/admin/template_edit.html:17
+#: templates/web/base/admin/template_edit.html:33
#: templates/web/base/admin/update_edit.html:20
#: templates/web/zurich/admin/template_edit.html:24
#: templates/web/zurich/admin/update_edit.html:12
@@ -3727,7 +3855,7 @@ msgstr ""
msgid "Thank you for your feedback"
msgstr ""
-#: templates/web/base/around/_error_multiple.html:17
+#: templates/web/base/around/_error_multiple.html:18
msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
msgstr ""
@@ -3743,7 +3871,7 @@ msgstr ""
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:127
+#: perllib/FixMyStreet/App/Controller/Location.pm:141
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
@@ -3753,11 +3881,11 @@ msgstr ""
msgid "That postcode was not recognised, sorry."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:850
+#: perllib/FixMyStreet/App/Controller/Admin.pm:858
msgid "That problem has been marked as sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:843
+#: perllib/FixMyStreet/App/Controller/Admin.pm:851
msgid "That problem will now be resent."
msgstr ""
@@ -3789,8 +3917,8 @@ msgid ""
" 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/body-form.html:103
#: templates/web/base/admin/contact-form.html:104
#: templates/web/base/admin/contact-form.html:105
msgid ""
@@ -3823,8 +3951,8 @@ msgstr ""
msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63
-#: perllib/FixMyStreet/App/Controller/Reports.pm:103
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43
+#: perllib/FixMyStreet/App/Controller/Reports.pm:85
msgid "The error was: %s"
msgstr ""
@@ -3866,7 +3994,7 @@ msgstr ""
msgid "The latest problems within {{NAME}}'s boundary reported by users"
msgstr ""
-#: templates/web/base/auth/token.html:9
+#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9
msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
msgstr ""
@@ -3891,7 +4019,7 @@ 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 ""
-#: perllib/FixMyStreet/Script/Reports.pm:96
+#: perllib/FixMyStreet/Script/Reports.pm:95
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr ""
@@ -3902,33 +4030,37 @@ msgid ""
" Names are not necessarily unique."
msgstr ""
-#: templates/web/base/around/on_map_list_items.html:12
+#: templates/web/base/around/on_map_list_items.html:17
#: templates/web/base/my/_problem-list.html:8
#: templates/web/base/reports/_problem-list.html:13
msgid "There are no reports to show."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Reports.pm:100
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1140
+msgid "There is already an auto-response template for this category/state."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:82
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr ""
#: perllib/FixMyStreet/App/Controller/Contact.pm:138
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:785
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
-#: templates/web/base/auth/general.html:55
-#: templates/web/zurich/auth/general.html:28
-msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
-msgstr ""
-
#: perllib/FixMyStreet/App/Controller/Alert.pm:359
msgid "There was a problem with your email/password combination. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:806
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135
+#: templates/web/base/auth/general.html:51
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338
msgid "There was a problem with your update. Please try again."
msgstr ""
@@ -3936,7 +4068,7 @@ msgstr ""
msgid "There were problems with your report. Please see below."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373
msgid "There were problems with your update. Please see below."
msgstr ""
@@ -3991,26 +4123,34 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/Script/Reports.pm:198
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:202
+#: perllib/FixMyStreet/Script/Reports.pm:201
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:910
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:954
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:942
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:986
#: perllib/FixMyStreet/Cobrand/UK.pm:45
msgid "This information is required"
msgstr ""
+#: templates/web/base/admin/template_edit.html:19
+msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
+msgstr ""
+
#: templates/web/base/debug_header.html:3
msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
msgstr ""
+#: templates/web/base/admin/template_edit.html:29
+msgid "This is the <strong>public</strong> text that will be shown on the site."
+msgstr ""
+
#: templates/web/base/report/new/form_report.html:58
msgid "This pothole has been here for two months and…"
msgstr ""
@@ -4027,7 +4167,7 @@ msgstr "Masalah ini belum diselesai"
msgid "This problem is still ongoing"
msgstr ""
-#: templates/web/base/report/duplicate-no-updates.html:3
+#: templates/web/base/report/duplicate-no-updates.html:5
msgid "This report is a duplicate. Please leave updates on the original report:"
msgstr ""
@@ -4037,23 +4177,23 @@ msgstr ""
msgid "This report is awaiting moderation."
msgstr "Laporan ini menunggui sederhana."
-#: perllib/FixMyStreet/Script/Alerts.pm:98
+#: perllib/FixMyStreet/Script/Alerts.pm:119
msgid "This report is currently marked as closed."
msgstr "Laporan ini ditanda sebagai ditutupi sekarang."
-#: perllib/FixMyStreet/Script/Alerts.pm:96
+#: perllib/FixMyStreet/Script/Alerts.pm:117
msgid "This report is currently marked as fixed."
msgstr "Laporan ini ditanda sebagai diselesai sekarang."
-#: perllib/FixMyStreet/Script/Alerts.pm:100
+#: perllib/FixMyStreet/Script/Alerts.pm:121
msgid "This report is currently marked as open."
msgstr "Laporan ini ditanda sebagai terbuka sekarang."
-#: perllib/FixMyStreet/Script/Reports.pm:109
+#: perllib/FixMyStreet/Script/Reports.pm:108
msgid "This report was submitted anonymously"
msgstr "Laporan ini dikemukakan tanpa nama"
-#: perllib/FixMyStreet/Script/Reports.pm:89
+#: perllib/FixMyStreet/Script/Reports.pm:88
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."
@@ -4064,7 +4204,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu
msgid "Time spent (in minutes):"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:638
+#: perllib/FixMyStreet/Cobrand/Default.pm:621
#: templates/web/base/admin/timeline.html:1
msgid "Timeline"
msgstr "Garis masa"
@@ -4076,20 +4216,21 @@ msgstr ""
#: templates/web/base/admin/flagged.html:15
#: templates/web/base/admin/index.html:61
#: templates/web/base/admin/reports.html:13
-#: templates/web/base/admin/templates.html:10
+#: templates/web/base/admin/templates.html:6
+#: templates/web/zurich/admin/templates.html:8
msgid "Title"
msgstr "Tajuk"
-#: templates/web/base/admin/template_edit.html:13
+#: templates/web/base/admin/template_edit.html:23
#: templates/web/zurich/admin/template_edit.html:20
msgid "Title:"
msgstr ""
-#: templates/web/base/alert/index.html:25
+#: templates/web/base/alert/index.html:26
msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
msgstr ""
-#: templates/web/base/alert/index.html:27
+#: templates/web/base/alert/index.html:28
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
@@ -4101,44 +4242,36 @@ msgstr ""
msgid "To limit this collection of fields to a single language, select it here."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:95
+#: perllib/FixMyStreet/Script/Reports.pm:94
msgid "To view a map of the precise location of this issue"
msgstr "Melihat lokasi tepat atas peta bagi isu ini"
-#: templates/web/base/reports/index.html:97
-msgid "Top 5 most used categories"
-msgstr ""
-
-#: templates/web/base/reports/index.html:83
-msgid "Top 5 responsive councils"
+#: templates/web/base/auth/generate_token.html:11
+msgid "Token:"
msgstr ""
-#: templates/web/base/admin/questionnaire.html:24
-#: templates/web/base/admin/stats.html:24
-#: templates/web/base/admin/stats.html:43
-#: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/zurich/admin/stats.html:30
-msgid "Total"
-msgstr "Jumlah"
-
-#: templates/web/base/dashboard/index.html:97
-msgid "Total marked"
+#: templates/web/base/reports/index.html:126
+msgid "Top 5 most used categories"
msgstr ""
-#: templates/web/base/dashboard/index.html:71
-msgid "Total marked as fixed"
+#: templates/web/base/reports/index.html:111
+msgid "Top 5 responsive councils"
msgstr ""
-#: templates/web/base/dashboard/index.html:125
-msgid "Total not marked"
+#: templates/web/base/reports/index.html:98
+msgid "Top 5 wards"
msgstr ""
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:56
-msgid "Total reports received"
-msgstr ""
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/dashboard/index.html:114
+#: templates/web/base/dashboard/index.html:119
+#: templates/web/base/dashboard/index.html:143
+#: templates/web/zurich/admin/stats/index.html:30
+msgid "Total"
+msgstr "Jumlah"
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:140
#: templates/web/base/report/_item.html:104
msgid "Traffic management required?"
msgstr ""
@@ -4151,18 +4284,19 @@ msgstr ""
msgid "Translations"
msgstr ""
-#: templates/web/base/admin/user-form.html:111
+#: templates/web/base/admin/user-form.html:129
msgid "Trusted by bodies:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
msgid "Trusted to make reports that don't need to be inspected"
msgstr ""
-#: templates/web/base/admin/user-form.html:119
+#: templates/web/base/admin/user-form.html:137
msgid "Trusted:"
msgstr ""
+#: templates/web/base/auth/smsform.html:17
#: templates/web/base/js/translation_strings.html:29
msgid "Try again"
msgstr "Cuba lagi"
@@ -4177,7 +4311,11 @@ msgstr ""
msgid "Type"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:59
+#: templates/web/base/admin/user-form.html:38
+msgid "Unban"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:63
#: templates/web/base/admin/contact-form.html:55
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/report_edit-sdm.html:66
@@ -4186,15 +4324,11 @@ msgstr ""
msgid "Unconfirmed"
msgstr "Belum dipastikan"
-#: templates/web/base/reports/_list-filters.html:5
-msgid "Unfixed reports"
-msgstr ""
-
#: templates/web/base/report/banner.html:9
msgid "Unknown"
msgstr "Tidak diketahui"
-#: perllib/FixMyStreet/App/Controller/Rss.pm:174
+#: perllib/FixMyStreet/App/Controller/Rss.pm:178
msgid "Unknown alert type"
msgstr "Jenis pemberitahuan tak diketahui"
@@ -4204,13 +4338,14 @@ msgstr "Jenis pemberitahuan tak diketahui"
msgid "Unknown error"
msgstr "Ralat tidak diketahui"
+#: perllib/FixMyStreet/App/Controller/My.pm:200
#: perllib/FixMyStreet/App/Controller/Report.pm:112
#: perllib/FixMyStreet/App/Controller/Report.pm:118
#: perllib/FixMyStreet/App/Controller/Report.pm:121
msgid "Unknown problem ID"
msgstr "ID masalah tidak diketahui"
-#: templates/web/base/reports/_list-filters.html:10
+#: templates/web/base/reports/_list-filters.html:18
msgid "Unshortlisted"
msgstr ""
@@ -4235,12 +4370,12 @@ msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s"
msgid "Update below added by %s at %s"
msgstr "Kemaskini di bawah ditambah oleh %s pada %s"
-#: templates/web/base/admin/body-form.html:140
-#: templates/web/zurich/admin/body-form.html:52
+#: templates/web/base/admin/body-form.html:139
+#: templates/web/zurich/admin/body-form.html:51
msgid "Update body"
msgstr "Kemas kini badan"
-#: templates/web/base/admin/stats_by_state.html:21
+#: templates/web/base/admin/stats/state.html:21
msgid "Update breakdown by state"
msgstr "Pecahan kemaskini mengikuti negeri"
@@ -4248,16 +4383,16 @@ msgstr "Pecahan kemaskini mengikuti negeri"
msgid "Update by {{name}}"
msgstr "Kemas kini dengan {{name}}"
-#: templates/web/base/admin/update_edit.html:44
+#: templates/web/base/admin/update_edit.html:46
#: templates/web/zurich/admin/update_edit.html:25
msgid "Update changed problem state to %s"
msgstr "Kemas kini mengubahi keadaan masalah kepada %s"
-#: templates/web/base/admin/update_edit.html:46
+#: templates/web/base/admin/update_edit.html:48
msgid "Update marked problem as fixed"
msgstr "Kemas kini menanda masalah sebagai diselesai"
-#: templates/web/base/admin/update_edit.html:48
+#: templates/web/base/admin/update_edit.html:50
msgid "Update reopened problem"
msgstr "Kemas kini masalah dibuka semula"
@@ -4271,20 +4406,20 @@ msgstr "Status kemas kini"
msgid "Updated"
msgstr "Dikemas kinikan"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:260
#, fuzzy
msgid "Updated by <strong>%s</strong> (%s) at %s"
msgstr "Dipostkan oleh <strong>%s</strong> (%s) pada %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:262
#, fuzzy
msgid "Updated by <strong>%s</strong> at %s"
msgstr "Dipostkan oleh <strong>%s</strong> pada %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1262
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1326
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1489
-#: perllib/FixMyStreet/App/Controller/Admin.pm:910
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1299
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1398
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1591
+#: perllib/FixMyStreet/App/Controller/Admin.pm:933
#: perllib/FixMyStreet/Cobrand/Zurich.pm:767
#: perllib/FixMyStreet/Cobrand/Zurich.pm:792
#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
@@ -4292,7 +4427,7 @@ msgid "Updated!"
msgstr "Dikemas kinikan!"
#: templates/web/base/admin/list_updates.html:2
-#: templates/web/base/report/update.html:5
+#: templates/web/base/report/update.html:3
#: templates/web/zurich/report/updates.html:2
msgid "Updates"
msgstr "Kemas kini"
@@ -4339,40 +4474,81 @@ msgstr ""
msgid "User ID to attribute fetched comments to"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1745
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1755
+#, fuzzy
+msgid "User added to abuse list"
+msgstr "Emel ditambahkan kepada senarai penyalahguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1473
+msgid "User already exists"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1742
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1752
+#, fuzzy
+msgid "User already in abuse list"
+msgstr "Emel telah dalam senarai penyalahguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1834
msgid "User flag removed"
msgstr "Tanda pengguna dipadam"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1777
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
msgid "User flagged"
msgstr "Pengguna ditanda"
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:58
-msgid "User has marked as fixed"
-msgstr ""
+#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/user-form.html:38
+#: templates/web/base/admin/users.html:32
+#, fuzzy
+msgid "User in abuse table"
+msgstr "Dalam table penyalahguna?"
#: templates/web/base/admin/users.html:5
msgid "User search finds matches in users' names and email addresses."
msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
-#: perllib/FixMyStreet/Cobrand/Default.pm:669
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: templates/web/base/admin/report_edit.html:129
+#: templates/web/base/admin/update_edit.html:36
+#, fuzzy
+msgid "User:"
+msgstr "Pengguna"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:652
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
#: perllib/FixMyStreet/Cobrand/Zurich.pm:403
-#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55
msgid "Users"
msgstr "Pengguna"
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:159
msgid "Users can perform the following actions within their assigned body or area."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:381
-#: perllib/FixMyStreet/App/Controller/Admin.pm:417
-#: perllib/FixMyStreet/App/Controller/Admin.pm:439
+#: perllib/FixMyStreet/App/Controller/Admin.pm:349
+#: perllib/FixMyStreet/App/Controller/Admin.pm:385
+#: perllib/FixMyStreet/App/Controller/Admin.pm:407
msgid "Values updated"
msgstr "Nilai dikemaskinikan"
+#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55
+msgid "Verify"
+msgstr ""
+
+#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:5
+#, fuzzy
+msgid "Verify email address"
+msgstr "Alamat emel anda"
+
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:5
+#, fuzzy
+msgid "Verify phone number"
+msgstr "Nombor telefon anda"
+
#: templates/web/base/admin/report_edit.html:35
#: templates/web/base/admin/update_edit.html:18
#: templates/web/zurich/admin/report_edit-sdm.html:23
@@ -4394,12 +4570,7 @@ msgstr "Melihat lokasi"
msgid "Viewing a problem"
msgstr "Melihat masalah"
-#. ("Week to date")
-#: templates/web/base/dashboard/index.html:48
-msgid "WTD"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:20
+#: templates/web/base/dashboard/index.html:29
msgid "Ward:"
msgstr ""
@@ -4409,20 +4580,24 @@ msgstr "Kawasan pentadbiran majlis ini"
#: templates/web/base/alert/choose.html:6
#: templates/web/base/around/_error_multiple.html:6
-msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
-msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. "
+msgid "We found more than one match for that location."
+msgstr ""
-#: templates/web/base/around/lookup_by_ref.html:5
+#: templates/web/base/around/lookup_by_ref.html:6
msgid "We found more than one match for that problem reference:"
msgstr ""
+#: templates/web/base/auth/smsform.html:20
+msgid "We have sent a confirmation code to your phone. Please enter it below:"
+msgstr ""
+
#: templates/web/base/auth/general.html:8
#: templates/web/base/report/display.html:35
#: templates/web/base/report/new/oauth_email_form.html:5
msgid "We need your email address, please give it below."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:208
+#: perllib/FixMyStreet/Script/Reports.pm:207
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"
@@ -4430,6 +4605,12 @@ msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada mas
msgid "We send it to the council on your behalf"
msgstr "Kita menghantar kepada majlis bagi pihak anda"
+#: templates/web/base/alert/choose.html:12
+#: templates/web/base/around/_error_multiple.html:12
+#, fuzzy
+msgid "We show up to ten matches, please try a different search if yours is not here."
+msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. "
+
#: templates/web/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>"
@@ -4439,8 +4620,8 @@ msgstr ""
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr ""
-#: templates/web/base/dashboard/index.html:48
-msgid "Week To Date"
+#: templates/web/base/dashboard/index.html:117
+msgid "Website"
msgstr ""
#: templates/web/base/contact/submit.html:7
@@ -4468,7 +4649,7 @@ msgstr ""
msgid "Which problems do you want alerts about?"
msgstr ""
-#: templates/web/base/report/_inspect.html:99
+#: templates/web/base/report/_inspect.html:105
msgid "Which report is it a duplicate of?"
msgstr ""
@@ -4491,6 +4672,10 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
+#: templates/web/base/dashboard/index.html:158
+msgid "Within the specified timeframe:"
+msgstr ""
+
#: templates/web/base/front/footer-marketing.html:3
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>."
msgstr ""
@@ -4507,16 +4692,7 @@ msgstr ""
msgid "Wrong location? Just click again on the map."
msgstr ""
-#. ("Year to date")
-#: templates/web/base/dashboard/index.html:51
-msgid "YTD"
-msgstr ""
-
-#: templates/web/base/admin/stats.html:10
-msgid "Year"
-msgstr "Tahun"
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:1236
+#: perllib/FixMyStreet/Cobrand/Default.pm:1221
#: templates/web/base/admin/bodies.html:70
#: templates/web/base/admin/category_edit.html:5
#: templates/web/base/admin/flagged.html:47
@@ -4531,7 +4707,7 @@ msgstr "Tahun"
#: templates/web/base/questionnaire/creator_fixed.html:14
#: templates/web/base/questionnaire/index.html:104
#: templates/web/base/questionnaire/index.html:53
-#: templates/web/base/report/_inspect.html:90
+#: templates/web/base/report/_inspect.html:96
msgid "Yes"
msgstr "Ya"
@@ -4544,7 +4720,7 @@ msgstr "Ya aku ada kata laluan"
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr ""
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:77
msgid "You are offline"
msgstr ""
@@ -4561,7 +4737,7 @@ msgstr ""
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
-#: templates/web/base/admin/user-form.html:96
+#: templates/web/base/admin/user-form.html:114
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
@@ -4587,7 +4763,7 @@ 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:93
+#: templates/web/base/admin/body-form.html:92
msgid "You can mark a body as deleted if you do not want it to be active on the site."
msgstr ""
@@ -4595,7 +4771,7 @@ msgstr ""
msgid "You declined; please fill in the box above"
msgstr "Anda menolak; sila isikan kotak di atas"
-#: templates/web/base/js/translation_strings.html:75
+#: templates/web/base/js/translation_strings.html:79
msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
msgstr ""
@@ -4622,18 +4798,38 @@ msgstr "Anda telah dilog keluarkan"
msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
msgstr "Anda telah menunjukkan masalah pada titik atas peta yang ditanda pin hijau. Jika lokasi ini tidak betul, sila klik atas peta lagi."
-#: templates/web/base/auth/change_email.html:6
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125
+#, fuzzy
+msgid "You have successfully added your phone number."
+msgstr "Anda telah berjaya memastikan alamat emel anda."
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "Anda telah berjaya memastikan alamat emel anda."
+#: templates/web/base/auth/change_phone.html:15
+#, fuzzy
+msgid "You have successfully confirmed your phone number."
+msgstr "Anda telah berjaya memastikan alamat emel anda."
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112
+#, fuzzy
+msgid "You have successfully removed your phone number."
+msgstr "Anda telah berjaya memastikan alamat emel anda."
+
#: templates/web/base/report/display.html:25
#: templates/web/base/report/new/login_success_form.html:3
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Anda telah berjaya log masuk; sila semak dan pastikan maklumat anda adalah tepat: "
-#: templates/web/base/my/my.html:31
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147
+#, fuzzy
+msgid "You have successfully verified your phone number."
+msgstr "Anda telah berjaya memastikan alamat emel anda."
+
+#: templates/web/base/my/my.html:73
msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
msgstr ""
@@ -4660,36 +4856,43 @@ msgid "Your Reports"
msgstr "Laporan Anda"
#: templates/web/base/auth/change_password.html:11
+#: templates/web/base/auth/generate_token.html:15
#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
msgid "Your account"
msgstr ""
#: templates/web/base/alert/updates.html:19
#: templates/web/base/alert/updates.html:22
+#: templates/web/base/auth/general.html:44
#: templates/web/base/contact/index.html:80
#: templates/web/base/report/display_tools.html:46
#: templates/web/base/report/display_tools.html:49
-#: templates/web/base/report/new/form_user_loggedout_email.html:1
-#: templates/web/base/report/update/form_user_loggedout_email.html:1
+#: templates/web/base/report/new/form_user_loggedout_email.html:6
+#: templates/web/base/report/update/form_user_loggedout_email.html:6
#: templates/web/zurich/report/new/fill_in_details_form.html:53
msgid "Your email"
msgstr "Emel Anda"
-#: templates/web/base/auth/change_email.html:9
-#: templates/web/base/auth/general.html:57
-#: templates/web/base/report/update/form_user_loggedout_email.html:5
+#: templates/web/base/auth/change_email.html:15
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
msgstr "Alamat emel anda"
+#: templates/web/base/auth/general.html:42
+#: templates/web/base/report/new/form_user_loggedout_email.html:2
+#: templates/web/base/report/update/form_user_loggedout_email.html:2
+#, fuzzy
+msgid "Your email or mobile"
+msgstr "Alamat emel anda"
+
#: templates/web/base/report/updates-sidebar-notes.html:3
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
-#: templates/web/base/auth/general.html:109
+#: templates/web/base/auth/general.html:114
#: templates/web/base/contact/index.html:74
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:17
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:21
#: templates/web/base/report/update/form_name.html:33
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:63
@@ -4700,19 +4903,19 @@ msgstr "Nama anda"
msgid "Your name has already been sent to %s, but we can hide it on this page:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:264
+#: perllib/FixMyStreet/App/Controller/My.pm:272
msgid "Your name has been hidden from all your reports and updates."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:260
+#: perllib/FixMyStreet/App/Controller/My.pm:268
msgid "Your name has been hidden."
msgstr ""
-#: templates/web/base/js/translation_strings.html:65
+#: templates/web/base/js/translation_strings.html:69
msgid "Your offline reports"
msgstr ""
-#: templates/web/base/auth/general.html:87
+#: templates/web/base/auth/general.html:84
#: templates/web/base/report/new/form_user_loggedout_password.html:10
#: templates/web/base/report/update/form_user_loggedout_password.html:9
#: templates/web/zurich/auth/general.html:34
@@ -4723,8 +4926,8 @@ msgstr "Kata laluan anda"
msgid "Your password has been changed"
msgstr "Kata laluan anda telah diubahi"
+#: templates/web/base/auth/change_phone.html:19
#: templates/web/base/contact/index.html:87
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
#: templates/web/zurich/report/new/fill_in_details_form.html:69
msgid "Your phone number"
msgstr "Nombor telefon anda"
@@ -4733,7 +4936,7 @@ msgstr "Nombor telefon anda"
msgid "Your report"
msgstr ""
-#: templates/web/base/my/my.html:28
+#: templates/web/base/my/my.html:70
msgid "Your reports"
msgstr "Laporan anda"
@@ -4742,25 +4945,40 @@ msgstr "Laporan anda"
msgid "Your shortlist"
msgstr ""
-#: templates/web/base/js/translation_strings.html:66
+#: templates/web/base/auth/generate_token.html:8
+#, fuzzy
+msgid "Your token has been generated"
+msgstr "Kata laluan anda telah diubahi"
+
+#: templates/web/base/js/translation_strings.html:70
msgid "Your update has been saved offline for submission when back online."
msgstr ""
-#: templates/web/base/my/my.html:51
+#: templates/web/base/my/my.html:93
msgid "Your updates"
msgstr "Kemas kini anda"
+#: perllib/FixMyStreet/SMS.pm:46
+msgid "Your verification code is %s"
+msgstr ""
+
#: templates/web/base/report/new/form_user_loggedin.html:19
#: templates/web/base/report/update/form_name.html:12
msgid "Yourself"
msgstr ""
#: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:151
+#: templates/web/base/admin/user-form.html:169
msgid "all"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:259
+#: perllib/FixMyStreet/App/Controller/Admin.pm:909
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:85
+#: perllib/FixMyStreet/DB/Result/Comment.pm:236
+msgid "an administrator"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:270
msgid "and a defect raised"
msgstr ""
@@ -4777,8 +4995,8 @@ msgstr "majlis"
msgid "didn't use map"
msgstr "tidak mengguna peta"
-#: templates/web/base/alert/index.html:33
-#: templates/web/base/around/postcode_form.html:12
+#: templates/web/base/alert/index.html:34
+#: templates/web/base/around/postcode_form.html:14
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "seperti ‘%s’ atau ‘%s’"
@@ -4801,23 +5019,24 @@ msgstr "kemaskini yang lepas %s"
msgid "less than a minute"
msgstr "kurang dari seminit"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:119
-#: templates/web/base/admin/questionnaire.html:15
-#: templates/web/base/admin/questionnaire.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:120
+#: templates/web/base/admin/stats/questionnaire.html:15
+#: templates/web/base/admin/stats/questionnaire.html:16
msgid "n/a"
msgstr "tiada"
#: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:170
msgid "none"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:77
#, fuzzy
msgid "not the council's responsibility"
msgstr "ditanda sebagai bukan tanggungjawab majlis"
-#: templates/web/base/js/translation_strings.html:27
+#: templates/web/base/alert/index.html:38
+#: templates/web/base/around/postcode_form.html:26
msgid "or locate me automatically"
msgstr "atau mengesan aku secara automatik"
@@ -4858,7 +5077,7 @@ msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta"
msgid "this location"
msgstr "Melihat lokasi"
-#: perllib/FixMyStreet/Script/Reports.pm:184
+#: perllib/FixMyStreet/Script/Reports.pm:183
msgid "this type of local problem"
msgstr "jenis masalah tempatan ini"
@@ -4866,11 +5085,11 @@ msgstr "jenis masalah tempatan ini"
msgid "today"
msgstr "hari ini"
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:80
msgid "update"
msgstr ""
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:81
msgid "updates"
msgstr ""
@@ -4878,14 +5097,24 @@ msgstr ""
msgid "used map"
msgstr "peta diguna"
-#: templates/web/base/admin/update_edit.html:37
+#: templates/web/base/admin/update_edit.html:39
msgid "user is from same council as problem - %d"
msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d"
-#: templates/web/base/admin/update_edit.html:40
+#: templates/web/base/admin/update_edit.html:42
msgid "user is problem owner"
msgstr "pengguna adalah pemilik masalah"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1778
+#, fuzzy
+msgid "user not in abuse list"
+msgstr "Emel telah dalam senarai penyalahguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1776
+#, fuzzy
+msgid "user removed from abuse list"
+msgstr "Emel ditambahkan kepada senarai penyalahguna"
+
#: templates/web/base/reports/body.html:0
#: templates/web/base/reports/body.html:3
msgid "ward"
@@ -4939,31 +5168,31 @@ msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: templates/web/base/reports/index.html:92
+#: templates/web/fixmystreet.com/reports/summary.html:103
#, perl-format
msgid "%s day"
msgid_plural "%s days"
msgstr[0] ""
-#: templates/web/base/reports/index.html:55
+#: templates/web/base/reports/index.html:57
#, perl-format
msgid "%s problem marked as fixed"
msgid_plural "%s problems marked as fixed"
msgstr[0] ""
-#: templates/web/base/reports/index.html:43
+#: templates/web/base/reports/index.html:45
#, perl-format
msgid "%s problem reported"
msgid_plural "%s problems reported"
msgstr[0] ""
-#: templates/web/base/reports/index.html:107
+#: templates/web/fixmystreet.com/reports/summary.html:119
#, perl-format
msgid "%s report"
msgid_plural "%s reports"
msgstr[0] ""
-#: templates/web/base/reports/index.html:49
+#: templates/web/base/reports/index.html:51
#, perl-format
msgid "%s update on problems"
msgid_plural "%s updates on problems"
@@ -5023,6 +5252,39 @@ msgid "report"
msgid_plural "reports"
msgstr[0] ""
+#~ msgid "(Email in abuse table)"
+#~ msgstr "(Emel dalam jadual penyalahguna)"
+
+#~ msgid "By Date"
+#~ msgstr "Dengan Tarikh"
+
+#~ msgid "Click here or enter as dd/mm/yyyy"
+#~ msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy"
+
+#~ msgid "Confirmed reports between %s and %s"
+#~ msgstr "Laporan disahkan antara %s dan %s"
+
+#~ msgid "Hide old"
+#~ msgstr "Sembunyikan lama"
+
+#~ msgid "Include unconfirmed reports"
+#~ msgstr "Termasuk laporan yang belum disahkan"
+
+#~ msgid "Invalid end date"
+#~ msgstr "Tarikh berakhir yang tak sah"
+
+#~ msgid "Invalid start date"
+#~ msgstr "Tarikh mula yang tak sah"
+
+#~ msgid "No council"
+#~ msgstr "Tiada majlis"
+
+#~ msgid "Show old"
+#~ msgstr "Tunjukkan lama"
+
+#~ msgid "Year"
+#~ msgstr "Tahun"
+
#~ msgid "%s ward, %s"
#~ msgstr "%s kawasan pentadbiran, %s"
@@ -5053,9 +5315,6 @@ msgstr[0] ""
#~ msgid "No further action"
#~ msgstr "Tidak dapat diselesai"
-#~ msgid "Not Responsible"
-#~ msgstr "Tidak Bertanggungjawab"
-
#~ msgid "Or problems reported to:"
#~ msgstr "Atau masalah dilaporkan kepada:"