aboutsummaryrefslogtreecommitdiffstats
path: root/locale/ms.UTF-8
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2017-02-02 10:23:30 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2017-02-02 16:32:41 +0000
commit2fde5b1ee5df7f8a931908656a2563885adb141d (patch)
tree24d6a1da81c39ee9bfda45511aeaf72982caec35 /locale/ms.UTF-8
parent63d4804973ae4bd26bf4af098f3ba57a14a0647f (diff)
Update translations with new source strings.
Diffstat (limited to 'locale/ms.UTF-8')
-rw-r--r--locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po540
1 files changed, 306 insertions, 234 deletions
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
index 0789a37a5..00d05d918 100644
--- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2016-11-08 11:39+0000\n"
+"POT-Creation-Date: 2017-02-02 10:22+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: mySociety <transifex@mysociety.org>, 2016\n"
"Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:639
+#: perllib/FixMyStreet/DB/Result/Problem.pm:648
#: perllib/FixMyStreet/Script/Reports.pm:199
msgid " and "
msgstr " dan "
@@ -110,7 +110,7 @@ msgstr "%s kawasan pentadbiran, %s"
msgid "%s, within %s ward"
msgstr "%s, dalam kawasan pentadbiran %s"
-#: perllib/FixMyStreet/Map/OSM.pm:42
+#: perllib/FixMyStreet/Map/OSM.pm:38
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr ""
@@ -118,7 +118,7 @@ msgstr ""
msgid "(Defect &amp; location of defect)"
msgstr ""
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
#: templates/web/base/admin/users.html:32
msgid "(Email in abuse table)"
msgstr "(Emel dalam jadual penyalahguna)"
@@ -142,12 +142,10 @@ msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)"
msgid "(alternatively the RSS feed can be customised, within %s)"
msgstr ""
-#: templates/web/base/report/_item.html:27
#: templates/web/zurich/report/_item.html:19
msgid "(closed)"
msgstr "(ditutup)"
-#: templates/web/base/report/_item.html:25
#: templates/web/zurich/report/_item.html:17
msgid "(fixed)"
msgstr "(tetap)"
@@ -156,7 +154,7 @@ 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:60
msgid "(not sent to council)"
msgstr "(tidak dihantar kepada majlis)"
@@ -164,21 +162,21 @@ msgstr "(tidak dihantar kepada majlis)"
msgid "(optional)"
msgstr "(tidak diwajibkan)"
-#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:59
msgid "(sent to both)"
msgstr "(hantar kepada kedua-dua)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:231
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/DB/Result/Problem.pm:438
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:239
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/DB/Result/Problem.pm:439
msgid "-- Pick a category --"
msgstr "-- Pilih kategori --"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:444
+#: perllib/FixMyStreet/DB/Result/Problem.pm:445
msgid "-- Pick a property type --"
msgstr "-- Pilih jenis harta --"
-#: templates/web/base/admin/response_templates_select.html:4
+#: templates/web/base/admin/response_templates_select.html:3
msgid "--Choose a template--"
msgstr ""
@@ -197,8 +195,8 @@ msgstr ""
"Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
"Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
-#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
+#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
#: templates/web/base/reports/_list-filters.html:28
msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s"
msgstr ""
@@ -221,11 +219,11 @@ msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel
msgid "<strong>No</strong> let me sign in by email"
msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
-#: templates/web/base/report/_inspect.html:133
+#: templates/web/base/report/_inspect.html:142
msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
msgstr ""
-#: templates/web/base/report/_inspect.html:135
+#: templates/web/base/report/_inspect.html:144
msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
msgstr ""
@@ -236,7 +234,7 @@ msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>Ya</strong> Aku ada kata laluan"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:8
+#: templates/web/base/admin/report_blocks.html:10
#: templates/web/base/report/update/form_update.html:41
#: templates/web/base/report/update/form_update.html:42
msgid "Action Scheduled"
@@ -265,26 +263,29 @@ msgstr "Tambah badan"
msgid "Add new category"
msgstr "Tambah kategori baru"
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_item.html:10
+#: templates/web/base/report/_item.html:14
+#: templates/web/base/report/_main.html:136
#: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:27
+#: templates/web/base/report/_main.html:30
msgid "Add to shortlist"
msgstr ""
#: templates/web/base/admin/user_edit.html:4
#: templates/web/base/admin/users.html:48
+#: templates/web/base/admin/users.html:51
msgid "Add user"
msgstr "Tambah pengguna"
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
msgid "Add/edit response templates"
msgstr ""
@@ -292,7 +293,7 @@ msgstr ""
msgid "Added %s"
msgstr "%s telah ditambahi"
-#: templates/web/base/report/_main.html:141
+#: templates/web/base/report/_main.html:145
msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
msgstr ""
@@ -347,7 +348,7 @@ msgstr "Ada kemas kini menanda masalah ini sebagai diselesai."
msgid "Anonymous"
msgstr "Tanpa nama"
-#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/report_edit.html:134
#: templates/web/base/admin/update_edit.html:23
msgid "Anonymous:"
msgstr "Tanpa Nama:"
@@ -402,7 +403,7 @@ msgstr "Ditugaskan kepada badan luaran:"
msgid "Assign to subdivision:"
msgstr "Ditugaskan kepada bahagian bawah:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
msgid "Assign users to areas"
msgstr ""
@@ -427,8 +428,8 @@ msgstr ""
msgid "Auto-response:"
msgstr ""
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/report/_inspect.html:42
+#: templates/web/base/admin/report_edit.html:127
+#: templates/web/base/report/_inspect.html:41
msgid "Available categories"
msgstr ""
@@ -436,7 +437,7 @@ msgstr ""
msgid "Avoid personal information and vehicle number plates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:401
+#: perllib/FixMyStreet/DB/Result/Problem.pm:402
#: templates/web/zurich/report/_item.html:9
msgid "Awaiting moderation"
msgstr "Mengunggu penyederhanaan"
@@ -449,12 +450,12 @@ msgstr "Balik"
msgid "Back to all reports"
msgstr ""
-#: templates/web/base/admin/report_blocks.html:41
+#: templates/web/base/admin/report_blocks.html:43
msgid "Ban email address"
msgstr "Melarang alamat emel"
#: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
#: perllib/FixMyStreet/Cobrand/Zurich.pm:391
#: templates/web/base/admin/bodies.html:1
#: templates/web/base/admin/report_edit.html:55
@@ -485,10 +486,6 @@ msgstr ""
msgid "Can't see the map? <em>Skip this step</em>"
msgstr ""
-#: templates/web/base/report/_inspect.html:141
-msgid "Cancel"
-msgstr ""
-
#: perllib/FixMyStreet/Cobrand/Default.pm:650
#: templates/web/base/admin/responsepriorities/list.html:8
msgid "Categories"
@@ -501,7 +498,8 @@ msgstr ""
#: templates/web/base/admin/body.html:72
#: templates/web/base/admin/contact-form.html:19
#: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:33
+#: templates/web/base/report/_inspect.html:32
+#: templates/web/base/report/_item.html:82
#: templates/web/base/report/new/category.html:6
#: templates/web/base/report/new/category_wrapper.html:3
#: templates/web/zurich/admin/body.html:14
@@ -521,7 +519,7 @@ msgstr ""
msgid "Category fix rate for problems > 4 weeks old"
msgstr "Kategori rata masalah diselesai > 4 minggu"
-#: templates/web/base/admin/report_edit.html:125
+#: templates/web/base/admin/report_edit.html:119
#: templates/web/zurich/admin/body.html:43
#: templates/web/zurich/admin/contact-form.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -584,6 +582,10 @@ msgid ""
" to the body too. These will appear in the drop-down menu on the report-a-problem page."
msgstr ""
+#: templates/web/base/report/_inspect.html:76
+msgid "Choose another"
+msgstr ""
+
#: templates/web/base/admin/stats.html:72
#: templates/web/base/admin/stats.html:78
msgid "Click here or enter as dd/mm/yyyy"
@@ -612,10 +614,11 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:189
#: perllib/FixMyStreet/Cobrand/Zurich.pm:960
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:15
-#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:17
+#: templates/web/base/admin/report_blocks.html:27
#: templates/web/base/dashboard/index.html:140
#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:43
#: templates/web/base/report/banner.html:15
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
@@ -717,8 +720,8 @@ msgstr "Menghubungi pasukan"
msgid "Coordinates:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1649
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1677
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1651
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1679
msgid "Could not find user"
msgstr "Tidak dapat mencari pengguna"
@@ -772,7 +775,7 @@ msgstr ""
msgid "Create reports/updates on a user's behalf"
msgstr ""
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
#: templates/web/zurich/admin/template_edit.html:29
msgid "Create template"
msgstr ""
@@ -813,7 +816,7 @@ msgid "Dealt with by subdivision within 5 working days"
msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
#: perllib/FixMyStreet/App/Controller/Admin.pm:975
-#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/admin/template_edit.html:50
#: templates/web/zurich/admin/template_edit.html:33
msgid "Delete template"
msgstr ""
@@ -879,21 +882,35 @@ msgstr ""
msgid "Don&rsquo;t know"
msgstr "Tidak tahu"
-#: templates/web/base/contact/index.html:110
+#: templates/web/base/contact/index.html:108
msgid "Don't like forms?"
msgstr ""
+#: templates/web/base/report/_item.html:25
+msgid "Down one"
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:52
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/admin/report_blocks.html:16
#: templates/web/base/report/update/form_update.html:41
#: templates/web/base/report/update/form_update.html:43
msgid "Duplicate"
msgstr "Salinan"
+#: templates/web/base/report/_inspect.html:71
+#, fuzzy
+msgid "Duplicate of"
+msgstr "Salinan"
+
+#: templates/web/base/report/_inspect.html:81
+#, fuzzy
+msgid "Duplicates"
+msgstr "Salinan"
+
#: templates/web/base/admin/body.html:116
msgid ""
"Each contact for the body has a category, which is displayed to the public. \n"
@@ -902,7 +919,8 @@ msgid ""
" "
msgstr ""
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:73
msgid "Easting/Northing:"
msgstr ""
@@ -921,11 +939,11 @@ msgstr "Menyunting"
msgid "Edit body details"
msgstr "Edit perincian badah"
-#: perllib/FixMyStreet/Cobrand/Default.pm:724
+#: perllib/FixMyStreet/Cobrand/Default.pm:725
msgid "Edit other users' details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:725
+#: perllib/FixMyStreet/Cobrand/Default.pm:726
msgid "Edit other users' permissions"
msgstr ""
@@ -976,7 +994,7 @@ msgstr "Editor"
msgid "Email"
msgstr "Emel"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1625
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1627
msgid "Email added to abuse list"
msgstr "Emel ditambahkan kepada senarai penyalahguna"
@@ -994,11 +1012,11 @@ msgstr ""
msgid "Email alert deleted"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1622
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1624
msgid "Email already in abuse list"
msgstr "Emel telah dalam senarai penyalahguna"
-#: templates/web/base/admin/report_edit.html:147
+#: templates/web/base/admin/report_edit.html:141
#: templates/web/base/admin/update_edit.html:35
#: templates/web/base/admin/user-form.html:19
#: templates/web/zurich/admin/body.html:48
@@ -1065,7 +1083,7 @@ msgid "Enter details of the problem"
msgstr "Masukkan perincian masalah tersebut"
#: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:4
+#: templates/web/base/errors/generic.html:8
#: templates/web/base/tokens/abuse.html:1
#: templates/web/base/tokens/abuse.html:3
#: templates/web/base/tokens/error.html:1
@@ -1087,8 +1105,8 @@ msgstr "Contoh poskod %s"
msgid "Examples:"
msgstr "Contoh:"
-#: templates/web/base/admin/report_edit.html:128
-#: templates/web/base/report/_inspect.html:37
+#: templates/web/base/admin/report_edit.html:122
+#: templates/web/base/report/_inspect.html:36
msgid "Existing category"
msgstr ""
@@ -1124,7 +1142,8 @@ msgstr ""
msgid "Extra data:"
msgstr "Data tambahan:"
-#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/report/_item.html:98
msgid "Extra details"
msgstr ""
@@ -1146,11 +1165,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
msgstr ""
#: 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/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:26
#: templates/web/base/admin/stats_fix_rate.html:4
#: templates/web/base/dashboard/index.html:140
#: templates/web/base/dashboard/index.html:142
+#: templates/web/base/report/_item.html:41
#: templates/web/base/report/banner.html:12
#: templates/web/base/report/update/form_update.html:41
#: templates/web/base/report/update/form_update.html:45
@@ -1158,12 +1178,12 @@ msgid "Fixed"
msgstr "Diselesai"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:11
+#: templates/web/base/admin/report_blocks.html:13
msgid "Fixed - Council"
msgstr "Diselesai - Majlis"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:10
+#: templates/web/base/admin/report_blocks.html:12
msgid "Fixed - User"
msgstr "Diselesai - Pengguna"
@@ -1181,7 +1201,7 @@ msgstr "Selesai:"
msgid "Flag as deleted"
msgstr "Tanda sebagai dipadam"
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
msgid "Flag user"
msgstr "Tanda pengguna"
@@ -1202,7 +1222,7 @@ msgstr ""
msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
msgstr ""
-#: templates/web/base/admin/report_edit.html:153
+#: templates/web/base/admin/report_edit.html:147
#: templates/web/base/admin/user-form.html:100
msgid "Flagged:"
msgstr "Ditanda:"
@@ -1240,7 +1260,7 @@ msgid "Frequently Asked Questions"
msgstr "Soalan lazim"
#: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:12
+#: templates/web/base/report/display_tools.html:14
msgid "Get updates"
msgstr "Dapatkan kemas kini"
@@ -1266,7 +1286,7 @@ msgstr ""
#: templates/web/base/alert/index.html:34
#: templates/web/base/around/postcode_form.html:13
#: templates/web/base/reports/_list-filters.html:29
-#: templates/web/base/reports/_list-filters.html:41
+#: templates/web/base/reports/_list-filters.html:44
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Pergi"
@@ -1275,7 +1295,7 @@ msgstr "Pergi"
msgid "Going to send questionnaire?"
msgstr "Teruskan dengan menghantar soalan selidik?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
msgid "Grant access to the admin"
msgstr ""
@@ -1317,8 +1337,8 @@ msgstr "Hi %s"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:906
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:17
-#: templates/web/base/admin/report_blocks.html:26
+#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:28
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
@@ -1361,7 +1381,7 @@ msgstr ""
msgid "I just updated a problem on @fixmystreet"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87
msgid "I'm afraid we couldn't locate your problem in the database.\n"
msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
@@ -1407,6 +1427,10 @@ msgstr ""
msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
msgstr ""
+#: templates/web/base/admin/template_edit.html:36
+msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
+msgstr ""
+
#: templates/web/base/questionnaire/index.html:70
msgid ""
"If you wish to leave a public update on the problem, please enter it here\n"
@@ -1466,7 +1490,7 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:192
#: perllib/FixMyStreet/Cobrand/Zurich.pm:954
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:7
+#: templates/web/base/admin/report_blocks.html:9
#: templates/web/base/report/banner.html:19
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:8
@@ -1502,7 +1526,7 @@ msgid "Internal notes"
msgstr "Nota dalaman"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:16
+#: templates/web/base/admin/report_blocks.html:18
msgid "Internal referral"
msgstr "Rujukan dalaman"
@@ -1510,7 +1534,7 @@ msgstr "Rujukan dalaman"
msgid "Invalid agency_responsible value %s"
msgstr "Nilai agency_responsible %s salah"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1483
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1485
msgid "Invalid end date"
msgstr "Tarikh berakhir yang tak sah"
@@ -1518,16 +1542,16 @@ msgstr "Tarikh berakhir yang tak sah"
msgid "Invalid format %s specified."
msgstr "Format dinyatakan %s salah"
-#: perllib/FixMyStreet/App/Controller/Report.pm:361
+#: perllib/FixMyStreet/App/Controller/Report.pm:384
msgid "Invalid location. New location must be covered by the same council."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1479
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1481
msgid "Invalid start date"
msgstr "Tarikh mula yang tak sah"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:5
+#: templates/web/base/admin/report_blocks.html:7
#: templates/web/base/dashboard/index.html:140
#: templates/web/base/dashboard/index.html:141
#: templates/web/base/report/update/form_update.html:41
@@ -1573,7 +1597,11 @@ msgstr "Kemas kini terakhir:"
msgid "Last&nbsp;update:"
msgstr "Kemas kini terakhir:"
-#: templates/web/base/reports/_list-filters.html:38
+#: templates/web/base/report/_item.html:78
+msgid "Latitude/Longitude:"
+msgstr ""
+
+#: templates/web/base/reports/_list-filters.html:41
msgid "Least recently updated"
msgstr ""
@@ -1618,6 +1646,10 @@ msgstr "PETA"
msgid "Manage shortlist"
msgstr ""
+#: templates/web/base/reports/_list-filters.html:36
+msgid "Manual order"
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:46
msgid "Map"
msgstr ""
@@ -1642,7 +1674,7 @@ msgstr ""
msgid "Markup problem details"
msgstr ""
-#: templates/web/base/contact/index.html:98
+#: templates/web/base/contact/index.html:96
msgid "Message"
msgstr "Pesanan"
@@ -1662,7 +1694,7 @@ msgstr ""
msgid "Missing jurisdiction_id"
msgstr "Kehilangan jurisdiction_id"
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
msgid "Moderate"
msgstr ""
@@ -1670,7 +1702,7 @@ msgstr ""
msgid "Moderate report details"
msgstr ""
-#: templates/web/base/report/_main.html:126
+#: templates/web/base/report/_main.html:130
msgid "Moderate this report"
msgstr ""
@@ -1682,7 +1714,7 @@ msgstr ""
msgid "Month"
msgstr "Bulan"
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:42
msgid "Most commented"
msgstr ""
@@ -1706,7 +1738,7 @@ msgstr ""
msgid "Name"
msgstr "Nama"
-#: templates/web/base/admin/report_edit.html:145
+#: templates/web/base/admin/report_edit.html:139
#: templates/web/base/admin/responsepriorities/edit.html:13
#: templates/web/base/admin/update_edit.html:34
#: templates/web/base/admin/user-form.html:16
@@ -1718,7 +1750,7 @@ msgstr "Nama:"
msgid "Name: %s"
msgstr "Nama: %s"
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/report/_inspect.html:22
msgid "Navigate to this problem"
msgstr ""
@@ -1818,7 +1850,7 @@ msgstr "Negeri baru"
msgid "New template"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:35
+#: templates/web/base/reports/_list-filters.html:38
msgid "Newest"
msgstr ""
@@ -1833,7 +1865,7 @@ msgstr "Seterusnya"
#: templates/web/base/admin/list_updates.html:34
#: templates/web/base/admin/list_updates.html:35
#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:143
+#: templates/web/base/admin/report_edit.html:137
#: templates/web/base/admin/report_edit.html:95
#: templates/web/base/admin/update_edit.html:26
#: templates/web/base/questionnaire/creator_fixed.html:16
@@ -1854,7 +1886,7 @@ msgstr "Tiada badan"
msgid "No council"
msgstr "Tiada majlis"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:429
+#: perllib/FixMyStreet/DB/Result/Problem.pm:430
msgid "No council selected"
msgstr "Tiada majlis dipilihi"
@@ -1914,7 +1946,7 @@ msgid ""
msgstr ""
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:13
+#: templates/web/base/admin/report_blocks.html:15
#: templates/web/base/report/update/form_update.html:41
#: templates/web/base/report/update/form_update.html:44
msgid "Not Responsible"
@@ -1994,15 +2026,15 @@ msgstr "Lebih tua<br>diselesai"
msgid "Older <br>problems"
msgstr "Lebih tua <br>masalah"
-#: templates/web/base/reports/_list-filters.html:36
+#: templates/web/base/reports/_list-filters.html:39
msgid "Oldest"
msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:169
#: perllib/FixMyStreet/Cobrand/Zurich.pm:900
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:23
-#: templates/web/base/admin/report_blocks.html:4
+#: templates/web/base/admin/report_blocks.html:25
+#: templates/web/base/admin/report_blocks.html:6
#: templates/web/base/admin/update_edit.html:30
#: templates/web/base/dashboard/index.html:140
#: templates/web/base/report/update/form_update.html:41
@@ -2048,13 +2080,13 @@ 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:1056
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:650
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:651
-#: perllib/FixMyStreet/DB/Result/Problem.pm:594
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:658
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:659
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
+#: perllib/FixMyStreet/DB/Result/Problem.pm:602
#: perllib/FixMyStreet/DB/Result/Problem.pm:617
+#: perllib/FixMyStreet/DB/Result/Problem.pm:626
#: perllib/FixMyStreet/Script/Reports.pm:185
#: perllib/FixMyStreet/Script/Reports.pm:200
msgid "Other"
@@ -2075,7 +2107,7 @@ msgid "Parent"
msgstr "Induk"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/report_blocks.html:20
msgid "Partial"
msgstr "Separa"
@@ -2109,7 +2141,7 @@ msgid "Phone number (optional)"
msgstr "Nombor telefon (tidak diwajibkan)"
#: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:152
+#: templates/web/base/admin/report_edit.html:146
#: templates/web/base/admin/user-form.html:21
#: templates/web/zurich/admin/stats.html:39
msgid "Phone:"
@@ -2161,7 +2193,7 @@ msgstr "Letakkan pin atas peta"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:940
#: perllib/FixMyStreet/Cobrand/Zurich.pm:946
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:6
+#: templates/web/base/admin/report_blocks.html:8
#: templates/web/base/dashboard/index.html:140
#: templates/web/base/dashboard/index.html:141
#: templates/web/zurich/admin/header.html:1
@@ -2189,14 +2221,14 @@ msgid "Please check your email address is correct"
msgstr "Sila periksa sama ada alamat emel anda adalah betul"
#: perllib/FixMyStreet/App/Controller/Admin.pm:350
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:837
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:860
-#: perllib/FixMyStreet/DB/Result/Problem.pm:440
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:845
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:868
+#: perllib/FixMyStreet/DB/Result/Problem.pm:441
#: templates/web/base/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Sila pilihkan kategori"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:446
+#: perllib/FixMyStreet/DB/Result/Problem.pm:447
msgid "Please choose a property type"
msgstr "Sila pilihkan jenis bangunan"
@@ -2217,13 +2249,13 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:351
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
#: templates/web/base/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Sila masukkan pesanan"
#: perllib/FixMyStreet/App/Controller/Admin.pm:1204
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
msgid "Please enter a name"
msgstr ""
@@ -2238,13 +2270,13 @@ msgid "Please enter a password"
msgstr "Sila masukkan kata laluan"
#: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/Problem.pm:423
+#: perllib/FixMyStreet/DB/Result/Problem.pm:424
#: templates/web/base/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Sila masukkan tajuk"
#: perllib/FixMyStreet/App/Controller/Admin.pm:1201
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
#: perllib/FixMyStreet/App/Controller/Admin.pm:363
#: perllib/FixMyStreet/DB/Result/User.pm:164
#: templates/web/base/js/translation_strings.html:12
@@ -2257,7 +2289,7 @@ msgstr "Silah masukkan emel yang benar"
msgid "Please enter a valid email address"
msgstr "Sila masukkan alamat emel yang benah"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:426
+#: perllib/FixMyStreet/DB/Result/Problem.pm:427
#: templates/web/base/js/translation_strings.html:4
msgid "Please enter some details"
msgstr "Sila masukkan perincian"
@@ -2290,8 +2322,8 @@ msgid "Please enter your full name, councils need this information – if you do
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/Problem.pm:434
+#: perllib/FixMyStreet/DB/Result/Comment.pm:124
+#: perllib/FixMyStreet/DB/Result/Problem.pm:435
#: perllib/FixMyStreet/DB/Result/User.pm:157
#: templates/web/base/js/translation_strings.html:6
msgid "Please enter your name"
@@ -2328,7 +2360,7 @@ msgstr "Sila isikan perincian untuk masalah tersebut"
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 ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr ""
@@ -2354,20 +2386,20 @@ msgstr ""
msgid "Please note:"
msgstr "Sila nota:"
-#: perllib/FixMyStreet/App/Controller/Report.pm:335
+#: perllib/FixMyStreet/App/Controller/Report.pm:354
msgid "Please provide a public update for this report."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242
msgid "Please provide some explanation as to why you're reopening this report"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
msgid "Please provide some text as well as a photo"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
msgid "Please say whether you've ever reported a problem to your council before"
msgstr ""
@@ -2383,7 +2415,7 @@ msgstr ""
msgid "Please select the type of alert you want"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231
msgid "Please state whether or not the problem has been fixed"
msgstr ""
@@ -2402,22 +2434,22 @@ msgstr "Sila tuliskan pesanan"
msgid "Please write your update here"
msgstr "Sila tuliskan kemas kini anda di sini"
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/index.html:103
#: templates/web/base/report/update-form.html:25
#: templates/web/base/report/update/form_user_loggedout_by_email.html:14
#: templates/web/base/report/update/form_user_loggedout_password.html:10
msgid "Post"
msgstr "Post"
-#: templates/web/base/report/updates.html:15
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
msgid "Posted anonymously at %s"
msgstr "Post tanpa nama pada %s"
-#: templates/web/base/report/updates.html:22
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
msgid "Posted by %s (<strong>%s</strong>) at %s"
msgstr "Dipostkan oleh %s (<strong>%s</strong>) pada %s"
-#: templates/web/base/report/updates.html:24
+#: perllib/FixMyStreet/DB/Result/Comment.pm:255
msgid "Posted by %s at %s"
msgstr "Dipostkan oleh %s pada %s"
@@ -2433,7 +2465,8 @@ msgstr "Sebelumnya"
msgid "Priorities"
msgstr ""
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:96
+#: templates/web/base/report/_item.html:90
msgid "Priority"
msgstr ""
@@ -2449,10 +2482,15 @@ msgstr ""
#: templates/web/base/admin/body.html:91
#: templates/web/base/admin/contact-form.html:74
-#: templates/web/base/admin/report_edit.html:155
+#: templates/web/base/admin/report_edit.html:149
msgid "Private"
msgstr "Peribadi"
+#: templates/web/base/report/new/form_user.html:1
+#, fuzzy
+msgid "Private details"
+msgstr "Peribadi"
+
#: templates/web/base/maps/pin.html:13
msgid "Problem"
msgstr "Masalah"
@@ -2488,11 +2526,11 @@ msgstr ""
msgid "Problems"
msgstr "Masalah-masalah"
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
msgid "Problems nearby"
msgstr "Masalah terdekat"
-#: templates/web/base/report/display_tools.html:18
+#: templates/web/base/report/display_tools.html:20
msgid "Problems on the map"
msgstr "Masalah atas peta"
@@ -2504,7 +2542,7 @@ 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:833
+#: perllib/FixMyStreet/Cobrand/Default.pm:834
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
#: perllib/FixMyStreet/Cobrand/UK.pm:208
msgid "Problems within %s"
@@ -2528,6 +2566,7 @@ msgstr "Masalah dalam sempadan"
msgid "Property address:"
msgstr "Alamat bangunan"
+#: templates/web/base/report/duplicate-no-updates.html:2
#: templates/web/base/report/update-form.html:6
msgid "Provide an update"
msgstr "Sediakan kemas kini"
@@ -2545,12 +2584,17 @@ msgstr ""
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
+#: templates/web/base/report/new/form_report.html:10
+#, fuzzy
+msgid "Public details"
+msgstr "Tindak balas awam:"
+
#: templates/web/zurich/admin/report_edit.html:241
#: templates/web/zurich/admin/report_edit.html:268
msgid "Public response:"
msgstr "Tindak balas awam:"
-#: templates/web/base/report/_inspect.html:125
+#: templates/web/base/report/_inspect.html:134
msgid "Public update:"
msgstr ""
@@ -2574,7 +2618,7 @@ msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s"
msgid "Questionnaire %d sent for problem %d"
msgstr "Soalan selidik %d dihantar untuk masalah %d"
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191
msgid "Questionnaire filled in by problem reporter"
msgstr "Soalan selidik diisikan oleh pelapor masalah"
@@ -2582,7 +2626,7 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah"
#: templates/web/base/alert/updates.html:9
#: templates/web/base/around/display_location.html:1
#: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
msgid "RSS feed"
msgstr "Feed RSS"
@@ -2610,7 +2654,7 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
msgid "RSS feed of nearby problems"
msgstr "Feed RSS untuk masalah berdekatan"
-#: perllib/FixMyStreet/Cobrand/Default.pm:834
+#: perllib/FixMyStreet/Cobrand/Default.pm:835
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
#: perllib/FixMyStreet/Cobrand/UK.pm:215
msgid "RSS feed of problems within %s"
@@ -2626,12 +2670,12 @@ msgid "RSS feed of recent local problems"
msgstr "Feed RSS untuk masalah tempatan baru-baru ini"
#: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:40
+#: templates/web/base/report/display_tools.html:42
msgid "RSS feed of updates to this problem"
msgstr "Feed RSS untuk kemas kini bagi masalah ini"
#: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
msgid "Receive email when updates are left on this problem."
msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
@@ -2653,7 +2697,7 @@ msgstr "Diselesai <br>baru-baru ini"
msgid "Recently reported problems"
msgstr "Masalah yang dilaporkan baru-baru ini"
-#: templates/web/base/reports/_list-filters.html:37
+#: templates/web/base/reports/_list-filters.html:40
msgid "Recently updated"
msgstr ""
@@ -2661,13 +2705,15 @@ msgstr ""
msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
msgstr ""
-#: templates/web/base/admin/report_blocks.html:46
+#: templates/web/base/admin/report_blocks.html:48
msgid "Remove flag"
msgstr ""
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_item.html:12
+#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_main.html:134
#: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:24
+#: templates/web/base/report/_main.html:26
msgid "Remove from shortlist"
msgstr ""
@@ -2675,7 +2721,7 @@ msgstr ""
msgid "Remove from site"
msgstr ""
-#: templates/web/base/admin/report_edit.html:172
+#: templates/web/base/admin/report_edit.html:166
#: templates/web/base/admin/update_edit.html:69
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
@@ -2689,7 +2735,8 @@ msgstr ""
msgid "Report"
msgstr ""
-#: templates/web/base/report/_inspect.html:11
+#: templates/web/base/report/_inspect.html:10
+#: templates/web/base/report/_item.html:68
msgid "Report ID:"
msgstr ""
@@ -2699,6 +2746,7 @@ msgstr ""
msgid "Report a problem"
msgstr ""
+#: templates/web/base/report/display_tools.html:10
#: templates/web/base/report/display_tools.html:9
msgid "Report abuse"
msgstr ""
@@ -2722,8 +2770,8 @@ msgstr ""
msgid "Report, view, or discuss local problems"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: templates/web/base/contact/index.html:57
+#: perllib/FixMyStreet/DB/Result/Problem.pm:606
+#: templates/web/base/contact/index.html:55
msgid "Reported anonymously at %s"
msgstr ""
@@ -2732,8 +2780,8 @@ msgstr ""
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:621
-#: templates/web/base/contact/index.html:59
+#: perllib/FixMyStreet/DB/Result/Problem.pm:630
+#: templates/web/base/contact/index.html:57
msgid "Reported by %s at %s"
msgstr ""
@@ -2746,27 +2794,27 @@ msgstr ""
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
+#: perllib/FixMyStreet/DB/Result/Problem.pm:603
msgid "Reported in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:627
msgid "Reported in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:599
+#: perllib/FixMyStreet/DB/Result/Problem.pm:600
msgid "Reported via %s anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:615
+#: perllib/FixMyStreet/DB/Result/Problem.pm:624
msgid "Reported via %s by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:596
+#: perllib/FixMyStreet/DB/Result/Problem.pm:597
msgid "Reported via %s in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
msgid "Reported via %s in the %s category by %s at %s"
msgstr ""
@@ -2876,16 +2924,16 @@ msgstr ""
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1728
-#: templates/web/base/admin/report_edit.html:169
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1730
+#: templates/web/base/admin/report_edit.html:163
#: templates/web/base/admin/update_edit.html:66
#: templates/web/zurich/admin/report_edit.html:118
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1724
-#: templates/web/base/admin/report_edit.html:170
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1726
+#: templates/web/base/admin/report_edit.html:164
#: templates/web/base/admin/update_edit.html:67
#: templates/web/zurich/admin/report_edit.html:119
msgid "Rotate Right"
@@ -2896,21 +2944,26 @@ msgid "Rotating this photo will discard unsaved changes to the report."
msgstr ""
#: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:9
+#: templates/web/base/maps/google-ol.html:11
msgid "Satellite"
msgstr ""
+#: templates/web/base/report/_inspect.html:150
+#, fuzzy
+msgid "Save + close as duplicate"
+msgstr "ditanda sebagai laporan salinan"
+
#: templates/web/base/admin/contact-form.html:137
#: templates/web/base/admin/responsepriorities/edit.html:36
-#: templates/web/base/admin/template_edit.html:36
-#: templates/web/base/report/_inspect.html:142
+#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/report/_inspect.html:150
#: templates/web/zurich/admin/body.html:62
#: templates/web/zurich/admin/contact-form.html:20
#: templates/web/zurich/admin/template_edit.html:29
msgid "Save changes"
msgstr ""
-#: templates/web/base/report/_inspect.html:121
+#: templates/web/base/report/_inspect.html:130
msgid "Save with a public update"
msgstr ""
@@ -2947,6 +3000,10 @@ msgstr ""
msgid "See our privacy policy"
msgstr ""
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
+msgid "See user detail for reports created as the council"
+msgstr ""
+
#: templates/web/base/admin/body-form.html:39
#: templates/web/zurich/admin/body-form.html:16
msgid "Select a body"
@@ -2990,27 +3047,27 @@ msgstr "Dihantar:"
msgid "Service:"
msgstr "Servis:"
-#: templates/web/base/report/_inspect.html:26
+#: templates/web/base/report/_inspect.html:25
msgid "Set to my current location"
msgstr ""
-#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/display_tools.html:17
msgid "Share"
msgstr "Kongsi"
-#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:136
#: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:29
msgid "Shortlist"
msgstr ""
-#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:134
#: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:23
+#: templates/web/base/report/_main.html:25
msgid "Shortlisted"
msgstr ""
-#: templates/web/base/report/_main.html:140
+#: templates/web/base/report/_main.html:144
msgid "Shortlisted by %s"
msgstr ""
@@ -3082,7 +3139,7 @@ msgstr ""
msgid "Sorry, there has been an error confirming your problem."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:222
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:230
#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
#: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3130,12 +3187,14 @@ msgstr "Tarikh bermula:"
#: templates/web/base/admin/index.html:58
#: templates/web/base/admin/list_updates.html:11
#: templates/web/base/admin/reports.html:16
-#: templates/web/base/report/_inspect.html:67
+#: templates/web/base/admin/template_edit.html:40
+#: templates/web/base/report/_inspect.html:66
+#: templates/web/base/report/_item.html:86
#: templates/web/base/report/update/form_update.html:39
msgid "State"
msgstr "Negeri"
-#: templates/web/base/admin/report_edit.html:115
+#: templates/web/base/admin/report_edit.html:116
#: templates/web/base/admin/update_edit.html:28
#: templates/web/zurich/admin/report_edit-sdm.html:75
#: templates/web/zurich/admin/report_edit.html:103
@@ -3175,7 +3234,7 @@ msgstr "Subkategori: %s"
msgid "Subdivision/Body"
msgstr "Bahagian bawah/Badan"
-#: templates/web/base/contact/index.html:90
+#: templates/web/base/contact/index.html:88
msgid "Subject"
msgstr "Tajuk"
@@ -3192,7 +3251,7 @@ msgstr "Tajuk:"
msgid "Submit"
msgstr "Hantar"
-#: templates/web/base/admin/report_edit.html:180
+#: templates/web/base/admin/report_edit.html:174
#: templates/web/base/admin/report_edit.html:24
#: templates/web/base/admin/update_edit.html:77
#: templates/web/base/admin/user-form.html:177
@@ -3218,7 +3277,7 @@ msgid "Submitted"
msgstr "Dihantarkan"
#: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/report/display_tools.html:51
msgid "Subscribe"
msgstr "Melanggan"
@@ -3489,7 +3548,7 @@ msgstr ""
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:751
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:759
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
#: templates/web/base/auth/general.html:53
#: templates/web/zurich/auth/general.html:28
@@ -3571,9 +3630,9 @@ msgstr ""
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:918
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:882
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:926
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:972
#: perllib/FixMyStreet/Cobrand/UK.pm:44
msgid "This information is required"
msgstr ""
@@ -3598,6 +3657,10 @@ msgstr "Masalah ini telah diselesai"
msgid "This problem has not been fixed"
msgstr "Masalah ini belum diselesai"
+#: templates/web/base/report/duplicate-no-updates.html:3
+msgid "This report is a duplicate. Please leave updates on the original report:"
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
#: templates/web/zurich/report/_main.html:14
@@ -3672,7 +3735,8 @@ msgstr "Melihat lokasi tepat atas peta bagi isu ini"
msgid "Total"
msgstr "Jumlah"
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:107
+#: templates/web/base/report/_item.html:94
msgid "Traffic management required?"
msgstr ""
@@ -3680,7 +3744,7 @@ msgstr ""
msgid "Trusted by bodies:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:722
msgid "Trusted to make reports that don't need to be inspected"
msgstr ""
@@ -3697,14 +3761,14 @@ msgid "Try emailing us directly:"
msgstr ""
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:12
+#: templates/web/base/admin/report_blocks.html:14
#: templates/web/base/report/update/form_update.html:41
#: templates/web/base/report/update/form_update.html:44
msgid "Unable to fix"
msgstr "Tidak dapat diselesai"
#: templates/web/base/admin/report_blocks.html:1
-#: templates/web/base/admin/report_blocks.html:19
+#: templates/web/base/admin/report_blocks.html:21
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/report_edit-sdm.html:66
#: templates/web/zurich/admin/report_edit.html:94
@@ -3724,8 +3788,8 @@ msgstr "Tidak diketahui"
msgid "Unknown alert type"
msgstr "Jenis pemberitahuan tak diketahui"
-#: perllib/FixMyStreet/App/Controller/Auth.pm:530
#: perllib/FixMyStreet/App/Controller/Photo.pm:109
+#: perllib/FixMyStreet/App/Controller/Root.pm:124
#: templates/web/base/js/translation_strings.html:38
msgid "Unknown error"
msgstr "Ralat tidak diketahui"
@@ -3736,6 +3800,10 @@ msgstr "Ralat tidak diketahui"
msgid "Unknown problem ID"
msgstr "ID masalah tidak diketahui"
+#: templates/web/base/report/_item.html:24
+msgid "Up one"
+msgstr ""
+
#: templates/web/base/report/update/form_update.html:29
msgid "Update"
msgstr "Kemas kini"
@@ -3789,7 +3857,7 @@ msgid "Updated"
msgstr "Dikemas kinikan"
#: perllib/FixMyStreet/App/Controller/Admin.pm:1161
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1224
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1223
#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
#: perllib/FixMyStreet/App/Controller/Admin.pm:824
#: perllib/FixMyStreet/Cobrand/Zurich.pm:762
@@ -3804,7 +3872,7 @@ msgstr "Dikemas kinikan!"
msgid "Updates"
msgstr "Kemas kini"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#: perllib/FixMyStreet/DB/Result/Comment.pm:133
msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
@@ -3835,11 +3903,11 @@ msgstr ""
msgid "User ID to attribute fetched comments to"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1681
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1683
msgid "User flag removed"
msgstr "Tanda pengguna dipadam"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1653
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1655
msgid "User flagged"
msgstr "Pengguna ditanda"
@@ -3848,7 +3916,7 @@ msgid "User search finds matches in users' names and email addresses."
msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
#: perllib/FixMyStreet/Cobrand/Default.pm:670
-#: perllib/FixMyStreet/Cobrand/Default.pm:723
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
#: perllib/FixMyStreet/Cobrand/Zurich.pm:398
#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
msgid "Users"
@@ -3938,6 +4006,10 @@ msgstr "Bila diedit"
msgid "When sent"
msgstr "Bila dihantar"
+#: templates/web/base/report/_inspect.html:72
+msgid "Which report is it a duplicate of?"
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:51
msgid "Whoa there Testino! Three photos are enough."
msgstr ""
@@ -3986,7 +4058,7 @@ msgstr "Tahun"
#: templates/web/base/admin/list_updates.html:34
#: templates/web/base/admin/list_updates.html:35
#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:136
#: templates/web/base/admin/report_edit.html:95
#: templates/web/base/admin/update_edit.html:25
#: templates/web/base/admin/users.html:32
@@ -4001,11 +4073,11 @@ msgstr "Ya"
msgid "Yes I have a password"
msgstr "Ya aku ada kata laluan"
-#: templates/web/base/contact/index.html:46
+#: templates/web/base/contact/index.html:45
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr ""
-#: templates/web/base/contact/index.html:48
+#: templates/web/base/contact/unsuitable-text.html:2
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr ""
@@ -4022,7 +4094,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/base/contact/index.html:113
+#: templates/web/base/contact/index.html:111
msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
msgstr ""
@@ -4116,9 +4188,9 @@ msgstr ""
#: templates/web/base/alert/_list.html:90
#: templates/web/base/alert/updates.html:19
#: templates/web/base/alert/updates.html:22
-#: templates/web/base/contact/index.html:83
-#: templates/web/base/report/display_tools.html:44
-#: templates/web/base/report/display_tools.html:47
+#: templates/web/base/contact/index.html:81
+#: templates/web/base/report/display_tools.html:46
+#: templates/web/base/report/display_tools.html:49
#: templates/web/base/report/new/form_user_loggedout_email.html:1
#: templates/web/base/report/update/form_user_loggedout_email.html:1
#: templates/web/zurich/report/new/fill_in_details_form.html:53
@@ -4138,7 +4210,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv
msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
#: templates/web/base/auth/general.html:107
-#: templates/web/base/contact/index.html:76
+#: templates/web/base/contact/index.html:74
#: templates/web/base/report/new/form_user_loggedout_by_email.html:17
#: templates/web/base/report/update/form_name.html:29
#: templates/web/zurich/auth/general.html:61
@@ -4217,53 +4289,53 @@ msgstr "edit pengguna"
msgid "from %s different users"
msgstr "dari %s pengguna lain"
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:54
#: templates/web/zurich/report/_item.html:14
msgid "last updated %s"
msgstr "kemaskini yang lepas %s"
-#: perllib/Utils.pm:205
+#: perllib/Utils.pm:206
msgid "less than a minute"
msgstr "kurang dari seminit"
-#: templates/web/base/report/updates.html:57
+#: perllib/FixMyStreet/DB/Result/Comment.pm:288
msgid "marked as a duplicate report"
msgstr "ditanda sebagai laporan salinan"
-#: templates/web/base/report/updates.html:47
+#: perllib/FixMyStreet/DB/Result/Comment.pm:278
msgid "marked as action scheduled"
msgstr "ditanda sebagai tindakan dijadualkan"
-#: templates/web/base/report/updates.html:59
+#: perllib/FixMyStreet/DB/Result/Comment.pm:290
msgid "marked as an internal referral"
msgstr "ditanda sebagai rujukan dalaman"
-#: templates/web/base/report/updates.html:49
+#: perllib/FixMyStreet/DB/Result/Comment.pm:280
msgid "marked as closed"
msgstr "ditanda sebagai ditutupi"
-#: templates/web/base/report/updates.html:28
-#: templates/web/base/report/updates.html:51
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:282
msgid "marked as fixed"
msgstr "ditanda sebagai diselesai"
-#: templates/web/base/report/updates.html:45
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
msgid "marked as in progress"
msgstr "ditanda sebagai dijalani"
-#: templates/web/base/report/updates.html:41
+#: perllib/FixMyStreet/DB/Result/Comment.pm:272
msgid "marked as investigating"
msgstr "ditanda sebagai disiasati"
-#: templates/web/base/report/updates.html:55
+#: perllib/FixMyStreet/DB/Result/Comment.pm:286
msgid "marked as not the council's responsibility"
msgstr "ditanda sebagai bukan tanggungjawab majlis"
-#: templates/web/base/report/updates.html:43
+#: perllib/FixMyStreet/DB/Result/Comment.pm:274
msgid "marked as planned"
msgstr "ditanda sebagai dijadual"
-#: templates/web/base/report/updates.html:53
+#: perllib/FixMyStreet/DB/Result/Comment.pm:284
msgid "marked as unable to fix"
msgstr "ditanda sebagai tak boleh dibaiki"
@@ -4309,8 +4381,8 @@ msgstr "pemasukan asal: &ldquo;%s&rdquo;"
msgid "other areas:"
msgstr "kawasan lain:"
-#: templates/web/base/report/updates.html:29
-#: templates/web/base/report/updates.html:39
+#: perllib/FixMyStreet/DB/Result/Comment.pm:263
+#: perllib/FixMyStreet/DB/Result/Comment.pm:269
msgid "reopened"
msgstr "dibuka semula"
@@ -4356,68 +4428,68 @@ msgstr "pengguna adalah pemilik masalah"
msgid "ward"
msgstr "kawasan pentadbiran"
-#: templates/web/base/front/stats.html:13
+#: perllib/Utils.pm:223
#, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> laporan baru-baru ini"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d hari"
-#: perllib/Utils.pm:224
+#: perllib/Utils.pm:225
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d jam"
-#: templates/web/base/report/_support.html:6
-#, perl-format
-msgid "%d supporter"
-msgid_plural "%d supporters"
-msgstr[0] "%d penyokong"
-
-#: perllib/Utils.pm:226
+#: perllib/Utils.pm:227
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minit"
-#: templates/web/base/front/stats.html:25
-#, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
-msgstr[0] "<big>%s</big> laporan dikemaskini"
-
-#: templates/web/base/report/new/top_message_none.html:3
+#: templates/web/base/report/_support.html:6
#, perl-format
-msgid "We do not yet have details for the council that covers this location."
-msgid_plural "We do not yet have details for the councils that cover this location."
-msgstr[0] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d penyokong"
-#: perllib/Utils.pm:220
+#: perllib/Utils.pm:221
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d minggu"
+#: 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"
+msgstr[0] "<big>%s</big> diselesai di bulan lepas"
+
#: 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:19
+#: templates/web/base/front/stats.html:13
#, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] "<big>%s</big> diselesai di bulan lepas"
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> laporan baru-baru ini"
-#: perllib/Utils.pm:222
+#: templates/web/base/front/stats.html:25
#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d hari"
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> laporan dikemaskini"
#: templates/web/base/report/new/top_message_some.html:3
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
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."
+
+#: templates/web/base/report/new/top_message_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"