aboutsummaryrefslogtreecommitdiffstats
path: root/locale/ms.UTF-8
diff options
context:
space:
mode:
Diffstat (limited to 'locale/ms.UTF-8')
-rw-r--r--locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po1235
1 files changed, 518 insertions, 717 deletions
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index 765a43220..471a81f2d 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2015-10-23 16:51+0100\n"
-"PO-Revision-Date: 2015-07-31 16:31+0000\n"
+"POT-Creation-Date: 2016-03-02 13:09+0000\n"
+"PO-Revision-Date: 2015-10-23 16:38+0000\n"
"Last-Translator: mySociety <transifex@mysociety.org>\n"
"Language-Team: Malay (http://www.transifex.com/mysociety/fixmystreet/language/ms/)\n"
"Language: ms\n"
@@ -19,45 +19,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:628
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411
+#: perllib/FixMyStreet/DB/Result/Problem.pm:616
+#: perllib/FixMyStreet/Script/Reports.pm:189
msgid " and "
msgstr " dan "
#: templates/web/base/report/new/councils_text_all.html:2
-#: templates/web/base/report/new/councils_text_none.html:11
-#: templates/web/base/report/new/councils_text_none.html:2
+#: templates/web/base/report/new/councils_text_none.html:12
+#: templates/web/base/report/new/councils_text_none.html:15
#: templates/web/base/report/new/councils_text_some.html:19
#: templates/web/base/report/new/councils_text_some.html:22
#: templates/web/base/report/new/councils_text_some.html:5
msgid " or "
msgstr " atau "
-#: templates/web/base/admin/index.html:35
-#: templates/web/base/status/index.html:13
-msgid "%s confirmed alerts, %s unconfirmed"
-msgstr "%d alert disahkan, %d belum disah"
-
-#: templates/web/base/admin/index.html:37
-#: templates/web/base/status/index.html:16
-#: templates/web/zurich/admin/index.html:6
-msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
-msgstr "%d cara hubungan majlis &ndash; %d disahkan, %d belum disah"
-
#: templates/web/base/admin/edit-league.html:12
msgid "%d edits by %s"
msgstr "%d suntingan daripada %s"
-#: templates/web/base/admin/index.html:34
-#: templates/web/base/status/index.html:12
-msgid "%s live updates"
-msgstr "%d update secara langsung"
-
-#: templates/web/base/admin/index.html:36
-#: templates/web/base/status/index.html:14
-msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
-msgstr "%d soalan selidik dihantar &ndash; %d dijawabi (%s%%)"
-
#: templates/web/base/pagination.html:10
msgid "%d to %d of %d"
msgstr "%d kepada %d daripada %d"
@@ -72,6 +51,20 @@ msgstr "%s - Laporan Ringkasan"
msgid "%s admin:"
msgstr ""
+#: templates/web/base/status/stats.html:26
+#, fuzzy
+msgid "%s bodies"
+msgstr "Badan"
+
+#: templates/web/base/status/stats.html:24
+msgid "%s confirmed alerts, %s unconfirmed"
+msgstr "%s alert disahkan, %s belum disah"
+
+#: templates/web/base/status/stats.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%s council contacts &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
msgid ""
@@ -88,7 +81,15 @@ msgid ""
"within a certain distance of a particular location."
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: templates/web/base/status/stats.html:23
+msgid "%s live updates"
+msgstr "%s update secara langsung"
+
+#: templates/web/base/status/stats.html:25
+msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
+msgstr "%s soalan selidik dihantar &ndash; %s dijawabi (%s%%)"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:683
msgid "%s ref:&nbsp;%s"
msgstr "%s ruj;&nbsp;%s"
@@ -103,15 +104,15 @@ msgid ""
"for the county council."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267
+#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
msgid "%s ward, %s"
msgstr "%s kawasan pentadbiran, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
+#: perllib/FixMyStreet/DB/Result/Problem.pm:552
msgid "%s, reported at %s"
msgstr "%s, dilaporkan pada %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
+#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295
msgid "%s, within %s ward"
msgstr "%s, dalam kawasan pentadbiran %s"
@@ -119,7 +120,7 @@ msgstr "%s, dalam kawasan pentadbiran %s"
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr ""
-#: templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "(Defect &amp; location of defect)"
msgstr ""
@@ -130,15 +131,13 @@ msgstr "(Emel dalam jadual penyalahguna)"
#: templates/web/zurich/admin/report_edit-sdm.html:60
#: templates/web/zurich/admin/report_edit.html:88
-#, fuzzy
msgid "(No name)"
-msgstr "Nama anda"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:95
-#, fuzzy
msgid "(No phone number)"
-msgstr "Nombor telefon anda"
+msgstr ""
#: templates/web/base/alert/_list.html:24
msgid "(a default distance which covers roughly 200,000 people)"
@@ -146,17 +145,16 @@ msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)"
#. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
#: templates/web/base/alert/_list.html:29
-#, fuzzy
msgid "(alternatively the RSS feed can be customised, within %s)"
-msgstr "(manakala RSS feed disesuaikan, dalam"
+msgstr ""
-#: templates/web/base/report/_item.html:27
-#: templates/web/zurich/report/_item.html:21
+#: templates/web/base/report/_item.html:25
+#: templates/web/zurich/report/_item.html:19
msgid "(closed)"
msgstr "(ditutup)"
-#: templates/web/base/report/_item.html:25
-#: templates/web/zurich/report/_item.html:19
+#: templates/web/base/report/_item.html:23
+#: templates/web/zurich/report/_item.html:17
msgid "(fixed)"
msgstr "(tetap)"
@@ -164,37 +162,28 @@ msgstr "(tetap)"
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)"
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:19
msgid "(not sent to council)"
msgstr "(tidak dihantar kepada majlis)"
-#: templates/web/base/report/new/fill_in_details_form.html:200
#: templates/web/zurich/report/new/fill_in_details_form.html:82
msgid "(optional)"
msgstr "(tidak diwajibkan)"
-#: templates/web/fixmystreet/report/public_label.html:1
+#: templates/web/base/report/public_label.html:1
msgid "(public)"
msgstr ""
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:18
msgid "(sent to both)"
msgstr "(hantar kepada kedua-dua)"
-#: templates/web/base/report/new/fill_in_details_form.html:194
-msgid "(we never show your email address or phone number)"
-msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)"
-
-#: templates/web/base/report/update-form.html:159
-msgid "(we never show your email)"
-msgstr "(kita tidak akan menunjukkan alamat emel anda)"
-
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:673
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:668
#: perllib/FixMyStreet/DB/Result/Problem.pm:410
msgid "-- Pick a category --"
msgstr "-- Pilih kategori --"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:632
#: perllib/FixMyStreet/DB/Result/Problem.pm:416
msgid "-- Pick a property type --"
msgstr "-- Pilih jenis harta --"
@@ -216,52 +205,39 @@ msgstr ""
msgid "<label>Show %s</label> <label>about %s</label>"
msgstr ""
-#: templates/web/base/admin/index.html:32
-#: templates/web/base/status/index.html:11
+#: templates/web/base/status/stats.html:18
#: templates/web/zurich/admin/index.html:4
msgid "<strong>%s</strong> live problems"
-msgstr "<strong>%d</strong> masalah"
+msgstr "<strong>%s</strong> masalah"
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:2
msgid "<strong>No</strong> Let me confirm my report by email"
msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel"
-#: templates/web/fixmystreet/report/update-form.html:112
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:2
msgid "<strong>No</strong> Let me confirm my update by email"
msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
-#: templates/web/base/auth/general.html:48
+#: templates/web/base/auth/general.html:87
#: templates/web/zurich/auth/general.html:51
msgid "<strong>No</strong> let me sign in by email"
msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
-#: templates/web/base/report/new/fill_in_details_form.html:145
-msgid "<strong>No</strong>, let me confirm my report by email:"
-msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:"
-
-#: templates/web/base/report/update-form.html:118
-msgid "<strong>No</strong>, let me confirm my update by email:"
-msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
-
-#: templates/web/base/auth/general.html:34
-#: templates/web/base/report/new/fill_in_details_form.html:123
-#: templates/web/base/report/update-form.html:96
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15
-#: templates/web/fixmystreet/report/update-form.html:89
+#: templates/web/base/auth/general.html:70
+#: templates/web/base/report/new/form_user_loggedout_password.html:3
+#: templates/web/base/report/update/form_user_loggedout_password.html:2
msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>Ya</strong> Aku ada kata laluan"
-#: templates/web/base/static/about-en-gb.html:1
-#: templates/web/base/static/about-en-gb.html:3
+#: templates/web/base/about/about-en-gb.html:1
+#: templates/web/base/about/about-en-gb.html:3
msgid "About us"
msgstr "Tentang kita"
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:8
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:31
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:29
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:35
msgid "Action Scheduled"
msgstr "Jadual tindakan"
@@ -292,14 +268,13 @@ msgstr "Tambah kategori baru"
msgid "Add user"
msgstr "Tambah pengguna"
-#: templates/web/base/my/my.html:52
+#: templates/web/base/my/my.html:56
msgid "Added %s"
msgstr "%s telah ditambahi"
#: templates/web/base/report/new/category_extras.html:9
-#, fuzzy
msgid "Additional Information"
-msgstr "Mengunggu penyederhanaan"
+msgstr ""
#: templates/web/base/auth/change_password.html:29
msgid "Again:"
@@ -313,8 +288,7 @@ msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s"
msgid "Alert %d disabled (created %s)"
msgstr "Pemberitahuan %d dihenti (dibuat pada %s)"
-#: templates/web/base/report/update-form.html:164
-#: templates/web/fixmystreet/report/update-form.html:150
+#: templates/web/base/report/update/form_name.html:20
msgid "Alert me to future updates"
msgstr "Maklumkan aku sebarang kemas kini masa depan"
@@ -324,9 +298,8 @@ msgid "All Reports"
msgstr "Semua Laporan"
#: templates/web/zurich/admin/stats.html:5
-#, fuzzy
msgid "All Reports as CSV"
-msgstr "Semua Laporan"
+msgstr ""
#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32
#: templates/web/zurich/admin/index-dm.html:12
@@ -347,10 +320,8 @@ msgstr "Semua maklumat yang disediakan anda akan dihantar kepada"
#: templates/web/base/report/new/councils_text_all.html:2
#: templates/web/base/report/new/councils_text_all.html:4
-#: templates/web/base/report/new/fill_in_details_form.html:12
-#: templates/web/base/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11
+#: templates/web/base/report/new/fill_in_details_form.html:10
+#: templates/web/base/report/new/fill_in_details_form.html:9
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr ""
@@ -372,6 +343,10 @@ msgstr "Tanpa Nama:"
msgid "Are you a developer?"
msgstr "Adakan anda developer?"
+#: templates/web/base/js/translation_strings.html:52
+msgid "Are you sure you want to cancel this upload?"
+msgstr ""
+
#: templates/web/base/admin/body-form.html:69
#: templates/web/base/admin/body.html:16
#: templates/web/zurich/admin/body-form.html:24
@@ -384,9 +359,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will
msgstr ""
#: templates/web/zurich/admin/report_edit.html:213
-#, fuzzy
msgid "Assign to competent body:"
-msgstr "Ditugaskan kepada badan luaran:"
+msgstr ""
#: templates/web/zurich/admin/report_edit.html:173
#: templates/web/zurich/admin/stats.html:36
@@ -405,16 +379,16 @@ msgstr "Ditugaskan kepada bahagian bawah:"
msgid "Assigned to %s"
msgstr "Ditugaskan kepada %s"
-#: templates/web/base/open311/index.html:84
+#: templates/web/base/open311/index.html:76
msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
msgstr ""
-#: templates/web/base/open311/index.html:76
+#: templates/web/base/open311/index.html:68
msgid "At the moment only searching for and looking at reports work."
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:373
-#: templates/web/zurich/report/_item.html:11
+#: templates/web/zurich/report/_item.html:9
msgid "Awaiting moderation"
msgstr "Mengunggu penyederhanaan"
@@ -426,7 +400,7 @@ msgstr "Balik"
msgid "Ban email address"
msgstr "Melarang alamat emel"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1276
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1285
#: perllib/FixMyStreet/Cobrand/Zurich.pm:392
#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64
msgid "Bodies"
@@ -456,7 +430,7 @@ msgid "Can't see the map? <em>Skip this step</em>"
msgstr ""
#: templates/web/base/admin/body.html:68
-#: templates/web/base/admin/index.html:61
+#: templates/web/base/admin/index.html:54
#: templates/web/base/report/new/category.html:10
#: templates/web/base/report/new/category_wrapper.html:3
#: templates/web/zurich/admin/body.html:14
@@ -467,8 +441,8 @@ msgstr ""
msgid "Category"
msgstr "Kategori"
-#: templates/web/base/admin/index.html:59
-#: templates/web/base/admin/index.html:67
+#: templates/web/base/admin/index.html:52
+#: templates/web/base/admin/index.html:60
msgid "Category fix rate for problems > 4 weeks old"
msgstr "Kategori rata masalah diselesai > 4 minggu"
@@ -481,7 +455,7 @@ msgstr "Kategori rata masalah diselesai > 4 minggu"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402
+#: perllib/FixMyStreet/Script/Reports.pm:180
msgid "Category: %s"
msgstr "Kategori: %s"
@@ -531,7 +505,7 @@ msgid "Click here or enter as dd/mm/yyyy"
msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy"
#: templates/web/base/around/_report_banner.html:2
-#: templates/web/base/js/translation_strings.html:50
+#: templates/web/base/js/translation_strings.html:55
msgid "Click map to report a problem"
msgstr "Klik peta untuk melaporkan masalah"
@@ -558,7 +532,7 @@ msgstr ""
#: templates/web/base/admin/report_blocks.html:25
#: templates/web/base/dashboard/index.html:142
#: templates/web/base/dashboard/index.html:144
-#: templates/web/fixmystreet/report/banner.html:15
+#: templates/web/base/report/banner.html:15
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:16
@@ -566,7 +540,7 @@ msgstr ""
msgid "Closed"
msgstr "Ditutup"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:794
+#: perllib/FixMyStreet/DB/Result/Problem.pm:779
msgid "Closed by council"
msgstr "Ditutup oleh majlis"
@@ -592,7 +566,7 @@ msgstr "Data Cobrand"
msgid "Cobrand:"
msgstr "Cobrand:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr "Konfigurasi"
@@ -605,13 +579,13 @@ msgstr "Mengkonfigurasi Endpoint"
msgid "Confirm"
msgstr "Sah"
-#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1
+#: templates/web/base/auth/token.html:1
msgid "Confirm account"
msgstr "Mengesahkan Akaun"
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33
-#: templates/web/fixmystreet/report/update-form.html:107
-msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
+#: templates/web/base/report/new/form_user_loggedout_password.html:21
+#: templates/web/base/report/update/form_user_loggedout_password.html:20
+msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
msgstr ""
#: templates/web/base/questionnaire/creator_fixed.html:1
@@ -641,35 +615,27 @@ msgid "Confirmed:"
msgstr "Disahkan:"
#. ("%s is the site name")
-#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24
-#: templates/web/base/open311/index.html:8
-#: templates/web/base/static/privacy.html:10
-#: templates/web/fixmystreet/contact/index.html:12
-#, fuzzy
+#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24
msgid "Contact %s"
-msgstr "Menghubungi Kita"
+msgstr ""
#: templates/web/base/contact/index.html:1
#: templates/web/base/contact/index.html:2
#: templates/web/base/contact/submit.html:1
-#: templates/web/fixmystreet/contact/index.html:1
-#: templates/web/fixmystreet/contact/index.html:2
msgid "Contact Us"
msgstr "Menghubungi Kita"
-#: templates/web/base/contact/index.html:6
-#: templates/web/fixmystreet/contact/index.html:20
+#: templates/web/base/contact/index.html:12
msgid "Contact the team"
msgstr "Menghubungi pasukan"
#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit.html:59
-#, fuzzy
msgid "Coordinates:"
-msgstr "Kordinat:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1420
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1448
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1429
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1457
msgid "Could not find user"
msgstr "Tidak dapat mencari pengguna"
@@ -687,7 +653,7 @@ msgstr "Majlis"
msgid "Council contacts for %s"
msgstr "Hubungan Majlis untuk %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:693
+#: perllib/FixMyStreet/DB/Result/Problem.pm:681
msgid "Council ref:&nbsp;%s"
msgstr "Rujukan majlis:&nbsp;%s"
@@ -702,7 +668,7 @@ msgstr "Majlis:"
msgid "Count"
msgstr "Kiraan"
-#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1
+#: templates/web/base/email_sent.html:1
msgid "Create a report"
msgstr "Laporan baru"
@@ -712,9 +678,8 @@ msgid "Create category"
msgstr "Kategori baru"
#: templates/web/zurich/admin/template_edit.html:29
-#, fuzzy
msgid "Create template"
-msgstr "Laporan baru"
+msgstr ""
#: templates/web/base/admin/problem_row.html:34
#: templates/web/zurich/admin/templates.html:10
@@ -751,7 +716,7 @@ msgstr "Papan pemuka"
msgid "Dealt with by subdivision within 5 working days"
msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:878
+#: perllib/FixMyStreet/App/Controller/Admin.pm:877
#: templates/web/zurich/admin/template_edit.html:33
msgid "Delete template"
msgstr ""
@@ -764,7 +729,7 @@ msgstr ""
msgid "Deleted"
msgstr "Dipadam"
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51
+#: templates/web/base/report/new/form_report.html:45
#: templates/web/zurich/admin/index-dm.html:22
#: templates/web/zurich/admin/index-sdm.html:20
#: templates/web/zurich/admin/reports.html:12
@@ -772,12 +737,11 @@ msgid "Description"
msgstr "Huraian"
#: templates/web/base/js/translation_strings.html:34
-#: templates/web/zurich/report/new/fill_in_details_form.html:42
+#: templates/web/zurich/report/new/fill_in_details_form.html:68
msgid "Details"
msgstr "Perincian"
#: templates/web/base/admin/report_edit.html:20
-#: templates/web/base/report/new/fill_in_details_form.html:62
#: templates/web/zurich/admin/report_edit-sdm.html:27
#: templates/web/zurich/admin/report_edit.html:29
#: templates/web/zurich/admin/report_edit.html:43
@@ -790,38 +754,38 @@ msgstr "Didelegasikan"
#: templates/web/zurich/admin/report_edit-sdm.html:50
#: templates/web/zurich/admin/report_edit.html:69
-#, fuzzy
msgid "Didn't use map"
-msgstr "tidak mengguna peta"
+msgstr ""
#: templates/web/base/admin/edit-league.html:8
msgid "Diligency prize league table"
msgstr "Jadual liga hadiah ketekunan"
#. ("%s is the site name")
-#: templates/web/base/auth/general.html:31
-#: templates/web/base/report/new/fill_in_details_form.html:114
-#: templates/web/base/report/update-form.html:87
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11
-#: templates/web/fixmystreet/report/update-form.html:86
-#, fuzzy
+#: templates/web/base/auth/general.html:48
+#: templates/web/base/report/new/form_user_loggedout.html:18
+#: templates/web/base/report/new/oauth_email_form.html:18
+#: templates/web/base/report/update-form.html:29
+#: templates/web/base/report/update/form_user_loggedout.html:17
msgid "Do you have a %s password?"
-msgstr "Adakan anda mempunyai kata laluan FixMyStreet?"
+msgstr ""
#: templates/web/base/questionnaire/index.html:55
msgid "Don&rsquo;t know"
msgstr "Tidak tahu"
-#: templates/web/fixmystreet/contact/index.html:118
+#: templates/web/base/contact/index.html:110
msgid "Don't like forms?"
msgstr ""
+#: templates/web/base/js/translation_strings.html:51
+msgid "Drag and drop photos here or <u>click to upload</u>"
+msgstr ""
+
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:14
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:32
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:30
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:36
msgid "Duplicate"
msgstr "Salinan"
@@ -871,7 +835,7 @@ msgstr "Editor"
#: templates/web/base/admin/category_edit.html:91
#: templates/web/base/admin/flagged.html:38
#: templates/web/base/admin/users.html:16
-#: templates/web/base/auth/general.html:22
+#: templates/web/base/auth/general.html:39
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:15
#: templates/web/zurich/auth/general.html:24
@@ -879,7 +843,7 @@ msgstr "Editor"
msgid "Email"
msgstr "Emel"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1396
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1405
msgid "Email added to abuse list"
msgstr "Emel ditambahkan kepada senarai penyalahguna"
@@ -895,7 +859,7 @@ msgstr ""
msgid "Email alert deleted"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1393
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1402
msgid "Email already in abuse list"
msgstr "Emel telah dalam senarai penyalahguna"
@@ -903,41 +867,36 @@ msgstr "Emel telah dalam senarai penyalahguna"
msgid "Email me new local problems"
msgstr "Emel aku masalah tempatan baru"
-#: templates/web/base/report/display.html:38
-msgid "Email me updates"
-msgstr "Emel aku kemas kini"
-
#: templates/web/base/admin/category_edit.html:31
#: templates/web/base/admin/report_edit.html:62
#: templates/web/base/admin/update_edit.html:33
#: templates/web/base/admin/user-form.html:20
#: templates/web/base/alert/updates.html:13
-#: templates/web/base/report/display.html:42
#: templates/web/zurich/admin/body.html:47
msgid "Email:"
msgstr "Emel:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329
+#: perllib/FixMyStreet/Script/Reports.pm:108
msgid "Email: %s"
msgstr "Emel: %s"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:639
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:634
msgid "Empty flat or maisonette"
msgstr "Flat atau apartmen lama"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:638
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:633
msgid "Empty house or bungalow"
msgstr "Rumah kosong atau banglo"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:641
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:636
msgid "Empty office or other commercial"
msgstr "Pejabat kosing atau komersial lain"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:642
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
msgid "Empty pub or bar"
msgstr "Pub kosong atau bar"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:643
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:638
msgid "Empty public building - school, hospital, etc."
msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain"
@@ -970,7 +929,7 @@ msgstr "Endpoint"
msgid "Enter a Z&uuml;rich street name"
msgstr "Masukkan nama jalan Z&uuml;rich"
-#: perllib/FixMyStreet/Cobrand/UK.pm:13
+#: perllib/FixMyStreet/Cobrand/UK.pm:14
msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan"
@@ -988,14 +947,9 @@ msgstr "Masukkan nama jalan dan kawasan terdekat"
msgid "Enter a nearby street name and area, postal code or district in Delhi"
msgstr ""
-#: templates/web/base/report/new/fill_in_details_form.html:152
-#: templates/web/base/report/update-form.html:125
-msgid "Enter a new password:"
-msgstr "Masukkan kata laluan baru"
-
-#: templates/web/base/auth/general.html:60
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75
-#: templates/web/fixmystreet/report/update-form.html:123
+#: templates/web/base/auth/general.html:99
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:38
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
#: templates/web/zurich/auth/general.html:65
msgid "Enter a password"
msgstr "Masukkan kata laluan"
@@ -1005,11 +959,11 @@ msgid "Enter details of the problem"
msgstr "Masukkan perincian masalah tersebut"
#: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:3
+#: templates/web/base/errors/generic.html:4
#: templates/web/base/tokens/abuse.html:1
#: templates/web/base/tokens/abuse.html:3
#: templates/web/base/tokens/error.html:1
-#: templates/web/base/tokens/error.html:3
+#: templates/web/base/tokens/error.html:5
msgid "Error"
msgstr "Ralat"
@@ -1022,11 +976,11 @@ msgstr ""
msgid "Example postcode %s"
msgstr "Contoh poskod %s"
-#: templates/web/base/open311/index.html:94
+#: templates/web/base/open311/index.html:86
msgid "Examples:"
msgstr "Contoh:"
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55
+#: templates/web/base/report/new/form_report.html:49
msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…"
msgstr ""
@@ -1067,17 +1021,15 @@ msgstr ""
msgid "FixMyStreet"
msgstr "FixMyStreet"
-#: templates/web/base/admin/index.html:61
+#: templates/web/base/admin/index.html:54
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:24
#: templates/web/base/admin/report_blocks.html:9
#: templates/web/base/dashboard/index.html:142
#: templates/web/base/dashboard/index.html:144
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:34
-#: templates/web/fixmystreet/report/banner.html:12
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:32
+#: templates/web/base/report/banner.html:12
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:38
msgid "Fixed"
msgstr "Diselesai"
@@ -1104,7 +1056,7 @@ msgstr "Tanda sebagai dipadam"
msgid "Flag user"
msgstr "Tanda pengguna"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1281
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1290
#: templates/web/base/admin/users.html:19
msgid "Flagged"
msgstr "Ditanda"
@@ -1135,36 +1087,31 @@ msgstr "Ikuti link kawasan pentadbiran untuk melihat laporan dalam kawasan terse
msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
msgstr "Untuk maklumat lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>."
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32
-#: templates/web/fixmystreet/report/update-form.html:106
+#: templates/web/base/report/new/form_user_loggedout_password.html:20
+#: templates/web/base/report/update/form_user_loggedout_password.html:19
msgid "Forgotten your password?"
msgstr "Terlupai kata laluan anda?"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:752
-#, fuzzy
msgid "Forwarded to external body"
-msgstr "Ditugaskan kepada badan luaran:"
+msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:753
-#, fuzzy
msgid "Forwarded wish to external body"
-msgstr "Ditugaskan kepada badan luaran:"
+msgstr ""
-#: templates/web/base/faq/faq-en-gb.html:1
-#: templates/web/base/faq/faq-en-gb.html:13
-#: templates/web/base/faq/faq-en-gb.html:6
-#: templates/web/base/open311/index.html:6
-#: templates/web/base/static/privacy.html:8
-#: templates/web/fixmystreet/contact/index.html:10
+#: templates/web/base/about/_sidebar.html:4
+#: templates/web/base/about/faq-en-gb.html:1
+#: templates/web/base/about/faq-en-gb.html:5
msgid "Frequently Asked Questions"
msgstr "Soalan lazim"
-#: templates/web/base/open311/index.html:136
+#: templates/web/base/open311/index.html:128
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS atas Google Maps"
+#: templates/web/base/report/display_tools.html:11
#: templates/web/fixmystreet/around/_updates.html:3
-#: templates/web/fixmystreet/report/display.html:35
msgid "Get updates"
msgstr "Dapatkan kemas kini"
@@ -1197,7 +1144,7 @@ msgstr "Pergi"
msgid "Going to send questionnaire?"
msgstr "Teruskan dengan menghantar soalan selidik?"
-#: templates/web/base/admin/index.html:42
+#: templates/web/base/admin/index.html:35
msgid "Graph of problem creation by status over time"
msgstr "Graf masalah dibuat dengan status dari masa ke masa"
@@ -1214,7 +1161,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir
msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?"
#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38
-#: templates/web/zurich/faq/faq-de-ch.html:1
+#: templates/web/zurich/about/faq-de-ch.html:1
#: templates/web/zurich/footer.html:22
#: templates/web/zurich/nav_over_content.html:8
msgid "Help"
@@ -1265,7 +1212,7 @@ msgstr "Bagaimana melaporkan masalah"
msgid "How to send successful reports"
msgstr "Bagaimana untuk menghantar laporan berjaya"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:754
+#: perllib/FixMyStreet/App/Controller/Admin.pm:752
msgid "I am afraid you cannot confirm unconfirmed reports."
msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan."
@@ -1283,10 +1230,6 @@ msgstr ""
msgid "I'm afraid we couldn't locate your problem in the database.\n"
msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:327
-msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n"
-msgstr ""
-
#: templates/web/base/admin/flagged.html:14
#: templates/web/base/admin/list_updates.html:6
#: templates/web/base/admin/reports.html:11
@@ -1315,16 +1258,11 @@ msgstr ""
msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
msgstr ""
-#: templates/web/base/report/new/councils_text_none.html:2
-#: templates/web/base/report/new/councils_text_none.html:8
+#: templates/web/base/report/new/councils_text_none.html:10
+#: templates/web/base/report/new/councils_text_none.html:9
msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council."
msgstr ""
-#: templates/web/zurich/auth/token.html:19
-#: templates/web/zurich/email_sent.html:7
-msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way."
-msgstr ""
-
#: templates/web/base/questionnaire/index.html:68
msgid ""
"If you wish to leave a public update on the problem, please enter it here\n"
@@ -1368,10 +1306,8 @@ msgstr "Pilihan feed yang tak sah"
#: templates/web/base/dashboard/index.html:142
#: templates/web/base/dashboard/index.html:144
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:32
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:30
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:36
msgid "In Progress"
msgstr "Dijalani"
@@ -1379,7 +1315,7 @@ msgstr "Dijalani"
msgid "In abuse table?"
msgstr "Dalam table penyalahguna?"
-#: templates/web/base/open311/index.html:88
+#: templates/web/base/open311/index.html:80
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr ""
@@ -1387,7 +1323,7 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:963
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:7
-#: templates/web/fixmystreet/report/banner.html:19
+#: templates/web/base/report/banner.html:19
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:8
msgid "In progress"
@@ -1422,7 +1358,7 @@ msgstr "Rujukan dalaman"
msgid "Invalid agency_responsible value %s"
msgstr "Nilai agency_responsible %s salah"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1210
msgid "Invalid end date"
msgstr "Tarikh berakhir yang tak sah"
@@ -1430,7 +1366,7 @@ msgstr "Tarikh berakhir yang tak sah"
msgid "Invalid format %s specified."
msgstr "Format dinyatakan %s salah"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1206
msgid "Invalid start date"
msgstr "Tarikh mula yang tak sah"
@@ -1438,14 +1374,12 @@ msgstr "Tarikh mula yang tak sah"
#: templates/web/base/admin/report_blocks.html:5
#: templates/web/base/dashboard/index.html:142
#: templates/web/base/dashboard/index.html:143
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:31
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:29
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:35
msgid "Investigating"
msgstr "Dalam siasatan"
-#: templates/web/fixmystreet/contact/blurb.html:8
+#: templates/web/base/contact/blurb.html:8
msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
msgstr ""
@@ -1463,11 +1397,9 @@ msgstr ""
msgid "Jurisdiction unknown"
msgstr ""
-#: templates/web/base/auth/general.html:44
-#: templates/web/base/report/new/fill_in_details_form.html:132
-#: templates/web/base/report/update-form.html:105
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28
-#: templates/web/fixmystreet/report/update-form.html:102
+#: templates/web/base/auth/general.html:80
+#: templates/web/base/report/new/form_user_loggedout_password.html:16
+#: templates/web/base/report/update/form_user_loggedout_password.html:15
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Teruskan log masuk aku dalam komputer ini"
@@ -1525,6 +1457,7 @@ msgid "MAP"
msgstr "PETA"
#: templates/web/base/js/translation_strings.html:45
+#: templates/web/base/maps/google-ol.html:13
msgid "Map"
msgstr ""
@@ -1544,23 +1477,17 @@ msgstr ""
msgid "Marked fixed/closed more than eight weeks ago"
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:106
+#: templates/web/base/contact/index.html:98
msgid "Message"
msgstr "Pesanan"
#: templates/web/zurich/admin/report_edit.html:284
-#, fuzzy
msgid "Message to competent body:"
-msgstr "Ditugaskan kepada badan luaran:"
+msgstr ""
#: templates/web/zurich/admin/report_edit.html:282
-#, fuzzy
msgid "Message to external body:"
-msgstr "Ditugaskan kepada badan luaran:"
-
-#: templates/web/base/contact/index.html:97
-msgid "Message:"
-msgstr "Pesanan:"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Open311.pm:445
msgid "Missing jurisdiction_id"
@@ -1574,10 +1501,6 @@ msgstr ""
msgid "Month"
msgstr "Bulan"
-#: templates/web/base/report/display.html:34
-msgid "More problems nearby"
-msgstr "Lebih masalah terdekat"
-
#: templates/web/base/admin/bodies.html:21
#: templates/web/base/admin/body-form.html:18
#: templates/web/base/admin/flagged.html:16
@@ -1585,11 +1508,11 @@ msgstr "Lebih masalah terdekat"
#: templates/web/base/admin/list_updates.html:7
#: templates/web/base/admin/reports.html:13
#: templates/web/base/admin/users.html:15
-#: templates/web/base/auth/general.html:50
+#: templates/web/base/auth/general.html:89
+#: templates/web/base/report/new/form_user_loggedin.html:9
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:7
+#: templates/web/base/report/update/form_name.html:4
#: templates/web/base/reports/index.html:20
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44
-#: templates/web/fixmystreet/report/update-form.html:138
#: templates/web/zurich/admin/body-form.html:4
#: templates/web/zurich/auth/general.html:60
#: templates/web/zurich/report/new/fill_in_details_form.html:82
@@ -1603,7 +1526,7 @@ msgstr "Nama"
msgid "Name:"
msgstr "Nama:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328
+#: perllib/FixMyStreet/Script/Reports.pm:107
msgid "Name: %s"
msgstr "Nama: %s"
@@ -1612,29 +1535,24 @@ msgstr "Nama: %s"
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:127
+#: perllib/FixMyStreet/Cobrand/UK.pm:128
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:434
-#: perllib/FixMyStreet/Cobrand/Default.pm:474
+#: perllib/FixMyStreet/Cobrand/Default.pm:455
+#: perllib/FixMyStreet/Cobrand/Default.pm:495
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267
+#: perllib/FixMyStreet/Script/Alerts.pm:290
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
msgstr ""
-#: templates/web/zurich/email_sent.html:5
-msgid "Nearly Done! Now check your email..."
-msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..."
-
#: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5
-#, fuzzy
msgid "Nearly done! Now check your email&hellip;"
-msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..."
+msgstr ""
#: templates/web/base/reports/index.html:21
msgid "New <br>problems"
@@ -1658,9 +1576,8 @@ msgid "New local problems on FixMyStreet"
msgstr "Masalah tempatan baru dalam FixMyStreet"
#: templates/web/zurich/admin/report_edit-sdm.html:117
-#, fuzzy
msgid "New note to DM:"
-msgstr "Nota dalaman baru:"
+msgstr ""
#: db/alert_types.pl:38
msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1692,9 +1609,8 @@ msgstr "Negeri baru"
#: templates/web/zurich/admin/template_edit.html:9
#: templates/web/zurich/admin/templates.html:26
-#, fuzzy
msgid "New template"
-msgstr "Negeri baru"
+msgstr ""
#: templates/web/base/pagination.html:13
msgid "Next"
@@ -1711,8 +1627,8 @@ msgstr "Seterusnya"
#: templates/web/base/admin/report_edit.html:75
#: templates/web/base/admin/update_edit.html:25
#: templates/web/base/questionnaire/creator_fixed.html:16
+#: templates/web/base/questionnaire/index.html:101
#: templates/web/base/questionnaire/index.html:53
-#: templates/web/base/questionnaire/index.html:92
msgid "No"
msgstr "Tidak"
@@ -1776,10 +1692,8 @@ msgstr ""
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:13
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:33
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:31
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:37
msgid "Not Responsible"
msgstr "Tidak Bertanggungjawab"
@@ -1787,9 +1701,8 @@ msgstr "Tidak Bertanggungjawab"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:937
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:13
-#, fuzzy
msgid "Not contactable"
-msgstr "Tidak Bertanggungjawab"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:108
msgid "Not for my subdivision"
@@ -1819,7 +1732,7 @@ msgstr ""
msgid "Note:"
msgstr "ta:"
-#: templates/web/base/open311/index.html:73
+#: templates/web/base/open311/index.html:65
msgid "Note: <strong>%s</strong>"
msgstr "Nota: <strong>%s</strong>"
@@ -1827,13 +1740,15 @@ msgstr "Nota: <strong>%s</strong>"
msgid "Notes from SDM to DM"
msgstr ""
-#: templates/web/base/report/new/fill_in_details_form.html:113
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10
+#: templates/web/base/report/new/form_user_loggedout.html:14
+#: templates/web/base/report/new/form_user_loggedout.html:2
+#: templates/web/base/report/new/oauth_email_form.html:17
msgid "Now to submit your report&hellip;"
msgstr ""
-#: templates/web/base/report/update-form.html:86
-#: templates/web/fixmystreet/report/update-form.html:85
+#: templates/web/base/report/update-form.html:28
+#: templates/web/base/report/update/form_user_loggedout.html:13
+#: templates/web/base/report/update/form_user_loggedout.html:2
msgid "Now to submit your update&hellip;"
msgstr "Hantarkan kemas kini anda sekarang&hellip;"
@@ -1841,11 +1756,6 @@ msgstr "Hantarkan kemas kini anda sekarang&hellip;"
msgid "OK"
msgstr "OK"
-#: templates/web/base/report/display.html:28
-#: templates/web/base/report/update.html:17
-msgid "Offensive? Unsuitable? Tell us"
-msgstr "Serangan? Tidak sesuai? Beritahu kami"
-
#: templates/web/base/reports/index.html:23
msgid "Old / unknown <br>problems"
msgstr ""
@@ -1864,7 +1774,7 @@ msgstr "Lebih tua<br>diselesai"
msgid "Older <br>problems"
msgstr "Lebih tua <br>masalah"
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45
+#: templates/web/base/report/new/form_report.html:15
msgid "One-line summary"
msgstr ""
@@ -1875,8 +1785,7 @@ msgstr ""
#: templates/web/base/admin/report_blocks.html:4
#: templates/web/base/admin/update_edit.html:28
#: templates/web/base/dashboard/index.html:142
-#: templates/web/base/report/update-form.html:30
-#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/base/report/update/form_update.html:34
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/update_edit.html:18
@@ -1891,15 +1800,15 @@ msgstr ""
msgid "Open, but not had any update in eight weeks"
msgstr ""
-#: templates/web/base/open311/index.html:70
+#: templates/web/base/open311/index.html:62
msgid "Open311 API for the mySociety FixMyStreet server"
msgstr "API Open311 untuk pelayan FixMyStreet mySociety"
-#: templates/web/base/open311/index.html:80
+#: templates/web/base/open311/index.html:72
msgid "Open311 initiative web page"
msgstr "Laman web inisiatif Open311"
-#: templates/web/base/open311/index.html:81
+#: templates/web/base/open311/index.html:73
msgid "Open311 specification"
msgstr "Spesifikasi Open311"
@@ -1911,15 +1820,15 @@ msgstr "Atau masalah dilaporkan kepada:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:673
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:674
-#: perllib/FixMyStreet/DB/Result/Problem.pm:570
-#: perllib/FixMyStreet/DB/Result/Problem.pm:580
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:668
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:669
+#: perllib/FixMyStreet/DB/Result/Problem.pm:558
+#: perllib/FixMyStreet/DB/Result/Problem.pm:568
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
#: perllib/FixMyStreet/DB/Result/Problem.pm:590
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412
+#: perllib/FixMyStreet/Script/Reports.pm:175
+#: perllib/FixMyStreet/Script/Reports.pm:190
msgid "Other"
msgstr "Lain-lain"
@@ -1928,7 +1837,7 @@ msgid "Owner"
msgstr "Pemilik"
#: templates/web/base/errors/page_error_404_not_found.html:1
-#: templates/web/base/errors/page_error_404_not_found.html:3
+#: templates/web/base/errors/page_error_404_not_found.html:4
msgid "Page Not Found"
msgstr "Laman Tidak Dijumpai"
@@ -1942,16 +1851,16 @@ msgstr "Induk"
msgid "Partial"
msgstr "Separa"
-#: templates/web/base/auth/general.html:53
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68
-#: templates/web/fixmystreet/report/update-form.html:116
+#: templates/web/base/auth/general.html:92
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:31
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:6
#: templates/web/zurich/auth/general.html:32
#: templates/web/zurich/auth/general.html:63
msgid "Password (optional)"
msgstr "Kata Laluan (tidah diwajibkan)"
#: templates/web/base/auth/change_password.html:25
-#: templates/web/base/auth/general.html:36
+#: templates/web/base/auth/general.html:72
msgid "Password:"
msgstr "Kata Laluan:"
@@ -1963,29 +1872,29 @@ msgstr "Permalink"
msgid "Phone number"
msgstr "Nombor telefon"
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62
+#: templates/web/base/report/new/form_user_loggedin.html:26
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:25
msgid "Phone number (optional)"
msgstr "Nombor telefon (tidak diwajibkan)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306
+#: perllib/FixMyStreet/Script/Reports.pm:83
#: templates/web/base/admin/report_edit.html:63
-#: templates/web/base/report/new/fill_in_details_form.html:198
#: templates/web/zurich/admin/stats.html:39
msgid "Phone:"
msgstr "Telefon:"
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/fixmystreet/report/update-form.html:59
+#: templates/web/base/questionnaire/index.html:75
+#: templates/web/base/report/new/form_report.html:23
+#: templates/web/base/report/update/form_update.html:6
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
#: templates/web/zurich/admin/stats.html:37
-#: templates/web/zurich/report/new/fill_in_details_form.html:52
+#: templates/web/zurich/report/new/fill_in_details_form.html:45
msgid "Photo"
msgstr "Foto"
-#: perllib/FixMyStreet/App/Controller/Photo.pm:221
+#: perllib/FixMyStreet/App/Controller/Photo.pm:187
msgid "Photo is required."
msgstr ""
@@ -1993,13 +1902,7 @@ msgstr ""
msgid "Photo required"
msgstr ""
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/report/new/fill_in_details_form.html:84
-#: templates/web/base/report/update-form.html:62
-msgid "Photo:"
-msgstr "Foto:"
-
-#: templates/web/base/alert/list.html:26
+#: templates/web/base/alert/list.html:23
msgid "Photos of recent nearby reports"
msgstr "Foto laporan terdekat baru-baru ini "
@@ -2028,20 +1931,16 @@ msgstr "Sila bersopan, ringkas dan tepat."
msgid "Please check the passwords and try again"
msgstr "Sila periksa kata laluan dan cuba lagi"
-#: templates/web/zurich/auth/token.html:16
-msgid "Please check your email"
-msgstr "Sila periksa emel anda"
-
-#: templates/web/base/auth/general.html:10
-#: templates/web/base/auth/general.html:16
+#: templates/web/base/auth/general.html:27
+#: templates/web/base/auth/general.html:33
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Sila periksa sama ada alamat emel anda adalah betul"
#: perllib/FixMyStreet/App/Controller/Admin.pm:343
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:883
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:948
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:943
#: perllib/FixMyStreet/DB/Result/Problem.pm:412
#: templates/web/base/js/translation_strings.html:9
msgid "Please choose a category"
@@ -2055,8 +1954,7 @@ msgstr "Sila pilihkan jenis bangunan"
msgid "Please correct the errors below"
msgstr ""
-#: templates/web/base/contact/blurb.html:2
-#: templates/web/fixmystreet/contact/blurb.html:12
+#: templates/web/base/contact/blurb.html:12
msgid ""
"Please do <strong>not</strong> report problems through this form; messages go to\n"
"the team behind this site, not a council. To report a problem,\n"
@@ -2068,11 +1966,17 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:346
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:125
#: templates/web/base/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Sila masukkan pesanan"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1091
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1146
+#, fuzzy
+msgid "Please enter a name"
+msgstr "Sila masukkan nama anda"
+
#: templates/web/base/auth/change_password.html:12
#: templates/web/base/auth/change_password.html:15
#: templates/web/base/js/translation_strings.html:19
@@ -2085,10 +1989,10 @@ msgstr "Sila masukkan kata laluan"
msgid "Please enter a subject"
msgstr "Sila masukkan tajuk"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1084
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1137
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1087
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1142
#: perllib/FixMyStreet/App/Controller/Admin.pm:345
-#: perllib/FixMyStreet/DB/Result/User.pm:127
+#: perllib/FixMyStreet/DB/Result/User.pm:133
#: templates/web/base/js/translation_strings.html:12
#: templates/web/base/js/translation_strings.html:16
msgid "Please enter a valid email"
@@ -2105,9 +2009,9 @@ msgid "Please enter some details"
msgstr "Sila masukkan perincian"
#: perllib/FixMyStreet/App/Controller/Contact.pm:113
-#: perllib/FixMyStreet/DB/Result/User.pm:124
-#: templates/web/base/auth/general.html:10
-#: templates/web/base/auth/general.html:15
+#: perllib/FixMyStreet/DB/Result/User.pm:130
+#: templates/web/base/auth/general.html:27
+#: templates/web/base/auth/general.html:32
#: templates/web/base/js/translation_strings.html:11
#: templates/web/base/js/translation_strings.html:15
#: templates/web/zurich/auth/general.html:3
@@ -2115,7 +2019,7 @@ msgstr "Sila masukkan perincian"
msgid "Please enter your email"
msgstr "Sila masukkan emel anda"
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7
+#: templates/web/base/report/new/form_user_loggedout_email.html:7
#: templates/web/zurich/report/new/fill_in_details_form.html:80
msgid "Please enter your email address"
msgstr "Sila masukkan alamat emel anda"
@@ -2124,15 +2028,15 @@ msgstr "Sila masukkan alamat emel anda"
msgid "Please enter your first name"
msgstr "Sila masukkan nama pertama anda"
-#: perllib/FixMyStreet/Cobrand/UK.pm:318
+#: perllib/FixMyStreet/Cobrand/UK.pm:319
#: templates/web/base/js/translation_strings.html:7
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah"
#: perllib/FixMyStreet/App/Controller/Contact.pm:112
-#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Comment.pm:122
#: perllib/FixMyStreet/DB/Result/Problem.pm:406
-#: perllib/FixMyStreet/DB/Result/User.pm:120
+#: perllib/FixMyStreet/DB/Result/User.pm:126
#: templates/web/base/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Sila masukkan nama anda"
@@ -2159,12 +2063,11 @@ msgstr "Sila <a href=\"%s\">log masuk lagi</a>, atau balik ke <a href=\"/\">hala
msgid "Please fill in details of the problem below."
msgstr ""
-#: templates/web/zurich/report/new/fill_in_details_form.html:46
+#: templates/web/zurich/report/new/fill_in_details_form.html:72
msgid "Please fill in details of the problem."
msgstr "Sila isikan perincian untuk masalah tersebut"
-#: templates/web/base/report/new/fill_in_details_form.html:28
-#: templates/web/fixmystreet/report/new/sidebar.html:7
+#: templates/web/base/report/new/sidebar.html:7
#: templates/web/zurich/report/new/fill_in_details_form.html:20
msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
msgstr ""
@@ -2173,20 +2076,23 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr ""
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
+#: templates/web/base/report/updates-sidebar-notes.html:2
msgid "Please note that updates are not sent to the council."
msgstr ""
-#: templates/web/base/report/update-form.html:7
-msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>"
+#: templates/web/base/report/new/oauth_email_form.html:4
+msgid "Please note your report has <strong>not yet been sent</strong>."
msgstr ""
-#: templates/web/base/report/new/fill_in_details_form.html:8
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21
+#: templates/web/base/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:11
msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
msgstr ""
+#: templates/web/base/report/display.html:26
+msgid "Please note your update has <strong>not yet been posted</strong>."
+msgstr ""
+
#: templates/web/base/report/new/notes.html:1
#: templates/web/zurich/report/new/notes.html:1
msgid "Please note:"
@@ -2206,9 +2112,8 @@ msgid "Please say whether you've ever reported a problem to your council before"
msgstr ""
#: templates/web/zurich/admin/report_edit.html:208
-#, fuzzy
msgid "Please select a body."
-msgstr "Pilihkan badan"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Alert.pm:80
msgid "Please select the feed you want"
@@ -2225,6 +2130,7 @@ msgstr ""
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:117
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:147
+#: templates/web/base/js/translation_strings.html:53
msgid "Please upload a JPEG image only"
msgstr "Sila memuat naik imej JPEG sahaja"
@@ -2232,18 +2138,14 @@ msgstr "Sila memuat naik imej JPEG sahaja"
msgid "Please write a message"
msgstr "Sila tuliskan pesanan"
-#: templates/web/fixmystreet/report/update-form.html:23
+#: templates/web/base/report/update/form_update.html:29
msgid "Please write your update here"
msgstr "Sila tuliskan kemas kini anda di sini"
-#: templates/web/base/contact/index.html:100
-#: templates/web/base/report/update-form.html:110
-#: templates/web/base/report/update-form.html:132
-#: templates/web/base/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:113
-#: templates/web/fixmystreet/report/update-form.html:124
-#: templates/web/fixmystreet/report/update-form.html:71
-#: templates/web/fixmystreet/report/update-form.html:97
+#: templates/web/base/contact/index.html:105
+#: templates/web/base/report/update-form.html:24
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:14
+#: templates/web/base/report/update/form_user_loggedout_password.html:10
msgid "Post"
msgstr "Post"
@@ -2271,12 +2173,9 @@ msgstr "Sebelumnya"
msgid "Privacy"
msgstr ""
-#: templates/web/base/faq/faq-en-gb.html:7
-#: templates/web/base/open311/index.html:7
-#: templates/web/base/static/privacy.html:1
-#: templates/web/base/static/privacy.html:2
-#: templates/web/base/static/privacy.html:9
-#: templates/web/fixmystreet/contact/index.html:11
+#: templates/web/base/about/_sidebar.html:5
+#: templates/web/base/about/privacy.html:1
+#: templates/web/base/about/privacy.html:2
msgid "Privacy and cookies"
msgstr ""
@@ -2304,12 +2203,12 @@ msgstr "Masalah %s dipastikan"
msgid "Problem %s sent to council %s"
msgstr "Masalah %s dihantar kepada majlis %s"
-#: templates/web/base/admin/index.html:46
+#: templates/web/base/admin/index.html:39
#: templates/web/zurich/admin/index.html:9
msgid "Problem breakdown by state"
msgstr "Pecahan masalah bagi negeri"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1055
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1058
msgid "Problem marked as open."
msgstr "Masalah ditanda sebagai terbukan"
@@ -2325,11 +2224,11 @@ msgstr "Masalah-masalah"
msgid "Problems in this area"
msgstr "Masalah dalam kawasan ini"
-#: templates/web/fixmystreet/report/display.html:43
+#: templates/web/base/report/display_tools.html:19
msgid "Problems nearby"
msgstr "Masalah terdekat"
-#: templates/web/fixmystreet/report/display.html:41
+#: templates/web/base/report/display_tools.html:17
msgid "Problems on the map"
msgstr "Masalah atas peta"
@@ -2341,24 +2240,23 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
msgid "Problems within %.1fkm of this location"
msgstr "Masalah dalam %.1fkm dalam lokasi ini"
-#: perllib/FixMyStreet/Cobrand/Default.pm:642
+#: perllib/FixMyStreet/Cobrand/Default.pm:663
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139
-#: perllib/FixMyStreet/Cobrand/UK.pm:207
+#: perllib/FixMyStreet/Cobrand/UK.pm:208
msgid "Problems within %s"
msgstr "Masalah dalam %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128
-#: perllib/FixMyStreet/Cobrand/UK.pm:221
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s ward"
msgstr "Masalah dalam kawasan pentadbiran %s"
#. ("First %s is the body name, second %s the site name")
#: templates/web/base/reports/body.html:0
#: templates/web/base/reports/body.html:24
-#, fuzzy
msgid "Problems within %s, %s"
-msgstr "Masalah dalam %s"
+msgstr ""
#: templates/web/base/alert/_list.html:42
msgid "Problems within the boundary of:"
@@ -2372,19 +2270,16 @@ msgstr "Alamat bangunan"
msgid "Property type:"
msgstr "Jenis bangunan:"
-#: templates/web/base/report/update-form.html:3
-#: templates/web/fixmystreet/report/update-form.html:4
+#: templates/web/base/report/update-form.html:6
msgid "Provide an update"
msgstr "Sediakan kemas kini"
-#: templates/web/base/auth/general.html:56
+#: templates/web/base/auth/general.html:95
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/base/report/new/fill_in_details_form.html:156
-#: templates/web/base/report/update-form.html:129
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71
-#: templates/web/fixmystreet/report/update-form.html:119
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:34
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:9
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
@@ -2420,18 +2315,17 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
#: templates/web/base/alert/_list.html:22
#: templates/web/base/around/display_location.html:1
#: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display.html:50
+#: templates/web/base/report/display_tools.html:34
#: templates/web/base/reports/_rss.html:1
#: templates/web/fixmystreet/alert/updates.html:9
-#: templates/web/fixmystreet/report/display.html:58
msgid "RSS feed"
msgstr "Feed RSS"
-#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262
+#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263
msgid "RSS feed for %s"
msgstr "Feed RSS untuk %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268
+#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269
msgid "RSS feed for %s ward, %s"
msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
@@ -2439,11 +2333,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
msgid "RSS feed of %s"
msgstr "Feed RSS untuk %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293
+#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294
msgid "RSS feed of %s, within %s ward"
msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
@@ -2455,15 +2349,15 @@ msgstr "Feed RSS untuk masalah berdekatan"
msgid "RSS feed of problems in this %s"
msgstr "Feed RSS untuk masalah dalam %s ini"
-#: perllib/FixMyStreet/Cobrand/Default.pm:643
+#: perllib/FixMyStreet/Cobrand/Default.pm:664
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138
-#: perllib/FixMyStreet/Cobrand/UK.pm:214
+#: perllib/FixMyStreet/Cobrand/UK.pm:215
msgid "RSS feed of problems within %s"
msgstr "Feed RSS untuk masalah dalam %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127
-#: perllib/FixMyStreet/Cobrand/UK.pm:220
+#: perllib/FixMyStreet/Cobrand/UK.pm:221
msgid "RSS feed of problems within %s ward"
msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
@@ -2472,25 +2366,22 @@ msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
msgid "RSS feed of recent local problems"
msgstr "Feed RSS untuk masalah tempatan baru-baru ini"
-#: templates/web/base/report/display.html:50
+#: templates/web/base/report/display_tools.html:34
#: templates/web/fixmystreet/alert/updates.html:9
-#: templates/web/fixmystreet/report/display.html:58
msgid "RSS feed of updates to this problem"
msgstr "Feed RSS untuk kemas kini bagi masalah ini"
#: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display.html:41
+#: templates/web/base/report/display_tools.html:36
#: templates/web/fixmystreet/alert/updates.html:14
-#: templates/web/fixmystreet/report/display.html:60
msgid "Receive email when updates are left on this problem."
msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
#. ("%s is the site name")
#: templates/web/base/around/display_location.html:0
#: templates/web/base/around/display_location.html:33
-#, fuzzy
msgid "Recent local problems, %s"
-msgstr "Masalah tempatan baru-baru ini, FixMyStreet"
+msgstr ""
#: templates/web/base/reports/index.html:24
msgid "Recently <br>fixed"
@@ -2508,16 +2399,15 @@ msgstr ""
msgid "Remove flag"
msgstr ""
-#: templates/web/base/admin/report_edit.html:92
-#: templates/web/base/admin/update_edit.html:62
+#: templates/web/base/admin/report_edit.html:93
+#: templates/web/base/admin/update_edit.html:67
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr ""
#: templates/web/zurich/admin/report_edit.html:243
-#, fuzzy
msgid "Reply to user:"
-msgstr "edit pengguna"
+msgstr ""
#: templates/web/fixmystreet/header_logo.html:2
msgid "Report"
@@ -2530,7 +2420,7 @@ msgstr ""
msgid "Report a problem"
msgstr ""
-#: templates/web/fixmystreet/report/display.html:32
+#: templates/web/base/report/display_tools.html:8
msgid "Report abuse"
msgstr ""
@@ -2539,7 +2429,8 @@ msgid "Report on %s"
msgstr ""
#: templates/web/base/report/new/fill_in_details_form.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
+#: templates/web/base/report/new/login_success_form.html:1
+#: templates/web/base/report/new/oauth_email_form.html:1
msgid "Report your problem"
msgstr ""
@@ -2548,9 +2439,8 @@ msgstr ""
msgid "Report, view, or discuss local problems"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:585
-#: templates/web/base/contact/index.html:50
-#: templates/web/fixmystreet/contact/index.html:65
+#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: templates/web/base/contact/index.html:57
msgid "Reported anonymously at %s"
msgstr ""
@@ -2559,9 +2449,8 @@ msgstr ""
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
-#: templates/web/base/contact/index.html:52
-#: templates/web/fixmystreet/contact/index.html:67
+#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: templates/web/base/contact/index.html:59
msgid "Reported by %s at %s"
msgstr ""
@@ -2574,27 +2463,27 @@ msgstr ""
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:581
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:591
msgid "Reported in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:565
msgid "Reported via %s anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:587
msgid "Reported via %s by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
msgid "Reported via %s in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:593
+#: perllib/FixMyStreet/DB/Result/Problem.pm:581
msgid "Reported via %s in the %s category by %s at %s"
msgstr ""
@@ -2604,9 +2493,8 @@ msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:36
#: templates/web/zurich/admin/report_edit.html:55
-#, fuzzy
msgid "Reported:"
-msgstr "Semua Laporan"
+msgstr ""
#: templates/web/base/around/index.html:2
#: templates/web/base/js/translation_strings.html:41
@@ -2616,13 +2504,13 @@ msgstr "Semua Laporan"
msgid "Reporting a problem"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1277
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
#: perllib/FixMyStreet/Cobrand/Zurich.pm:384
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331
+#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -2659,15 +2547,17 @@ msgstr ""
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1495
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1500
-#: templates/web/base/admin/report_edit.html:88
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1504
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1508
+#: templates/web/base/admin/report_edit.html:90
+#: templates/web/base/admin/update_edit.html:64
#: templates/web/zurich/admin/report_edit.html:116
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1495
-#: templates/web/base/admin/report_edit.html:89
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1504
+#: templates/web/base/admin/report_edit.html:91
+#: templates/web/base/admin/update_edit.html:65
#: templates/web/zurich/admin/report_edit.html:117
msgid "Rotate Right"
msgstr ""
@@ -2677,7 +2567,6 @@ msgid "Rotating this photo will discard unsaved changes to the report."
msgstr ""
#: templates/web/base/js/translation_strings.html:46
-#: templates/web/base/maps/google-ol.html:13
msgid "Satellite"
msgstr ""
@@ -2734,11 +2623,10 @@ msgid "Select which type of alert you’d like and click the button for an RSS f
msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:835
-#, fuzzy
msgid "Sent report back"
-msgstr "Laporan terbuka"
+msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:708
+#: perllib/FixMyStreet/DB/Result/Problem.pm:696
msgid "Sent to %s %s later"
msgstr "Dihantar kepada %s %s kemudian"
@@ -2751,15 +2639,13 @@ msgstr "Dihantar:"
msgid "Service:"
msgstr "Servis:"
-#: templates/web/fixmystreet/report/display.html:38
+#: templates/web/base/report/display_tools.html:14
msgid "Share"
msgstr "Kongsi"
-#: templates/web/base/report/new/fill_in_details_form.html:193
-#: templates/web/base/report/update-form.html:158
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59
-#: templates/web/fixmystreet/report/update-form.html:146
+#: templates/web/base/report/new/form_user_loggedin.html:23
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:22
+#: templates/web/base/report/update/form_name.html:15
msgid "Show my name publicly"
msgstr "Tunjukkan nama aku secara umum"
@@ -2771,9 +2657,9 @@ msgstr "Tunjukkan lama"
msgid "Show pins"
msgstr "Tunjukkan pin"
+#: templates/web/base/auth/general.html:100
#: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:40
-#: templates/web/base/auth/general.html:61
+#: templates/web/base/auth/general.html:76
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -2800,7 +2686,7 @@ msgid ""
" sent from your FixMyStreet installation."
msgstr ""
-#: templates/web/base/alert/index.html:42
+#: templates/web/base/alert/index.html:40
msgid "Some photos of recent reports"
msgstr ""
@@ -2810,7 +2696,7 @@ msgstr ""
msgid "Some text to localize"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:78
+#: perllib/FixMyStreet/Cobrand/UK.pm:79
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr ""
@@ -2822,14 +2708,20 @@ msgstr ""
msgid "Sorry, there has been an error confirming your problem."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:221
-#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:216
+#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
#: perllib/FixMyStreet/Geocode/OSM.pm:48
msgid "Sorry, we could not find that location."
msgstr ""
-#: perllib/FixMyStreet/Geocode/Bing.pm:34
+#: templates/web/base/auth/general.html:9
+#: templates/web/base/report/display.html:21
+#: templates/web/base/report/new/fill_in_details_form.html:23
+msgid "Sorry, we could not log you in. Please fill in the form below."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:35
#: perllib/FixMyStreet/Geocode/Google.pm:45
#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
@@ -2839,6 +2731,10 @@ msgstr ""
msgid "Sorry, we couldn't save your image(s), please try again."
msgstr ""
+#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301
+msgid "Sorry, you can not log in with Facebook. Please try again later."
+msgstr ""
+
#: templates/web/base/admin/stats.html:64
msgid "Start Date:"
msgstr "Tarikh bermula:"
@@ -2847,13 +2743,12 @@ msgstr "Tarikh bermula:"
#: templates/web/base/admin/flagged.html:18
#: templates/web/base/admin/list_updates.html:11
#: templates/web/base/admin/reports.html:15
-#: templates/web/fixmystreet/report/update-form.html:26
+#: templates/web/base/report/update/form_update.html:32
msgid "State"
msgstr "Negeri"
#: templates/web/base/admin/report_edit.html:47
#: templates/web/base/admin/update_edit.html:27
-#: templates/web/base/report/update-form.html:28
#: templates/web/zurich/admin/report_edit-sdm.html:73
#: templates/web/zurich/admin/report_edit.html:101
#: templates/web/zurich/admin/report_edit.html:155
@@ -2861,7 +2756,7 @@ msgstr "Negeri"
msgid "State:"
msgstr "Negeri:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1282
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1291
#: perllib/FixMyStreet/Cobrand/Zurich.pm:387
#: templates/web/base/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73
@@ -2883,7 +2778,7 @@ msgstr "Masuk dibuka, melalui soalan selidik, %s"
msgid "Street View"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406
+#: perllib/FixMyStreet/Script/Reports.pm:184
msgid "Subcategory: %s"
msgstr "Subkategori: %s"
@@ -2891,30 +2786,25 @@ msgstr "Subkategori: %s"
msgid "Subdivision/Body"
msgstr "Bahagian bawah/Badan"
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/base/contact/index.html:90
msgid "Subject"
msgstr "Tajuk"
#: templates/web/base/admin/report_edit.html:19
-#: templates/web/base/contact/index.html:88
-#: templates/web/base/report/new/fill_in_details_form.html:53
#: templates/web/zurich/admin/report_edit.html:39
msgid "Subject:"
msgstr "Tajuk:"
#: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/new/fill_in_details_form.html:137
-#: templates/web/base/report/new/fill_in_details_form.html:159
-#: templates/web/base/report/new/fill_in_details_form.html:96
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76
+#: templates/web/base/report/new/form_user_loggedin.html:36
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:39
+#: templates/web/base/report/new/form_user_loggedout_password.html:11
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "Submit"
msgstr "Hantar"
-#: templates/web/base/admin/report_edit.html:95
-#: templates/web/base/admin/update_edit.html:65
+#: templates/web/base/admin/report_edit.html:101
+#: templates/web/base/admin/update_edit.html:75
#: templates/web/base/admin/user-form.html:56
#: templates/web/zurich/admin/report_edit-sdm.html:137
#: templates/web/zurich/admin/report_edit.html:268
@@ -2922,7 +2812,7 @@ msgstr "Hantar"
msgid "Submit changes"
msgstr "Hantar perubahan"
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/questionnaire/index.html:106
msgid "Submit questionnaire"
msgstr "Hantar soalan selidik"
@@ -2938,9 +2828,8 @@ msgid "Submitted"
msgstr "Dihantarkan"
#: templates/web/base/alert/updates.html:17
-#: templates/web/base/report/display.html:46
+#: templates/web/base/report/display_tools.html:41
#: templates/web/fixmystreet/alert/updates.html:23
-#: templates/web/fixmystreet/report/display.html:65
msgid "Subscribe"
msgstr "Melanggan"
@@ -2948,7 +2837,7 @@ msgstr "Melanggan"
msgid "Subscribe me to an email alert"
msgstr "Langgankan pemberitahuan emel"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1275
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1284
#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
#: templates/web/base/admin/bodies.html:25
#: templates/web/base/admin/index.html:1
@@ -2967,7 +2856,7 @@ msgstr "Ringkasan"
msgid "Summary reports"
msgstr "Laporan ringkasan"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1279
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1288
msgid "Survey"
msgstr "Kajian"
@@ -2981,9 +2870,8 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:394
#: templates/web/zurich/header.html:77
-#, fuzzy
msgid "Templates"
-msgstr "Kemas kini"
+msgstr ""
#: templates/web/base/admin/list_updates.html:12
#: templates/web/zurich/admin/templates.html:9
@@ -3004,7 +2892,7 @@ msgstr "Teks:"
msgid "Thank you for reporting this issue!"
msgstr ""
-#: templates/web/base/tokens/error.html:7
+#: templates/web/base/tokens/error.html:6
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr ""
@@ -3039,23 +2927,23 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63
-#: perllib/FixMyStreet/Cobrand/UK.pm:71
+#: perllib/FixMyStreet/Cobrand/UK.pm:72
msgid "That postcode was not recognised, sorry."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:724
msgid "That problem has been marked as sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:718
+#: perllib/FixMyStreet/App/Controller/Admin.pm:716
msgid "That problem will now be resent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:125
+#: perllib/FixMyStreet/App/Controller/Report.pm:127
msgid "That report cannot be viewed on %s."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:119
+#: perllib/FixMyStreet/App/Controller/Report.pm:121
msgid "That report has been removed from FixMyStreet."
msgstr ""
@@ -3086,7 +2974,7 @@ msgid ""
" If you leave this blank, <strong>send method defaults to email</strong>."
msgstr ""
-#: templates/web/base/open311/index.html:90
+#: templates/web/base/open311/index.html:82
msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
msgstr ""
@@ -3107,12 +2995,12 @@ msgstr ""
msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
-#: perllib/FixMyStreet/App/Controller/Reports.pm:79
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61
+#: perllib/FixMyStreet/App/Controller/Reports.pm:80
msgid "The error was: %s"
msgstr ""
-#: templates/web/base/open311/index.html:86
+#: templates/web/base/open311/index.html:78
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr ""
@@ -3159,8 +3047,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr ""
-#: templates/web/base/errors/page_error_404_not_found.html:10
-#: templates/web/base/errors/page_error_404_not_found.html:12
+#: templates/web/base/errors/page_error_404_not_found.html:9
msgid "The requested URL '%s' was not found on this server"
msgstr ""
@@ -3170,12 +3057,11 @@ msgstr "Pemberitahuan yang paling mudah adalah jenis geografi kita:"
#: templates/web/base/report/new/councils_extra_text.html:1
#: templates/web/base/report/new/councils_text_some.html:10
-#: templates/web/base/report/new/fill_in_details_form.html:18
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14
+#: templates/web/base/report/new/fill_in_details_form.html:13
msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/Script/Reports.pm:92
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr ""
@@ -3192,18 +3078,18 @@ msgstr ""
msgid "There are no reports to show."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Reports.pm:76
+#: perllib/FixMyStreet/App/Controller/Reports.pm:77
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr ""
#: perllib/FixMyStreet/App/Controller/Contact.pm:137
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
-#: templates/web/base/auth/general.html:26
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:764
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138
+#: templates/web/base/auth/general.html:43
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr ""
@@ -3212,7 +3098,7 @@ msgstr ""
msgid "There was a problem with your email/password combination. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336
msgid "There was a problem with your update. Please try again."
msgstr ""
@@ -3220,7 +3106,7 @@ msgstr ""
msgid "There were problems with your report. Please see below."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371
msgid "There were problems with your update. Please see below."
msgstr ""
@@ -3234,7 +3120,7 @@ msgid ""
" "
msgstr ""
-#: templates/web/base/open311/index.html:77
+#: templates/web/base/open311/index.html:69
msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
msgstr ""
@@ -3256,18 +3142,18 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413
+#: perllib/FixMyStreet/Script/Reports.pm:191
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416
+#: perllib/FixMyStreet/Script/Reports.pm:194
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:925
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:995
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:920
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:990
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142
-#: perllib/FixMyStreet/Cobrand/UK.pm:43
+#: perllib/FixMyStreet/Cobrand/UK.pm:44
msgid "This information is required"
msgstr ""
@@ -3279,56 +3165,37 @@ msgstr ""
msgid "This is a summary of all reports on this site."
msgstr ""
-#: templates/web/zurich/auth/token.html:8
-msgid "This may be because the link is too old or already used, or the address was not copied correctly."
-msgstr ""
-
-#: templates/web/base/report/banner.html:15
-msgid "This problem has been closed"
-msgstr "Masalah ini telah ditutup"
-
-#: templates/web/base/report/banner.html:12
-#: templates/web/base/report/update-form.html:48
-#: templates/web/fixmystreet/report/update-form.html:46
+#: templates/web/base/report/update/form_update.html:52
msgid "This problem has been fixed"
msgstr "Masalah ini telah diselesai"
-#: templates/web/base/report/update-form.html:43
-#: templates/web/fixmystreet/report/update-form.html:40
+#: templates/web/base/report/update/form_update.html:46
msgid "This problem has not been fixed"
msgstr "Masalah ini belum diselesai"
-#: templates/web/base/report/banner.html:19
-msgid "This problem is in progress"
-msgstr "Masalah ini dalam kemajuan"
-
-#: templates/web/base/report/banner.html:9
-msgid "This problem is old and of unknown status."
-msgstr "Masalah ini lama dan dalam keadaan tidak diketahui."
-
#: perllib/FixMyStreet/Cobrand/Zurich.pm:168
#: perllib/FixMyStreet/Cobrand/Zurich.pm:169
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "Laporan ini menunggui sederhana."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/Script/Alerts.pm:94
msgid "This report is currently marked as closed."
msgstr "Laporan ini ditanda sebagai ditutupi sekarang."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/Script/Alerts.pm:92
msgid "This report is currently marked as fixed."
msgstr "Laporan ini ditanda sebagai diselesai sekarang."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/Script/Alerts.pm:96
msgid "This report is currently marked as open."
msgstr "Laporan ini ditanda sebagai terbuka sekarang."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326
+#: perllib/FixMyStreet/Script/Reports.pm:105
msgid "This report was submitted anonymously"
msgstr "Laporan ini dikemukakan tanpa nama"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308
+#: perllib/FixMyStreet/Script/Reports.pm:85
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna."
@@ -3339,7 +3206,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu
msgid "Time spent (in minutes):"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1278
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1287
#: templates/web/base/admin/timeline.html:1
msgid "Timeline"
msgstr "Garis masa"
@@ -3351,9 +3218,8 @@ msgid "Title"
msgstr "Tajuk"
#: templates/web/zurich/admin/template_edit.html:20
-#, fuzzy
msgid "Title:"
-msgstr "Tajuk"
+msgstr ""
#: templates/web/base/alert/index.html:25
msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
@@ -3363,11 +3229,11 @@ msgstr ""
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314
+#: perllib/FixMyStreet/Script/Reports.pm:91
msgid "To view a map of the precise location of this issue"
msgstr "Melihat lokasi tepat atas peta bagi isu ini"
-#: templates/web/base/admin/index.html:61
+#: templates/web/base/admin/index.html:54
#: templates/web/base/admin/questionnaire.html:24
#: templates/web/base/admin/stats.html:24
#: templates/web/base/admin/stats.html:43
@@ -3385,10 +3251,8 @@ msgstr ""
#: templates/web/base/admin/report_blocks.html:1
#: templates/web/base/admin/report_blocks.html:12
-#: templates/web/base/report/update-form.html:30
-#: templates/web/base/report/update-form.html:33
-#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/fixmystreet/report/update-form.html:31
+#: templates/web/base/report/update/form_update.html:34
+#: templates/web/base/report/update/form_update.html:37
msgid "Unable to fix"
msgstr "Tidak dapat diselesai"
@@ -3401,7 +3265,7 @@ msgstr "Tidak dapat diselesai"
msgid "Unconfirmed"
msgstr "Belum dipastikan"
-#: templates/web/fixmystreet/report/banner.html:9
+#: templates/web/base/report/banner.html:9
msgid "Unknown"
msgstr "Tidak diketahui"
@@ -3409,17 +3273,18 @@ msgstr "Tidak diketahui"
msgid "Unknown alert type"
msgstr "Jenis pemberitahuan tak diketahui"
+#: perllib/FixMyStreet/App/Controller/Photo.pm:110
#: templates/web/base/js/translation_strings.html:39
msgid "Unknown error"
msgstr "Ralat tidak diketahui"
-#: perllib/FixMyStreet/App/Controller/Report.pm:103
-#: perllib/FixMyStreet/App/Controller/Report.pm:109
-#: perllib/FixMyStreet/App/Controller/Report.pm:112
+#: perllib/FixMyStreet/App/Controller/Report.pm:105
+#: perllib/FixMyStreet/App/Controller/Report.pm:111
+#: perllib/FixMyStreet/App/Controller/Report.pm:114
msgid "Unknown problem ID"
msgstr "ID masalah tidak diketahui"
-#: templates/web/fixmystreet/report/update-form.html:19
+#: templates/web/base/report/update/form_update.html:25
msgid "Update"
msgstr "Kemas kini"
@@ -3427,13 +3292,11 @@ msgstr "Kemas kini"
msgid "Update %s created for problem %d; by %s"
msgstr "Kemaskini %s dibuat untuk masalah %d; oleh %s"
-#: templates/web/base/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/base/contact/index.html:28
msgid "Update below added anonymously at %s"
msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s"
-#: templates/web/base/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:38
+#: templates/web/base/contact/index.html:30
msgid "Update below added by %s at %s"
msgstr "Kemaskini di bawah ditambah oleh %s pada %s"
@@ -3442,7 +3305,7 @@ msgstr "Kemaskini di bawah ditambah oleh %s pada %s"
msgid "Update body"
msgstr "Kemas kini badan"
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:48
msgid "Update breakdown by state"
msgstr "Pecahan kemaskini mengikuti negeri"
@@ -3467,20 +3330,16 @@ msgstr "Kemas kini masalah dibuka semula"
msgid "Update statuses"
msgstr "Status kemas kini"
-#: templates/web/base/report/update-form.html:22
-msgid "Update:"
-msgstr "Kemas kini:"
-
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
#: templates/web/zurich/admin/reports.html:13
msgid "Updated"
msgstr "Dikemas kinikan"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1045
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1103
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1147
-#: perllib/FixMyStreet/App/Controller/Admin.pm:822
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1048
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1108
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1156
+#: perllib/FixMyStreet/App/Controller/Admin.pm:821
#: perllib/FixMyStreet/Cobrand/Zurich.pm:771
#: perllib/FixMyStreet/Cobrand/Zurich.pm:796
#: perllib/FixMyStreet/Cobrand/Zurich.pm:866
@@ -3488,13 +3347,12 @@ msgid "Updated!"
msgstr "Dikemas kinikan!"
#: templates/web/base/admin/list_updates.html:2
-#: templates/web/base/report/update.html:3
-#: templates/web/fixmystreet/report/update.html:5
+#: templates/web/base/report/update.html:5
#: templates/web/zurich/report/updates.html:2
msgid "Updates"
msgstr "Kemas kini"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:131
msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
@@ -3504,12 +3362,9 @@ msgstr "Kemas kini atas {{title}}"
#. ("%s is the site name")
#: templates/web/base/report/display.html:0
-#: templates/web/base/report/display.html:5
-#: templates/web/fixmystreet/report/display.html:0
-#: templates/web/fixmystreet/report/display.html:9
-#, fuzzy
+#: templates/web/base/report/display.html:9
msgid "Updates to this problem, %s"
-msgstr "Kemas kini masalah ini, FixMyStreet"
+msgstr ""
#: templates/web/base/admin/body.html:182
msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
@@ -3517,15 +3372,14 @@ msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipap
#: templates/web/zurich/admin/report_edit-sdm.html:48
#: templates/web/zurich/admin/report_edit.html:67
-#, fuzzy
msgid "Used map"
-msgstr "peta diguna"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1452
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1461
msgid "User flag removed"
msgstr "Tanda pengguna dipadam"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1424
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1433
msgid "User flagged"
msgstr "Pengguna ditanda"
@@ -3533,7 +3387,7 @@ msgstr "Pengguna ditanda"
msgid "User search finds matches in users' names and email addresses."
msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1280
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1289
#: perllib/FixMyStreet/Cobrand/Zurich.pm:399
#: templates/web/base/admin/flagged.html:29
#: templates/web/zurich/header.html:69
@@ -3564,7 +3418,6 @@ msgid "Viewing a location"
msgstr "Melihat lokasi"
#: templates/web/base/report/display.html:0
-#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
msgstr "Melihat masalah"
@@ -3577,25 +3430,24 @@ msgstr "Kawasan pentadbiran majlis ini"
msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. "
-#: templates/web/zurich/auth/token.html:7
-msgid "We have not been able to confirm your account - sorry."
-msgstr "Kita belum dapat mengesahkan akaun anda - maaf."
-
-#: templates/web/zurich/auth/token.html:17
-msgid "We have sent you an email containing a link to confirm your account."
-msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda."
+#: templates/web/base/auth/general.html:6
+#: templates/web/base/report/display.html:27
+#: templates/web/base/report/new/oauth_email_form.html:5
+#, fuzzy
+msgid "We need your email address, please give it below."
+msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda."
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2
-#: templates/web/fixmystreet/report/update-form.html:77
+#: templates/web/base/report/new/form_user_loggedout_email.html:2
+#: templates/web/base/report/update/form_user_loggedout_email.html:2
msgid "We never show your email"
msgstr "Kita tidak akan mempaprkan emel anda"
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65
+#: templates/web/base/report/new/form_user_loggedin.html:31
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:28
msgid "We never show your email address or phone number."
msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422
+#: perllib/FixMyStreet/Script/Reports.pm:200
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka"
@@ -3612,10 +3464,6 @@ msgstr ""
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr ""
-#: templates/web/base/contact/blurb.html:8
-msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"
-msgstr ""
-
#: templates/web/base/contact/submit.html:7
msgid "We’ll get back to you as soon as we can."
msgstr ""
@@ -3624,7 +3472,7 @@ msgstr ""
msgid "What was your experience of getting the problem fixed?"
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49
+#: templates/web/base/report/new/form_report.html:19
msgid "What’s the issue, and where is it?"
msgstr ""
@@ -3637,7 +3485,11 @@ msgstr "Bila diedit"
msgid "When sent"
msgstr "Bila dihantar"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:640
+#: templates/web/base/js/translation_strings.html:50
+msgid "Whoa there Testino! Three photos are enough."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
msgid "Whole block of empty flats"
msgstr "Seluruh blok flat kosong"
@@ -3652,7 +3504,7 @@ msgstr ""
msgid "Wish"
msgstr ""
-#: templates/web/base/open311/index.html:92
+#: templates/web/base/open311/index.html:84
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
@@ -3660,7 +3512,7 @@ msgstr ""
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>."
msgstr ""
-#: templates/web/base/questionnaire/index.html:87
+#: templates/web/base/questionnaire/index.html:96
msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
msgstr ""
@@ -3669,7 +3521,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as
msgstr ""
#: templates/web/base/report/new/fill_in_details_form.html:4
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5
msgid "Wrong location? Just click again on the map."
msgstr ""
@@ -3692,27 +3543,24 @@ msgstr "Tahun"
#: templates/web/base/admin/users.html:31
#: templates/web/base/questionnaire/creator_fixed.html:14
#: templates/web/base/questionnaire/index.html:51
-#: templates/web/base/questionnaire/index.html:90
+#: templates/web/base/questionnaire/index.html:99
msgid "Yes"
msgstr "Ya"
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17
-#: templates/web/fixmystreet/report/update-form.html:91
+#: templates/web/base/report/new/form_user_loggedout_password.html:5
+#: templates/web/base/report/update/form_user_loggedout_password.html:4
msgid "Yes I have a password"
msgstr "Ya aku ada kata laluan"
-#: templates/web/base/contact/index.html:39
-#: templates/web/fixmystreet/contact/index.html:54
+#: templates/web/base/contact/index.html:46
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr ""
-#: templates/web/base/contact/index.html:41
-#: templates/web/fixmystreet/contact/index.html:56
+#: templates/web/base/contact/index.html:48
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr ""
-#: templates/web/base/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:30
+#: templates/web/base/contact/index.html:22
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr ""
@@ -3725,7 +3573,7 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:121
+#: templates/web/base/contact/index.html:113
msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
msgstr ""
@@ -3736,8 +3584,8 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/base/report/new/councils_text_none.html:10
-#: templates/web/base/report/new/councils_text_none.html:2
+#: templates/web/base/report/new/councils_text_none.html:12
+#: templates/web/base/report/new/councils_text_none.html:14
#: templates/web/base/report/new/councils_text_some.html:19
#: templates/web/base/report/new/councils_text_some.html:21
msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
@@ -3755,21 +3603,16 @@ msgstr "Anda menolak; sila isikan kotak di atas"
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr ""
-#: templates/web/base/questionnaire/index.html:77
-#: templates/web/base/report/new/fill_in_details_form.html:75
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73
-msgid "You have already attached a photo to this report, attaching another one will replace it."
-msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya."
-
-#: templates/web/base/report/update-form.html:59
-#: templates/web/fixmystreet/report/update-form.html:56
-msgid "You have already attached a photo to this update, attaching another one will replace it."
-msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya."
-
-#: templates/web/zurich/report/new/fill_in_details_form.html:61
+#: templates/web/base/report/new/form_report.html:32
+#: templates/web/zurich/report/new/fill_in_details_form.html:55
msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)."
msgstr ""
+#: templates/web/base/questionnaire/index.html:83
+#: templates/web/base/report/update/form_update.html:14
+msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)."
+msgstr ""
+
#: templates/web/base/auth/sign_out.html:4
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
@@ -3784,9 +3627,8 @@ msgstr "Anda telah menunjukkan masalah pada titik atas peta yang ditanda pin hij
msgid "You have successfully confirmed your email address."
msgstr "Anda telah berjaya memastikan alamat emel anda."
-#: templates/web/base/report/display.html:20
-#: templates/web/base/report/new/fill_in_details.html:37
-#: templates/web/fixmystreet/report/display.html:17
+#: templates/web/base/report/display.html:17
+#: templates/web/base/report/new/login_success_form.html:3
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Anda telah berjaya log masuk; sila semak dan pastikan maklumat anda adalah tepat: "
@@ -3818,53 +3660,42 @@ msgid "Your Reports"
msgstr "Laporan Anda"
#: templates/web/base/alert/_list.html:89
+#: templates/web/base/contact/index.html:83
+#: templates/web/base/report/display_tools.html:38
+#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/new/form_user_loggedin.html:3
+#: templates/web/base/report/new/form_user_loggedout_email.html:1
+#: templates/web/base/report/update/form_user_loggedout_email.html:1
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:91
-#: templates/web/fixmystreet/report/display.html:62
-#: templates/web/fixmystreet/report/display.html:64
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1
-#: templates/web/fixmystreet/report/update-form.html:76
#: templates/web/zurich/report/new/fill_in_details_form.html:76
msgid "Your email"
msgstr "Emel Anda"
-#: templates/web/base/auth/general.html:28
-#: templates/web/fixmystreet/report/update-form.html:82
+#: templates/web/base/auth/general.html:45
+#: templates/web/base/report/update/form_user_loggedout_email.html:7
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
msgstr "Alamat emel anda"
-#: templates/web/base/report/new/fill_in_details_form.html:106
-#: templates/web/base/report/update-form.html:81
-msgid "Your email:"
-msgstr "Emel anda:"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
+#: templates/web/base/report/updates-sidebar-notes.html:3
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
-#: templates/web/base/auth/general.html:51
-#: templates/web/fixmystreet/contact/index.html:84
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54
-#: templates/web/fixmystreet/report/update-form.html:142
+#: templates/web/base/auth/general.html:90
+#: templates/web/base/contact/index.html:76
+#: templates/web/base/report/new/form_user_loggedin.html:18
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:17
+#: templates/web/base/report/update/form_name.html:11
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:86
msgid "Your name"
msgstr "Nama anda"
-#: templates/web/base/contact/index.html:73
-#: templates/web/base/report/new/fill_in_details_form.html:186
-#: templates/web/base/report/update-form.html:152
-msgid "Your name:"
-msgstr "Nama anda:"
-
-#: templates/web/base/auth/general.html:39
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22
-#: templates/web/fixmystreet/report/update-form.html:96
+#: templates/web/base/auth/general.html:75
+#: templates/web/base/report/new/form_user_loggedout_password.html:10
+#: templates/web/base/report/update/form_user_loggedout_password.html:9
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Kata laluan anda"
@@ -3873,13 +3704,14 @@ msgstr "Kata laluan anda"
msgid "Your password has been changed"
msgstr "Kata laluan anda telah diubahi"
-#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27
-#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63
+#: templates/web/base/report/new/form_user_loggedin.html:27
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Your phone number"
msgstr "Nombor telefon anda"
#: templates/web/base/questionnaire/index.html:14
+#, fuzzy
msgid "Your report"
msgstr "Laporan anda"
@@ -3891,23 +3723,17 @@ msgstr "Laporan anda"
msgid "Your updates"
msgstr "Kemas kini anda"
-#: templates/web/base/contact/index.html:81
-msgid "Your&nbsp;email:"
-msgstr "Emel anda:"
-
#: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
msgid "all reports"
-msgstr "Semua laporan"
+msgstr ""
#: templates/web/base/admin/timeline.html:4
msgid "by %s"
msgstr "dari %s"
#: templates/web/base/reports/_list-filters.html:5
-#, fuzzy
msgid "closed reports"
-msgstr "Laporan ditutup"
+msgstr ""
#: templates/web/base/reports/body.html:6
#: templates/web/base/reports/body.html:7
@@ -3929,17 +3755,16 @@ msgid "edit user"
msgstr "edit pengguna"
#: templates/web/base/reports/_list-filters.html:6
-#, fuzzy
msgid "fixed reports"
-msgstr "Laporan selesai"
+msgstr ""
-#: templates/web/base/admin/index.html:33
+#: templates/web/base/status/stats.html:20
#: templates/web/zurich/admin/index.html:5
msgid "from %s different users"
-msgstr "dari %d pengguna lain"
+msgstr "dari %s pengguna lain"
-#: templates/web/base/report/_item.html:17
-#: templates/web/zurich/report/_item.html:16
+#: templates/web/base/report/_item.html:15
+#: templates/web/zurich/report/_item.html:14
msgid "last updated %s"
msgstr "kemaskini yang lepas %s"
@@ -4031,10 +3856,8 @@ msgstr "dibuka semula"
msgid "sign out"
msgstr "log keluar"
-#: templates/web/base/report/new/fill_in_details_form.html:12
-#: templates/web/base/report/new/fill_in_details_form.html:15
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+#: templates/web/base/report/new/fill_in_details_form.html:11
+#: templates/web/base/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "majlis tempatan"
@@ -4043,7 +3866,7 @@ msgstr "majlis tempatan"
msgid "there is no pin shown as the user did not use the map"
msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398
+#: perllib/FixMyStreet/Script/Reports.pm:176
msgid "this type of local problem"
msgstr "jenis masalah tempatan ini"
@@ -4052,9 +3875,8 @@ msgid "today"
msgstr "hari ini"
#: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
msgid "unfixed reports"
-msgstr "Laporan selesai"
+msgstr ""
#: templates/web/base/admin/report_edit.html:32
msgid "used map"
@@ -4073,7 +3895,7 @@ msgstr "pengguna adalah pemilik masalah"
msgid "ward"
msgstr "kawasan pentadbiran"
-#: templates/web/base/front/stats.html:17
+#: templates/web/base/front/stats.html:13
#, perl-format
msgid "<big>%s</big> report recently"
msgid_plural "<big>%s</big> reports recently"
@@ -4097,7 +3919,7 @@ msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minit"
-#: templates/web/base/front/stats.html:29
+#: templates/web/base/front/stats.html:25
#, perl-format
msgid "<big>%s</big> update on reports"
msgid_plural "<big>%s</big> updates on reports"
@@ -4115,13 +3937,13 @@ msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d minggu"
-#: templates/web/base/front/stats.html:12
+#: templates/web/base/front/stats.html:8
#, perl-format
msgid "<big>%s</big> report in past week"
msgid_plural "<big>%s</big> reports in past week"
msgstr[0] "<big>%s</big> laporan di minggu lepas"
-#: templates/web/base/front/stats.html:23
+#: templates/web/base/front/stats.html:19
#, perl-format
msgid "<big>%s</big> fixed in past month"
msgid_plural "<big>%s</big> fixed in past month"
@@ -4139,92 +3961,71 @@ msgid "We do <strong>not</strong> yet have details for the other council that co
msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini."
-#~ msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
-#~ msgstr "(Jangan bimbang &mdash; kita akan mengantungkan alert akan sambil anda menyemak emel anda.)"
-
-#~ msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
-#~ msgstr "(Jangan bimbang &mdash; kita akan mengantungkan laporan masalah anda sambil anda menyemak emel anda.)"
-
-#~ msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
-#~ msgstr "(Jangan bimbang &mdash; kita akan mengantungkan update akan sambil anda menyemak emel anda.)"
-
-#~ msgid "<strong>No</strong>, I do not, let me sign in by email:"
-#~ msgstr "<strong>Tidak</strong>, Aku tidak, benarkan aku log masuk dengan emel:"
-
-#~ msgid "Contact FixMyStreet"
-#~ msgstr "Menghubungi FixMyStreet"
-
-#~ msgid "Do you have a FixMyBarangay password?"
-#~ msgstr "Adakan anda mempunyai kata laluan FixMyBarangay?"
-
-#~ msgid "FixMyStreet admin:"
-#~ msgstr "Admin FixMyStreet:"
-
-#~ msgid "If you do not, your alert will not be activated."
-#~ msgstr "Jika anda tidak, pemberitahuan anda tidak akan diaktifkan."
+#~ msgid "(we never show your email address or phone number)"
+#~ msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)"
-#~ msgid "If you do not, your problem will not be posted."
-#~ msgstr "Jika anda tidak, masalah anda tidak akan dipaparkan."
+#~ msgid "(we never show your email)"
+#~ msgstr "(kita tidak akan menunjukkan alamat emel anda)"
-#~ msgid "If you do not, your update will not be posted."
-#~ msgstr "Jika anda tidak, kemas kini anda tidak akan dipaparkan."
+#~ msgid "<strong>No</strong>, let me confirm my report by email:"
+#~ msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:"
-#~ msgid "New local reports on reportemptyhomes.com"
-#~ msgstr "Laporan tempatan baru dalam reportemptyhomes.com"
+#~ msgid "<strong>No</strong>, let me confirm my update by email:"
+#~ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
-#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
-#~ msgstr "Laporan baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam reportemptyhomes.com"
+#~ msgid "Email me updates"
+#~ msgstr "Emel aku kemas kini"
-#~ msgid "New reports on reportemptyhomes.com"
-#~ msgstr "Laporan baru dalam reportemptyhomes.com"
+#~ msgid "Enter a new password:"
+#~ msgstr "Masukkan kata laluan baru"
-#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
-#~ msgstr "Laporan baru dekat {{POSTCODE}} dalam reportemptyhomes.com"
+#~ msgid "Message:"
+#~ msgstr "Pesanan:"
-#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
-#~ msgstr "Laporan baru untuk {{COUNCIL}} dalam reportemptyhomes.com"
+#~ msgid "More problems nearby"
+#~ msgstr "Lebih masalah terdekat"
-#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
-#~ msgstr "Laporan baru dalam sempadan {{NAME}} dalam reportemptyhomes.com"
+#~ msgid "Nearly Done! Now check your email..."
+#~ msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..."
-#~ msgid "New update:"
-#~ msgstr "Kemas kini baru:"
+#~ msgid "Offensive? Unsuitable? Tell us"
+#~ msgstr "Serangan? Tidak sesuai? Beritahu kami"
-#~ msgid "No problems found."
-#~ msgstr "Tiada masalah."
+#~ msgid "Photo:"
+#~ msgstr "Foto:"
-#~ msgid "No problems have been reported yet."
-#~ msgstr "Belum ada masalah yang dilaporkan."
+#~ msgid "Please check your email"
+#~ msgstr "Sila periksa emel anda"
-#~ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
-#~ msgstr "Hantarkan kemas kini anda sekarang&hellip; adakan anda mempunyai kata laluan FixMyStreet?"
+#~ msgid "This problem has been closed"
+#~ msgstr "Masalah ini telah ditutup"
-#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
-#~ msgstr "Sumber kode kita adalah terbuka dan <a href=\"http://github.com/mysociety/fixmystreet\">terdapat dalam GitHub</a>."
+#~ msgid "This problem is in progress"
+#~ msgstr "Masalah ini dalam kemajuan"
-#~ msgid "Problems within %s, FixMyStreet"
-#~ msgstr "Masalah dalam %s, FixMyStreet"
+#~ msgid "This problem is old and of unknown status."
+#~ msgstr "Masalah ini lama dan dalam keadaan tidak diketahui."
-#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com"
-#~ msgstr "Bangunan yang dilaporkan diguna semula dalam reportemptyhomes.com baru-baru ini"
+#~ msgid "Update:"
+#~ msgstr "Kemas kini:"
-#~ msgid "Publish the response"
-#~ msgstr "Terbitkan tindak balas"
+#~ msgid "We have not been able to confirm your account - sorry."
+#~ msgstr "Kita belum dapat mengesahkan akaun anda - maaf."
-#~ msgid "Sign in by email"
-#~ msgstr "Log masuk dengan emel"
+#~ msgid "We have sent you an email containing a link to confirm your account."
+#~ msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda."
-#~ msgid "Signed in as %s"
-#~ msgstr "Log masuk sebagai %s"
+#~ msgid "You have already attached a photo to this report, attaching another one will replace it."
+#~ msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya."
-#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location."
-#~ msgstr "Untuk <strong>melaporkan masalah</strong>, klik lokasi yang betul atas peta."
+#~ msgid "You have already attached a photo to this update, attaching another one will replace it."
+#~ msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya."
-#~ msgid "User"
-#~ msgstr "Pengguna"
+#~ msgid "Your email:"
+#~ msgstr "Emel anda:"
-#~ msgid "You must now click the link in the email we've just sent you."
-#~ msgstr "Anda mesti mengklikkan link dalam emel yang dihantar kepada anda."
+#~ msgid "Your name:"
+#~ msgstr "Nama anda:"
-#~ msgid "Your email address:"
-#~ msgstr "Alamat emel anda:"
+#~ msgid "Your&nbsp;email:"
+#~ msgstr "Emel anda:"