aboutsummaryrefslogtreecommitdiffstats
path: root/locale/zh.UTF-8/LC_MESSAGES
diff options
context:
space:
mode:
Diffstat (limited to 'locale/zh.UTF-8/LC_MESSAGES')
-rw-r--r--locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po1263
1 files changed, 684 insertions, 579 deletions
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index dd722962d..3feff2f1f 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2020-05-06 13:37+0100\n"
+"POT-Creation-Date: 2020-11-11 16:01+0000\n"
"PO-Revision-Date: 2019-04-29 18:03+0000\n"
"Last-Translator: mySociety <transifex@mysociety.org>, 2019\n"
"Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -20,8 +20,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:714
-#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/DB/Result/Problem.pm:717
+#: perllib/FixMyStreet/DB/Result/Problem.pm:719
#: perllib/FixMyStreet/Queue/Item/Report.pm:194
msgid " and "
msgstr "與"
@@ -56,7 +56,7 @@ msgstr ""
#: templates/web/base/dashboard/heatmap.html:0
#: templates/web/base/dashboard/heatmap.html:9
#: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:31
+#: templates/web/base/reports/body.html:26
msgid "%s - Summary reports"
msgstr "%s -申報總結"
@@ -117,7 +117,7 @@ msgstr "%s 問卷送出 &ndash; % 回覆(%s%%)"
msgid "%s ref:&nbsp;%s"
msgstr "%s 流水號:&nbsp;%s "
-#: perllib/FixMyStreet/Map/OSM.pm:44
+#: perllib/FixMyStreet/Map/OSM.pm:47
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者"
@@ -163,6 +163,8 @@ msgstr ""
msgid "(not sent to council)"
msgstr "不要向地方政府送出"
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
#: templates/web/base/report/new/form_user_loggedin.html:39
#: templates/web/zurich/report/new/fill_in_details_form.html:59
msgid "(optional)"
@@ -181,8 +183,8 @@ msgstr "兩個都送出"
msgid "(we also have RSS feeds for problems within %s)"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:769
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:778
#: templates/web/zurich/admin/bodies/form.html:27
msgid "-- Pick a category --"
msgstr "選擇分類"
@@ -214,17 +216,18 @@ msgstr ""
"可以在你的設定檔加入一些 <code>地圖連結別</code> "
#: templates/web/base/dashboard/index.html:18
+#: templates/web/base/dashboard/status.html:11
msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
msgstr ""
#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/admin/triage/_list-filters.html:23
-#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/admin/triage/_list-filters.html:24
+#: templates/web/base/reports/_list-filters.html:41
msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:104
+#: templates/web/base/js/translation_strings.html:106
msgid "<span>%s</span> saved."
msgstr ""
@@ -254,7 +257,7 @@ msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>是</strong> 我有密碼"
#. ("JS")
-#: templates/web/base/js/translation_strings.html:78
+#: templates/web/base/js/translation_strings.html:80
msgid "<u>Take or choose existing photo</u>"
msgstr ""
@@ -271,7 +274,7 @@ msgid "Access denied"
msgstr ""
#: templates/web/base/auth/2fa/intro.html:20
-#: templates/web/base/auth/generate_token.html:61
+#: templates/web/base/auth/generate_token.html:65
msgid "Activate two-factor authentication"
msgstr ""
@@ -295,7 +298,7 @@ msgstr ""
msgid "Add a contact using the form below."
msgstr "增加聯絡人請使用下方表單"
-#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:140
#, fuzzy
msgid "Add another parent category"
msgstr "新增種類"
@@ -328,7 +331,7 @@ msgstr ""
msgid "Add new category"
msgstr "新增種類"
-#: templates/web/base/admin/extra-metadata-item.html:87
+#: templates/web/base/admin/extra-metadata-item.html:88
msgid "Add option"
msgstr ""
@@ -337,8 +340,8 @@ msgstr ""
msgid "Add phone number"
msgstr ""
-#: templates/web/base/report/_item.html:10
-#: templates/web/base/report/_item.html:16
+#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:27
#: templates/web/base/report/_main.html:149
#: templates/web/base/report/_main.html:25
#: templates/web/base/report/_main.html:36
@@ -346,21 +349,20 @@ msgid "Add to shortlist"
msgstr ""
#: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:95
-#: templates/web/base/admin/users/index.html:98
+#: templates/web/base/admin/users/index.html:101
+#: templates/web/base/admin/users/index.html:104
msgid "Add user"
msgstr "新增使用者"
-#: perllib/FixMyStreet/Cobrand/Default.pm:777
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
+#: perllib/FixMyStreet/Cobrand/Default.pm:793
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:779
+#: perllib/FixMyStreet/Cobrand/Default.pm:795
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:778
+#: perllib/FixMyStreet/Cobrand/Default.pm:794
msgid "Add/edit response templates"
msgstr ""
@@ -376,6 +378,12 @@ msgstr ""
msgid "Admin"
msgstr ""
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/maps/fms.html:5 templates/web/base/maps/osm.html:5
+msgid "Aerial"
+msgstr ""
+
#: templates/web/base/auth/change_password.html:51
msgid "Again:"
msgstr "再一次"
@@ -388,8 +396,8 @@ msgstr "%s創建之 %d通知, 種類 %s, 參數 %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "%d 關閉通知 "
-#: templates/web/base/report/form/user_loggedout_by_email.html:46
-#: templates/web/base/report/update/form_user_loggedin.html:35
+#: templates/web/base/report/form/user_loggedout_by_email.html:69
+#: templates/web/base/report/update/form_user_loggedin.html:38
msgid "Alert me to future updates"
msgstr "通知我此事後續"
@@ -401,10 +409,12 @@ msgstr ""
#: templates/web/base/dashboard/index.html:52
#: templates/web/base/dashboard/index.html:65
#: templates/web/base/reports/_list-filter-status.html:4
+#: templates/web/zurich/header.html:57
#: templates/web/zurich/reports/_list-filter-status.html:2
msgid "All"
msgstr ""
+#: templates/web/zurich/admin/reports/index.html:1
#: templates/web/zurich/reports/index.html:14
msgid "All Reports"
msgstr "所有事件申報"
@@ -444,6 +454,11 @@ msgstr "%s 與 %s 之間申報"
msgid "All time"
msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:81
+#, fuzzy
+msgid "Allow anonymous reports on this category"
+msgstr "%s 種類之申報"
+
#: templates/web/base/report/new/duplicate_suggestions.html:7
msgid "Already been reported?"
msgstr ""
@@ -480,7 +495,7 @@ msgstr "匿名"
msgid "Anonymous user"
msgstr ""
-#: templates/web/base/admin/reports/edit.html:135
+#: templates/web/base/admin/reports/edit.html:148
#: templates/web/base/admin/update_edit.html:23
#: templates/web/base/admin/update_edit.html:96
#: templates/web/base/report/update/moderation_diff.html:5
@@ -493,7 +508,7 @@ msgid "Another user"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:81
msgid "Are you sure you want to cancel this upload?"
msgstr ""
@@ -502,8 +517,8 @@ msgstr ""
#: templates/web/base/admin/reports/edit.html:85
#: templates/web/base/admin/roles/form.html:25
#: templates/web/base/admin/states/index.html:48
-#: templates/web/base/admin/templates/edit.html:88
-#: templates/web/base/js/translation_strings.html:99
+#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/js/translation_strings.html:101
#: templates/web/base/report/display_tools.html:7
msgid "Are you sure?"
msgstr ""
@@ -514,7 +529,7 @@ msgstr ""
msgid "Area covered"
msgstr "涵蓋區域"
-#: templates/web/base/admin/users/form.html:85
+#: templates/web/base/admin/users/form.html:56
msgid "Area:"
msgstr ""
@@ -528,27 +543,32 @@ msgstr "作為一個支援平台 %s出錯,本站所作的申報將送達給
msgid "Assign selected to role:"
msgstr "派給 %s"
-#: templates/web/zurich/admin/reports/edit.html:199
+#: templates/web/zurich/admin/reports/edit.html:203
msgid "Assign to competent body:"
msgstr "分派給適任的機關 "
-#: templates/web/zurich/admin/reports/edit.html:158
+#: templates/web/zurich/admin/reports/edit.html:162
#: templates/web/zurich/admin/stats/index.html:57
msgid "Assign to different category:"
msgstr "歸至其它種類"
-#: templates/web/zurich/admin/reports/edit.html:197
+#: templates/web/zurich/admin/reports/edit.html:201
msgid "Assign to external body:"
msgstr "分派給外部機:"
-#: templates/web/zurich/admin/reports/edit.html:176
+#: templates/web/zurich/admin/reports/edit.html:180
msgid "Assign to subdivision:"
msgstr "交派給下級單位:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:774
+#: perllib/FixMyStreet/Cobrand/Default.pm:790
msgid "Assign users to areas"
msgstr ""
+#: templates/web/base/admin/users/form.html:84
+#, fuzzy
+msgid "Assigned categories only"
+msgstr "派給 %s"
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:185
msgid "Assigned to %s"
msgstr "派給 %s"
@@ -561,7 +581,7 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求,依
msgid "At the moment only searching for and looking at reports work."
msgstr "目前僅提供部份查詢與查閱"
-#: templates/web/base/admin/users/form.html:99
+#: templates/web/base/admin/users/form.html:70
msgid "Authorised staff users can be associated with the categories in which they operate."
msgstr ""
@@ -569,11 +589,11 @@ msgstr ""
msgid "Auto Response"
msgstr ""
-#: templates/web/base/admin/templates/edit.html:77
+#: templates/web/base/admin/templates/edit.html:66
msgid "Auto-response:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:762
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
msgid "Automatically populate report subject/detail"
msgstr ""
@@ -585,12 +605,13 @@ msgstr ""
msgid "Avoid personal information and vehicle number plates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:342
+#: perllib/FixMyStreet/DB/Result/Problem.pm:363
#: templates/web/zurich/report/_item.html:11
msgid "Awaiting moderation"
msgstr "待核可"
#. ("JS")
+#: templates/web/base/dashboard/status.html:17
#: templates/web/base/js/translation_strings.html:45
msgid "Back"
msgstr "回上層"
@@ -611,14 +632,12 @@ msgstr ""
msgid "Behaviour"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/Default.pm:776
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:208
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:792
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
#: templates/web/base/admin/bodies/index.html:1
#: templates/web/base/admin/reports/edit.html:56
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:61
msgid "Bodies"
msgstr "有關單位"
@@ -631,11 +650,13 @@ msgstr "有關單位"
msgid "Body"
msgstr "有關單位"
-#: templates/web/base/admin/users/form.html:53
+#: templates/web/base/admin/users/form.html:24
+#: templates/web/zurich/admin/users/form.html:13
msgid "Body:"
msgstr "有關單位:"
#: templates/web/base/admin/users/import.html:12
+#: templates/web/base/dashboard/status.html:24
msgid "CSV File"
msgstr ""
@@ -647,8 +668,7 @@ msgstr "你的信箱中找不到我們的來信嗎?先檢查看看垃圾回收
msgid "Can't see the map? <em>Skip this step</em>"
msgstr "無法顯示地圖? <em>略過本步驟</em>"
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
#: templates/web/base/admin/responsepriorities/index.html:8
#: templates/web/base/admin/templates/view.html:7
msgid "Categories"
@@ -664,15 +684,13 @@ msgstr ""
#: templates/web/base/admin/bodies/body.html:73
#: templates/web/base/admin/stats/fix_rate.html:4
#: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:16
-#: templates/web/base/report/_item.html:74
+#: templates/web/base/report/_inspect.html:15
+#: templates/web/base/report/_item.html:87
#: templates/web/base/report/new/category.html:23
#: templates/web/base/report/new/category_wrapper.html:3
+#: templates/web/zurich/admin/_index_table.html:5
#: templates/web/zurich/admin/bodies/body.html:14
#: templates/web/zurich/admin/bodies/form.html:25
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
#: templates/web/zurich/admin/stats/index.html:26
#: templates/web/zurich/admin/stats/index.html:71
msgid "Category"
@@ -682,7 +700,7 @@ msgstr "類別"
msgid "Category and State"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:414
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:416
msgid "Category changed from ‘%s’ to ‘%s’"
msgstr ""
@@ -705,6 +723,11 @@ msgstr "類別:"
msgid "Change"
msgstr ""
+#: templates/web/base/report/inspect/information.html:62
+#, fuzzy
+msgid "Change asset"
+msgstr "更換密碼"
+
#: templates/web/base/auth/change_email.html:2
#: templates/web/base/auth/change_email.html:3
msgid "Change email address"
@@ -721,7 +744,7 @@ msgstr "更換密碼"
msgid "Change phone number"
msgstr ""
-#: templates/web/base/auth/generate_token.html:56
+#: templates/web/base/auth/generate_token.html:60
msgid "Change two-factor authentication"
msgstr ""
@@ -731,12 +754,12 @@ msgid ""
" to the body too. These will appear in the drop-down menu on the report-a-problem page."
msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。"
-#: templates/web/base/report/_inspect.html:44
+#: templates/web/base/report/_inspect.html:45
msgid "Choose another"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:98
+#: templates/web/base/js/translation_strings.html:100
msgid "Clear offline data"
msgstr ""
@@ -773,8 +796,8 @@ msgid "Close"
msgstr ""
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:162
#: perllib/FixMyStreet/DB/ResultSet/State.pm:72
#: templates/web/base/admin/states/index.html:103
#: templates/web/base/admin/states/index.html:27
@@ -784,11 +807,7 @@ msgstr ""
msgid "Closed"
msgstr "關閉"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:905
-msgid "Closed by council"
-msgstr "由地方政府關閉"
-
-#: templates/web/base/admin/reports/edit.html:181
+#: templates/web/base/admin/reports/edit.html:194
msgid "Closed to updates"
msgstr ""
@@ -821,13 +840,12 @@ msgid "Code"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:71
msgid "Collapse map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:687
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:402
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr "設定"
@@ -944,7 +962,7 @@ msgstr "創建申報"
msgid "Create an account"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
#: templates/web/zurich/admin/bodies/contact-form.html:51
msgid "Create category"
msgstr "創建類別"
@@ -954,27 +972,25 @@ msgstr "創建類別"
msgid "Create priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:765
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
+#: perllib/FixMyStreet/Cobrand/Default.pm:781
msgid "Create reports/updates as anonymous user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:766
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
+#: perllib/FixMyStreet/Cobrand/Default.pm:782
msgid "Create reports/updates as the council"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:764
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
+#: perllib/FixMyStreet/Cobrand/Default.pm:780
msgid "Create reports/updates on a user's behalf"
msgstr ""
-#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/base/admin/templates/edit.html:73
#: templates/web/zurich/admin/templates/edit.html:32
msgid "Create template"
msgstr "創建模版"
#: templates/web/base/admin/problem_row.html:34
+#: templates/web/base/dashboard/status.html:23
#: templates/web/zurich/admin/templates/view.html:10
msgid "Created"
msgstr "建立"
@@ -983,6 +999,17 @@ msgstr "建立"
msgid "Created %d new users"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:236
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+#, fuzzy
+msgid "Created Body"
+msgstr "建立"
+
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:232
+#, fuzzy
+msgid "Created By"
+msgstr "建立"
+
#: templates/web/base/admin/list_updates.html:39
#: templates/web/base/admin/reports/edit.html:78
#: templates/web/base/admin/update_edit.html:55
@@ -994,10 +1021,6 @@ msgstr "建立:"
msgid "Current password:"
msgstr ""
-#: templates/web/base/auth/generate_token.html:72
-msgid "Current token:"
-msgstr ""
-
#: templates/web/base/dashboard/index.html:93
msgid "Currently grouped by %s"
msgstr ""
@@ -1007,19 +1030,21 @@ msgstr ""
msgid "Currently no bodies have been created."
msgstr "目前未創建內文"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
-#: templates/web/zurich/admin/report_edit-sdm.html:92
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:891
+#: templates/web/zurich/admin/report_edit-sdm.html:98
msgid "Customer not contactable"
msgstr "無法聨絡上的客戶"
#: templates/web/base/dashboard/index.html:8
#: templates/web/base/dashboard/index.html:9
+#: templates/web/base/dashboard/status.html:3
+#: templates/web/base/dashboard/status.html:4
#: templates/web/base/reports/index.html:15
#: templates/web/base/reports/index.html:18
msgid "Dashboard"
msgstr "控制台"
-#: templates/web/base/auth/generate_token.html:58
+#: templates/web/base/auth/generate_token.html:62
msgid "Deactivate two-factor authentication"
msgstr ""
@@ -1031,7 +1056,7 @@ msgstr "下屬單位5個工作天內處理。"
msgid "Default"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:767
+#: perllib/FixMyStreet/Cobrand/Default.pm:783
msgid "Default to creating reports/updates as the council"
msgstr ""
@@ -1041,7 +1066,7 @@ msgid "Delete"
msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
-#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/base/admin/templates/edit.html:77
#: templates/web/zurich/admin/templates/edit.html:36
msgid "Delete template"
msgstr "刪除模版"
@@ -1063,9 +1088,7 @@ msgid "Describe why you are moderating this"
msgstr ""
#: templates/web/base/admin/responsepriorities/index.html:7
-#: templates/web/zurich/admin/index-dm.html:24
-#: templates/web/zurich/admin/index-sdm.html:20
-#: templates/web/zurich/admin/reports/index.html:12
+#: templates/web/zurich/admin/_index_table.html:4
msgid "Description"
msgstr "描述"
@@ -1074,7 +1097,7 @@ msgstr "描述"
msgid "Destination"
msgstr "描述"
-#: perllib/FixMyStreet/App/Controller/Report.pm:442
+#: perllib/FixMyStreet/App/Controller/Report.pm:464
msgid "Detailed information is limited to %d characters."
msgstr ""
@@ -1110,7 +1133,7 @@ msgid "Disable"
msgstr ""
#: templates/web/base/admin/bodies/contact-form.html:58
-#: templates/web/base/admin/extra-metadata-item.html:99
+#: templates/web/base/admin/extra-metadata-item.html:100
msgid "Disable form when this category is selected"
msgstr ""
@@ -1118,6 +1141,16 @@ msgstr ""
msgid "Disable form when this option is selected"
msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:74
+#, fuzzy
+msgid "Disable reopening of reports in this category"
+msgstr "%s 種類之申報"
+
+#: templates/web/base/admin/bodies/contact-form.html:68
+#, fuzzy
+msgid "Disable updates on reports in this category"
+msgstr "%s 種類之申報"
+
#: templates/web/base/admin/users/alerts.html:23
msgid "Disabled:"
msgstr ""
@@ -1152,24 +1185,24 @@ msgstr "不知道"
msgid "Don't like forms?"
msgstr "不喜歡此表單?"
-#: templates/web/base/report/_item.html:27
+#: templates/web/base/report/_item.html:38
msgid "Down one"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:79
msgid "Drag photos here or <u>browse photos</u>"
msgstr ""
-#: templates/web/base/admin/extra-metadata-item.html:70
+#: templates/web/base/admin/extra-metadata-item.html:71
msgid "Drop-down list"
msgstr ""
-#: templates/web/base/report/_inspect.html:39
+#: templates/web/base/report/_inspect.html:40
msgid "Duplicate of"
msgstr ""
-#: templates/web/base/report/_inspect.html:49
+#: templates/web/base/report/_inspect.html:50
msgid "Duplicates"
msgstr ""
@@ -1184,7 +1217,7 @@ msgstr ""
"不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n"
"這表示你可以多加一些類別,即使你只聯絡一位承辦人員。"
-#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/_item.html:78
#: templates/web/base/report/inspect/information.html:22
msgid "Easting/Northing:"
msgstr ""
@@ -1196,7 +1229,7 @@ msgstr ""
#: templates/web/base/admin/roles/index.html:24
#: templates/web/base/admin/templates/view.html:31
#: templates/web/base/admin/users/index.html:67
-#: templates/web/zurich/admin/problem_row.html:49
+#: templates/web/zurich/admin/problem_row.html:52
#: templates/web/zurich/admin/templates/view.html:20
msgid "Edit"
msgstr "編輯"
@@ -1207,12 +1240,11 @@ msgstr "編輯"
msgid "Edit body details"
msgstr "編輯有關單位細節"
-#: perllib/FixMyStreet/Cobrand/Default.pm:772
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
+#: perllib/FixMyStreet/Cobrand/Default.pm:788
msgid "Edit other users' permissions"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:757
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
msgid "Edit report category"
msgstr ""
@@ -1220,17 +1252,15 @@ msgstr ""
msgid "Edit report details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:758
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
msgid "Edit report priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:756
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
msgid "Edit reports"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:771
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
+#: perllib/FixMyStreet/Cobrand/Default.pm:787
msgid "Edit users' details/search for their reports"
msgstr ""
@@ -1267,8 +1297,9 @@ msgstr "編輯器"
#: templates/web/base/admin/users/import.html:24
#: templates/web/base/admin/users/import.html:47
#: templates/web/base/admin/users/index.html:44
-#: templates/web/base/alert/updates.html:21
-#: templates/web/base/report/display_tools.html:50
+#: templates/web/base/alert/updates.html:23
+#: templates/web/base/report/display_tools.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
#: templates/web/base/report/new/duplicate_suggestions.html:33
#: templates/web/zurich/admin/bodies/body.html:15
#: templates/web/zurich/admin/bodies/form.html:9
@@ -1277,15 +1308,14 @@ msgstr "編輯器"
msgid "Email"
msgstr "電子郵件"
-#: templates/web/base/alert/_list.html:69
+#: templates/web/base/alert/_list.html:70
#: templates/web/base/auth/change_email.html:37
#: templates/web/base/report/new/form_user_loggedin.html:39
#: templates/web/base/report/update/form_user_loggedin.html:25
msgid "Email address"
msgstr ""
-#: templates/web/base/report/form/user_loggedout_by_email.html:38
-#: templates/web/base/report/new/form_user_loggedin.html:60
+#: templates/web/base/report/new/form_user_loggedin.html:63
msgid "Email address (optional)"
msgstr ""
@@ -1305,12 +1335,13 @@ msgstr ""
msgid "Email me a link to sign in"
msgstr ""
-#: templates/web/base/admin/users/form.html:28
+#: templates/web/base/admin/users/_form_details.html:21
msgid "Email verified:"
msgstr ""
-#: templates/web/base/admin/reports/edit.html:151
-#: templates/web/base/admin/users/form.html:22 templates/web/base/my/my.html:36
+#: templates/web/base/admin/reports/edit.html:164
+#: templates/web/base/admin/users/_form_details.html:14
+#: templates/web/base/my/my.html:36
#: templates/web/zurich/admin/bodies/contact-form.html:23
msgid "Email:"
msgstr "電子郵件:"
@@ -1378,12 +1409,12 @@ msgstr ""
msgid "Endpoint"
msgstr "結束點"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:85
#, fuzzy
msgid "Enter a Zürich street name"
msgstr "輸入街道名稱 "
-#: perllib/FixMyStreet/Cobrand/UK.pm:22
+#: perllib/FixMyStreet/Cobrand/UK.pm:26
msgid "Enter a nearby UK postcode, or street name and area"
msgstr "輸入本區的郵編,街名或區域。"
@@ -1410,10 +1441,10 @@ msgstr "請在此填寫問題的細節"
msgid "Error"
msgstr "錯誤"
-#: templates/web/base/admin/triage/_list-filters.html:12
+#: templates/web/base/admin/triage/_list-filters.html:13
#: templates/web/base/admin/triage/_list-filters.html:3
-#: templates/web/base/reports/_list-filters.html:16
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filters.html:18
+#: templates/web/base/reports/_list-filters.html:30
msgid "Everything"
msgstr "一切"
@@ -1426,7 +1457,7 @@ msgstr "郵遞區號範例 %s"
msgid "Examples:"
msgstr "範例:"
-#: templates/web/base/admin/report-category.html:10
+#: templates/web/base/admin/report-category.html:8
msgid "Existing category"
msgstr ""
@@ -1435,7 +1466,7 @@ msgid "Existing users won't be modified."
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:70
msgid "Expand map"
msgstr ""
@@ -1460,7 +1491,7 @@ msgid "External body"
msgstr ""
#: templates/web/base/admin/reports/edit.html:112
-#: templates/web/base/admin/templates/edit.html:63
+#: templates/web/base/admin/templates/_external.html:10
msgid "External status code"
msgstr ""
@@ -1472,20 +1503,20 @@ msgstr ""
msgid "External team"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:734
#: templates/web/base/admin/reportextrafields/edit.html:1
#: templates/web/base/admin/reportextrafields/index.html:1
msgid "Extra Fields"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:114
+#: templates/web/base/admin/bodies/contact-form.html:146
#: templates/web/base/admin/reports/edit.html:134
#: templates/web/base/admin/update_edit.html:97
#: templates/web/base/report/update/moderation_diff.html:8
msgid "Extra data:"
msgstr "其它資料:"
-#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/_item.html:99
#: templates/web/base/report/inspect/_extra_details_field.html:2
#: templates/web/base/report/new/category_extras.html:15
msgid "Extra details"
@@ -1518,20 +1549,25 @@ msgid "Fill in your details manually."
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:73
msgid "Filter"
msgstr ""
-#: templates/web/zurich/admin/index-dm.html:35
-#: templates/web/zurich/admin/index-sdm.html:30
-msgid "Filter report list"
-msgstr "過濾初次申報 "
-
#: templates/web/base/questionnaire/creator_fixed.html:16
#: templates/web/base/questionnaire/index.html:68
msgid "First time"
msgstr "首次"
+#: templates/web/base/dashboard/heatmap-list.html:4
+#, fuzzy
+msgid "Five most recent commented reports"
+msgstr "最近申報之照片"
+
+#: templates/web/base/dashboard/heatmap-list.html:1
+#, fuzzy
+msgid "Five newest reports"
+msgstr "新的申報 "
+
#: templates/web/base/admin/bodies/body.html:53
msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。"
@@ -1561,7 +1597,7 @@ msgstr "標記警告為刪除 "
msgid "Flag user"
msgstr "標記警告用戶"
-#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
#: templates/web/base/admin/users/index.html:47
msgid "Flagged"
msgstr "標記警告"
@@ -1570,7 +1606,7 @@ msgstr "標記警告"
msgid "Flagged reports and users"
msgstr "標記警告申報與用戶"
-#: templates/web/base/admin/users/form.html:110
+#: templates/web/base/admin/users/form.html:95
msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
@@ -1578,8 +1614,8 @@ msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
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/reports/edit.html:155
-#: templates/web/base/admin/users/form.html:117
+#: templates/web/base/admin/reports/edit.html:168
+#: templates/web/base/admin/users/form.html:102
msgid "Flagged:"
msgstr "警告:"
@@ -1605,11 +1641,11 @@ msgstr ""
msgid "Forgotten your password?"
msgstr "忘記您的密碼?"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:812
msgid "Forwarded to external body"
msgstr "轉寄給外部機構"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:813
msgid "Forwarded wish to external body"
msgstr "轉寄願望給外部機構"
@@ -1619,12 +1655,20 @@ msgstr "轉寄願望給外部機構"
msgid "Frequently Asked Questions"
msgstr "常見問題回覆 "
+#: templates/web/base/dashboard/heatmap.html:29
+msgid "From"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:101
+msgid "Frontend staff access only to users assigned to this category"
+msgstr ""
+
#: templates/web/base/contact/enquiry/index.html:1
#: templates/web/base/contact/enquiry/index.html:3
msgid "General Enquiry"
msgstr ""
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/auth/generate_token.html:75
msgid "Generate token"
msgstr ""
@@ -1646,7 +1690,7 @@ msgstr "取得 %s問題之更新"
msgid "Get updates of problems in this %s"
msgstr "取得 %s區域內的問題更新"
-#: templates/web/base/alert/_list.html:80
+#: templates/web/base/alert/_list.html:81
msgid "Give me an RSS feed"
msgstr "我要訂閱RSS"
@@ -1662,15 +1706,15 @@ msgstr "很高興聽到問題已處理了。"
#: templates/web/base/admin/index.html:37
#: templates/web/base/admin/index.html:54
#: templates/web/base/admin/responsepriorities/index.html:48
-#: templates/web/base/admin/triage/_list-filters.html:24
-#: templates/web/base/admin/triage/_list-filters.html:39
-#: templates/web/base/admin/triage/_list-filters.html:45
+#: templates/web/base/admin/triage/_list-filters.html:25
+#: templates/web/base/admin/triage/_list-filters.html:40
+#: templates/web/base/admin/triage/_list-filters.html:46
#: templates/web/base/admin/users/index.html:32
#: templates/web/base/around/_postcode_submit_button.html:2
#: templates/web/base/around/_postcode_submit_button.html:5
#: templates/web/base/reports/_list-filters-sort.html:13
-#: templates/web/base/reports/_list-filters.html:40
-#: templates/web/base/reports/_list-filters.html:49
+#: templates/web/base/reports/_list-filters.html:42
+#: templates/web/base/reports/_list-filters.html:51
#: templates/web/base/reports/index.html:89
#: templates/web/zurich/admin/stats/index.html:37
msgid "Go"
@@ -1680,7 +1724,7 @@ msgstr "走"
msgid "Going to send questionnaire?"
msgstr "即將送出問卷?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:773
+#: perllib/FixMyStreet/Cobrand/Default.pm:789
msgid "Grant access to the admin"
msgstr ""
@@ -1706,6 +1750,7 @@ msgstr "您之前是否曾向地方政府申報過問題?或者此為您的首
#: templates/web/base/admin/stats/index.html:17
#: templates/web/base/admin/stats/index.html:23
+#: templates/web/base/dashboard/heatmap.html:44
msgid "Heatmap"
msgstr ""
@@ -1740,7 +1785,8 @@ msgstr "隱藏"
msgid "Hidden data in reporting form"
msgstr ""
-#: templates/web/base/admin/users/form.html:196
+#: templates/web/base/admin/users/form.html:181
+#: templates/web/zurich/admin/users/form.html:38
msgid "Hide all reports and updates"
msgstr ""
@@ -1768,7 +1814,7 @@ msgstr ""
#. ("JS")
#: templates/web/base/around/display_location.html:65
#: templates/web/base/around/display_location.html:73
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:76
msgid "Hide pins"
msgstr "隱藏地圖標示"
@@ -1822,11 +1868,9 @@ msgstr " 我們無法在資料庫中找到您的問題。\n"
#: templates/web/base/admin/list_updates.html:6
#: templates/web/base/admin/reports/index.html:12
#: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/_index_table.html:3
#: templates/web/zurich/admin/list_updates.html:24
#: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports/index.html:11
msgid "ID"
msgstr "帳戶"
@@ -1847,15 +1891,15 @@ msgstr ""
msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
msgstr ""
-#: templates/web/base/admin/extra-metadata-item.html:100
+#: templates/web/base/admin/extra-metadata-item.html:101
msgid "If ticked, the form will be disabled and this item’s notice text will be displayed."
msgstr ""
-#: templates/web/base/admin/extra-metadata-item.html:106
+#: templates/web/base/admin/extra-metadata-item.html:107
msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
msgstr ""
-#: templates/web/base/admin/templates/edit.html:72
+#: templates/web/base/admin/templates/edit.html:61
msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
msgstr ""
@@ -1872,7 +1916,7 @@ msgstr ""
msgid "If you are contacting us about a specific report or update please include a link to the report in the message."
msgstr ""
-#: templates/web/base/auth/generate_token.html:83
+#: templates/web/base/auth/generate_token.html:80
msgid "If you generate a new token the existing token will no longer work."
msgstr ""
@@ -1896,7 +1940,7 @@ msgstr ""
msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
msgstr ""
-#: templates/web/base/admin/templates/edit.html:59
+#: templates/web/base/admin/templates/_external.html:6
msgid "If you want to use this template to prefill the update field when a report&rsquo;s <strong>external</strong> (e.g. Confirm) status code changes, enter the status code here."
msgstr ""
@@ -1935,7 +1979,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/bodies/contact-form.html:157
msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
msgstr ""
@@ -1959,6 +2003,17 @@ msgstr "濫用表格?"
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 "此外,下列理由並非為Open311 v2更新特定部份回覆傳送: agency_sent_datetime, 主旨(部份回覆之敍述), interface_used, comment_count, requestor_name (只有在同意姓名公開下才會呈現)."
+#. ("JS")
+#: templates/web/base/dashboard/status.html:37
+#: templates/web/base/dashboard/status.html:53
+msgid "In progress"
+msgstr ""
+
+#: templates/web/base/dashboard/heatmap.html:33
+#, fuzzy
+msgid "In wards"
+msgstr "路檔"
+
#: templates/web/base/admin/bodies/contact-form.html:35
#: templates/web/zurich/admin/bodies/contact-form.html:40
msgid "Inactive"
@@ -1968,20 +2023,20 @@ msgstr ""
msgid "Inbox zero, here we come!"
msgstr "信箱已閱畢!"
-#: templates/web/zurich/admin/reports/edit.html:213
+#: templates/web/zurich/admin/reports/edit.html:217
msgid "Include reporter personal details"
msgstr "包括申報人的個人細節"
-#: perllib/FixMyStreet/App/Controller/Open311.pm:348
+#: perllib/FixMyStreet/App/Controller/Open311.pm:334
msgid "Incorrect has_photo value \"%s\""
msgstr "不正確的照片值數 \"%s\""
-#: templates/web/base/admin/triage/_inspect.html:31
-#: templates/web/base/report/_inspect.html:5
+#: templates/web/base/admin/triage/_inspect.html:30
+#: templates/web/base/report/_inspect.html:4
msgid "Inspect report"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:761
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
msgid "Instruct contractors to fix problems"
msgstr ""
@@ -1998,16 +2053,12 @@ msgstr "內部筆記"
msgid "Internal notes"
msgstr "內部筆記"
-#: perllib/FixMyStreet/App/Controller/Open311.pm:333
-msgid "Invalid agency_responsible value %s"
-msgstr "無效的權責單位數值 %s"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:435
msgid "Invalid format %s specified."
msgstr "無效的%s 特定格式"
#: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:504
+#: perllib/FixMyStreet/App/Controller/Report.pm:534
msgid "Invalid location. New location must be covered by the same council."
msgstr ""
@@ -2059,13 +2110,13 @@ msgstr "上回更新:"
msgid "Last&nbsp;update:"
msgstr "上一次更新:"
-#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/_item.html:83
#: templates/web/base/report/inspect/information.html:26
#: templates/web/base/report/update/moderation_diff.html:6
msgid "Latitude/Longitude:"
msgstr ""
-#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/admin/triage/_list-filters.html:37
#: templates/web/base/reports/_list-filters-sort.html:10
msgid "Least recently updated"
msgstr ""
@@ -2082,7 +2133,7 @@ msgstr "列出所有申報的問題 "
msgid "Loading reports…"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1556
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1606
#: templates/web/base/report/new/category_wrapper.html:9
msgid "Loading..."
msgstr "載入中...."
@@ -2120,17 +2171,18 @@ msgid "Log in with Twitter"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/js/translation_strings.html:87
#: templates/web/base/report/form/user.html:27
msgid "Log in with email"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:83
+#: templates/web/base/js/translation_strings.html:85
msgid "Log in with email/text"
msgstr ""
-#: templates/web/base/admin/users/form.html:194
+#: templates/web/base/admin/users/form.html:179
+#: templates/web/zurich/admin/users/form.html:36
msgid "Log out of all sessions"
msgstr ""
@@ -2148,19 +2200,20 @@ msgstr ""
msgid "MAP"
msgstr "地圖"
-#: templates/web/base/admin/users/form.html:195
+#: templates/web/base/admin/users/form.html:180
+#: templates/web/zurich/admin/users/form.html:37
msgid "Make anonymous on all reports and updates"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:763
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
msgid "Manage shortlist"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:688
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
msgid "Manifest Theme"
msgstr ""
-#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/admin/triage/_list-filters.html:32
#: templates/web/base/reports/_list-filters-sort.html:5
msgid "Manual order"
msgstr ""
@@ -2174,24 +2227,24 @@ msgstr "地圖"
msgid "Mark as sent"
msgstr "標註為關閉"
-#: templates/web/base/admin/users/form.html:108
+#: templates/web/base/admin/users/form.html:93
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>."
-#: perllib/FixMyStreet/Cobrand/Default.pm:760
+#: perllib/FixMyStreet/Cobrand/Default.pm:776
msgid "Markup problem details"
msgstr ""
-#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/enquiry/index.html:42
#: templates/web/base/contact/index.html:109
msgid "Message"
msgstr "留言"
-#: templates/web/zurich/admin/reports/edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:273
msgid "Message to competent body:"
msgstr "給適任單位的訊息"
-#: templates/web/zurich/admin/reports/edit.html:267
+#: templates/web/zurich/admin/reports/edit.html:271
msgid "Message to external body:"
msgstr "給外部機構的訊息"
@@ -2204,7 +2257,7 @@ msgstr ""
msgid "Missing bodies:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:451
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
msgid "Missing jurisdiction_id"
msgstr "遺失 jurisdiction_id"
@@ -2212,8 +2265,7 @@ msgstr "遺失 jurisdiction_id"
msgid "Moderate"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:755
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
msgid "Moderate report details"
msgstr ""
@@ -2236,7 +2288,7 @@ msgstr ""
msgid "Moderated by division within one working day"
msgstr "一個工作天內協調出部門"
-#: templates/web/base/admin/reports/edit.html:193
+#: templates/web/base/admin/reports/edit.html:206
#: templates/web/base/admin/update_edit.html:86
msgid "Moderation history"
msgstr ""
@@ -2246,14 +2298,14 @@ msgstr ""
msgid "Month"
msgstr "月份"
-#: templates/web/base/admin/triage/_list-filters.html:37
+#: templates/web/base/admin/triage/_list-filters.html:38
#: templates/web/base/reports/_list-filters-sort.html:11
msgid "Most commented"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:696
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:707
+#: perllib/FixMyStreet/App/Controller/Report.pm:724
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:735
#: templates/web/base/admin/category-checkboxes.html:32
msgid "Multiple Groups"
msgstr ""
@@ -2281,9 +2333,10 @@ msgstr ""
msgid "Name"
msgstr "名字"
-#: templates/web/base/admin/reports/edit.html:140
+#: templates/web/base/admin/reports/edit.html:153
#: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/_form_details.html:10
+#: templates/web/base/my/my.html:35
#: templates/web/zurich/admin/stats/index.html:62
msgid "Name:"
msgstr "名字:"
@@ -2301,7 +2354,7 @@ msgstr ""
msgid "Nearest calculated address:"
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:154
+#: perllib/FixMyStreet/Geocode/OSM.pm:155
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産生): %s%s"
@@ -2309,12 +2362,12 @@ msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:607
+#: perllib/FixMyStreet/Cobrand/Default.pm:623
#: perllib/FixMyStreet/Geocode/Address.pm:17
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s"
-#: perllib/FixMyStreet/Script/Alerts.pm:358
+#: perllib/FixMyStreet/Script/Alerts.pm:363
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -2339,7 +2392,7 @@ msgstr ""
msgid "New body added"
msgstr "新增內文"
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:321
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:334
msgid "New category contact added"
msgstr "新增類別承辦 人"
@@ -2352,8 +2405,8 @@ msgstr ""
msgid "New field"
msgstr ""
-#: templates/web/zurich/admin/report_edit-sdm.html:96
-#: templates/web/zurich/admin/reports/edit.html:125
+#: templates/web/zurich/admin/report_edit-sdm.html:102
+#: templates/web/zurich/admin/reports/edit.html:129
msgid "New internal note:"
msgstr "新內部筆記"
@@ -2361,13 +2414,13 @@ msgstr "新內部筆記"
msgid "New local problems on FixMyStreet"
msgstr "FixMyStreet之新近當地問題 "
-#: templates/web/zurich/admin/report_edit-sdm.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:106
msgid "New note to DM:"
msgstr ""
#: templates/web/base/auth/change_password.html:47
#: templates/web/base/auth/create.html:64
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:73
msgid "New password:"
msgstr ""
@@ -2444,7 +2497,7 @@ msgstr "新模版"
msgid "New updates on report <a href=\"%s\">%s</a>"
msgstr ""
-#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/admin/triage/_list-filters.html:34
#: templates/web/base/reports/_list-filters-sort.html:7
msgid "Newest"
msgstr ""
@@ -2457,7 +2510,6 @@ msgstr "下一步"
msgid "Next:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:1262
#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
#: templates/web/base/admin/bodies/category.html:5
@@ -2466,11 +2518,11 @@ msgstr ""
#: templates/web/base/admin/list_updates.html:36
#: templates/web/base/admin/problem_row.html:20
#: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:138
+#: templates/web/base/admin/reports/edit.html:151
#: templates/web/base/admin/update_edit.html:26
#: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:108
#: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:85
msgid "No"
msgstr "無"
@@ -2482,11 +2534,12 @@ msgstr ""
msgid "No account?"
msgstr ""
-#: templates/web/base/admin/users/form.html:55
+#: templates/web/base/admin/users/form.html:26
+#: templates/web/zurich/admin/users/form.html:15
msgid "No body"
msgstr "無有關單位"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
msgid "No council selected"
msgstr "未選擇地方政府"
@@ -2502,8 +2555,8 @@ msgstr "未發現標記警告問題 "
msgid "No flagged users found."
msgstr "未發現標記警告用戶"
-#: templates/web/zurich/admin/report_edit-sdm.html:112
-#: templates/web/zurich/admin/reports/edit.html:248
+#: templates/web/zurich/admin/report_edit-sdm.html:118
+#: templates/web/zurich/admin/reports/edit.html:252
msgid "No further updates"
msgstr "尚無更新"
@@ -2541,15 +2594,15 @@ msgstr "無支援"
msgid "None"
msgstr "沒有"
-#: templates/web/base/admin/users/form.html:79
-#: templates/web/base/admin/users/form.html:80
+#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:51
msgid ""
"Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
" Authorised staff users can be associated with the area in which they operate."
msgstr ""
-#: templates/web/base/admin/users/form.html:45
-#: templates/web/base/admin/users/form.html:46
+#: templates/web/base/admin/users/form.html:16
+#: templates/web/base/admin/users/form.html:17
msgid ""
"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
" Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2561,10 +2614,14 @@ msgstr ""
"這要看具體落實執行狀況,工作人員可能有權使用控制台(其關構下的\n"
"所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。"
-#: templates/web/zurich/admin/report_edit-sdm.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:94
msgid "Not for my subdivision"
msgstr "非下屬單位"
+#: templates/web/base/dashboard/heatmap-list.html:5
+msgid "Not from yourself/backend"
+msgstr ""
+
#: templates/web/base/admin/stats/questionnaire.html:6
msgid "Not reported before"
msgstr "之前未申報過"
@@ -2612,12 +2669,12 @@ msgid "Offline"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/js/translation_strings.html:102
msgid "Offline data cleared"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:97
+#: templates/web/base/js/translation_strings.html:99
msgid "Offline update data saved"
msgstr ""
@@ -2625,12 +2682,12 @@ msgstr ""
msgid "Old state"
msgstr "舊陳述"
-#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/admin/triage/_list-filters.html:35
#: templates/web/base/reports/_list-filters-sort.html:8
msgid "Oldest"
msgstr ""
-#: perllib/FixMyStreet/SendReport/Email.pm:98
+#: perllib/FixMyStreet/SendReport/Email.pm:96
msgid "On behalf of %s"
msgstr ""
@@ -2639,7 +2696,7 @@ msgid "Only staff users will be able to add reports in this category."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:157
#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
#: templates/web/base/admin/states/index.html:102
#: templates/web/base/admin/states/index.html:25
@@ -2670,7 +2727,7 @@ msgstr "Open311 啟動網頁"
msgid "Open311 specification"
msgstr "Open311 規範 "
-#: templates/web/base/admin/extra-metadata-item.html:75
+#: templates/web/base/admin/extra-metadata-item.html:76
msgid "Options"
msgstr ""
@@ -2682,7 +2739,7 @@ msgstr ""
msgid "Or sign in with password to prefill this information."
msgstr ""
-#: templates/web/base/alert/_list.html:79
+#: templates/web/base/alert/_list.html:80
msgid "Or subscribe by RSS"
msgstr ""
@@ -2690,16 +2747,16 @@ msgstr ""
msgid "Order"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:99
-#: perllib/FixMyStreet/App/Controller/Report.pm:703
-#: perllib/FixMyStreet/App/Controller/Report.pm:706
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1427
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:770
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:771
-#: perllib/FixMyStreet/DB/Result/Problem.pm:641
-#: perllib/FixMyStreet/DB/Result/Problem.pm:648
-#: perllib/FixMyStreet/DB/Result/Problem.pm:663
-#: perllib/FixMyStreet/DB/Result/Problem.pm:672
+#: perllib/FixMyStreet/App/Controller/Admin/Triage.pm:97
+#: perllib/FixMyStreet/App/Controller/Report.pm:731
+#: perllib/FixMyStreet/App/Controller/Report.pm:734
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1477
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:779
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:780
+#: perllib/FixMyStreet/DB/Result/Problem.pm:644
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+#: perllib/FixMyStreet/DB/Result/Problem.pm:675
#: perllib/FixMyStreet/Queue/Item/Report.pm:132
#: perllib/FixMyStreet/Queue/Item/Report.pm:195
msgid "Other"
@@ -2731,7 +2788,7 @@ msgstr "找無此頁"
msgid "Parent"
msgstr "上級 "
-#: templates/web/base/admin/bodies/contact-form.html:98
+#: templates/web/base/admin/bodies/contact-form.html:130
#, fuzzy
msgid "Parent categories"
msgstr "創建類別"
@@ -2740,13 +2797,13 @@ msgstr "創建類別"
msgid "Partial"
msgstr "部份"
-#: templates/web/base/report/form/user_loggedout_by_email.html:51
+#: templates/web/base/report/form/user_loggedout_by_email.html:74
#: templates/web/zurich/auth/general.html:20
#: templates/web/zurich/auth/general.html:46
msgid "Password (optional)"
msgstr "密碼(任選):"
-#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:259
#, fuzzy
msgid "Password change cancelled."
msgstr "密碼已更新"
@@ -2761,7 +2818,7 @@ msgstr "密碼(任選):"
msgid "Permissions"
msgstr "永久連結"
-#: templates/web/base/admin/users/form.html:159
+#: templates/web/base/admin/users/form.html:144
msgid "Permissions:"
msgstr ""
@@ -2769,19 +2826,24 @@ msgstr ""
msgid "Permit blank updates"
msgstr ""
+#: templates/web/base/report/form/user_loggedout_by_email.html:42
+#, fuzzy
+msgid "Phone"
+msgstr "電話"
+
#: templates/web/base/report/inspect/information.html:15
msgid "Phone Reporter:"
msgstr ""
#: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/form/user_loggedout_by_email.html:56
#: templates/web/base/report/new/form_user_loggedin.html:34
#: templates/web/zurich/report/new/fill_in_details_form.html:65
msgid "Phone number"
msgstr "電話號碼"
-#: templates/web/base/report/form/user_loggedout_by_email.html:13
-#: templates/web/base/report/form/user_loggedout_by_email.html:33
-#: templates/web/base/report/new/form_user_loggedin.html:53
+#: templates/web/base/report/form/user_loggedout_by_email.html:12
+#: templates/web/base/report/new/form_user_loggedin.html:56
msgid "Phone number (optional)"
msgstr "電話號碼(非必填)"
@@ -2789,30 +2851,26 @@ msgstr "電話號碼(非必填)"
msgid "Phone numbers are limited to %s characters in length."
msgstr ""
-#: templates/web/base/admin/users/form.html:32
+#: templates/web/base/admin/users/_form_details.html:26
msgid "Phone verified:"
msgstr ""
-#: templates/web/base/admin/reports/edit.html:148
-#: templates/web/base/admin/users/form.html:30 templates/web/base/my/my.html:47
+#: templates/web/base/admin/reports/edit.html:161
+#: templates/web/base/admin/users/_form_details.html:24
+#: templates/web/base/my/my.html:47
#: templates/web/zurich/admin/stats/index.html:60
msgid "Phone:"
msgstr "電話"
#: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:80
-#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/report/form/photo_upload.html:19
+#: templates/web/base/report/form/photo_upload.html:21
+#: templates/web/base/report/form/photo_upload.html:4
#: templates/web/base/report/new/form_report.html:41
#: templates/web/base/report/new/form_report.html:56
#: templates/web/base/report/new/form_report.html:58
-#: templates/web/base/report/update/form_update.html:22
-#: templates/web/base/report/update/form_update.html:24
-#: templates/web/base/report/update/form_update.html:7
#: templates/web/base/report/update/moderation_diff.html:4
-#: templates/web/zurich/admin/index-dm.html:31
-#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports/index.html:16
+#: templates/web/zurich/admin/_index_table.html:11
#: templates/web/zurich/admin/stats/index.html:58
#: templates/web/zurich/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:36
@@ -2832,9 +2890,8 @@ msgstr "要求提供照片"
msgid "Photo upload failed."
msgstr ""
-#: templates/web/base/questionnaire/index.html:80
+#: templates/web/base/report/form/photo_upload.html:4
#: templates/web/base/report/new/form_report.html:41
-#: templates/web/base/report/update/form_update.html:7
#: templates/web/zurich/report/new/fill_in_details_form.html:20
msgid "Photos"
msgstr ""
@@ -2843,7 +2900,7 @@ msgstr ""
msgid "Photos of recent nearby reports"
msgstr "最近申報之照片"
-#: templates/web/base/contact/enquiry/index.html:49
+#: templates/web/base/contact/enquiry/index.html:50
msgid "Photos/Documents"
msgstr ""
@@ -2857,6 +2914,11 @@ msgstr ""
msgid "Pick your ward"
msgstr ""
+#: templates/web/base/dashboard/heatmap.html:46
+#, fuzzy
+msgid "Pin map"
+msgstr "在地圖上作標記"
+
#. ("JS")
#: templates/web/base/around/display_location.html:79
#: templates/web/base/js/translation_strings.html:44
@@ -2884,27 +2946,26 @@ msgid "Please check your email address is correct"
msgstr "請確認您電郵地址無誤"
#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
-#: perllib/FixMyStreet/DB/Result/User.pm:263
-#: perllib/FixMyStreet/DB/Result/User.pm:264
+#: perllib/FixMyStreet/DB/Result/User.pm:268
+#: perllib/FixMyStreet/DB/Result/User.pm:269
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:7
msgid "Please check your phone number is correct"
msgstr ""
#. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1034
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1077
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:231
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1068
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1111
#: templates/web/base/js/translation_strings.html:21
msgid "Please choose a category"
msgstr "請選擇類別"
-#: perllib/FixMyStreet/App/Controller/Auth.pm:471
#: perllib/FixMyStreet/App/Controller/Auth.pm:497
msgid "Please choose a less commonly-used password"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:312
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:325
#: templates/web/base/admin/bodies/body.html:12
#: templates/web/base/admin/bodies/index.html:4
#: templates/web/base/admin/templates/edit.html:13
@@ -2926,27 +2987,27 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
msgstr "請勿濫用本服務,濫用將造成您的政府輕視其它使用者之意見 "
#. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:298
-#: perllib/FixMyStreet/DB/Result/Comment.pm:143
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:311
+#: perllib/FixMyStreet/DB/Result/Comment.pm:198
#: templates/web/base/js/translation_strings.html:6
msgid "Please enter a message"
msgstr "請寫下您的留言"
#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
-#: perllib/FixMyStreet/DB/Result/User.pm:266
-#: perllib/FixMyStreet/DB/Result/User.pm:267
+#: perllib/FixMyStreet/DB/Result/User.pm:271
+#: perllib/FixMyStreet/DB/Result/User.pm:272
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:4
msgid "Please enter a mobile number"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:130
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:265
msgid "Please enter a name"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:436
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:449
msgid "Please enter a name for this body"
msgstr ""
@@ -2959,16 +3020,16 @@ msgstr "請輸入密碼"
#. ("JS")
#: perllib/FixMyStreet/App/Controller/Contact.pm:147
-#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: perllib/FixMyStreet/DB/Result/Problem.pm:386
#: templates/web/base/js/translation_strings.html:9
msgid "Please enter a subject"
msgstr "請填下主旨"
#. ("JS")
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:255
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:132
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:261
-#: perllib/FixMyStreet/DB/Result/User.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:264
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:127
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:256
+#: perllib/FixMyStreet/DB/Result/User.pm:261
#: templates/web/base/js/translation_strings.html:24
#: templates/web/base/js/translation_strings.html:28
msgid "Please enter a valid email"
@@ -2979,20 +3040,20 @@ msgstr "請輸入有效電子郵件"
msgid "Please enter a valid email address"
msgstr "請輸入有效的電子郵件"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:134
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:250
msgid "Please enter a valid email or phone number"
msgstr ""
#. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: perllib/FixMyStreet/DB/Result/Problem.pm:392
#: templates/web/base/js/translation_strings.html:14
msgid "Please enter some details"
msgstr "請填寫進一步細節"
#. ("JS")
#: perllib/FixMyStreet/App/Controller/Contact.pm:146
-#: perllib/FixMyStreet/DB/Result/User.pm:254
+#: perllib/FixMyStreet/DB/Result/User.pm:259
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:8
#: templates/web/base/auth/change_email.html:24
@@ -3008,7 +3069,7 @@ msgid "Please enter your first name"
msgstr "請輸入您的大名"
#. ("JS")
-#: perllib/FixMyStreet/Cobrand/UK.pm:337
+#: perllib/FixMyStreet/Cobrand/UK.pm:341
#: templates/web/base/js/translation_strings.html:19
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "請輸入您的全名,地方政府需要此資料 – 如果您不希望名字公開在網站上,請在下面方格中劃掉勾選。"
@@ -3020,9 +3081,9 @@ msgstr "請輸入您的姓氐"
#. ("JS")
#: perllib/FixMyStreet/App/Controller/Contact.pm:145
-#: perllib/FixMyStreet/DB/Result/Comment.pm:140
-#: perllib/FixMyStreet/DB/Result/Problem.pm:379
-#: perllib/FixMyStreet/DB/Result/User.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:195
+#: perllib/FixMyStreet/DB/Result/Problem.pm:400
+#: perllib/FixMyStreet/DB/Result/User.pm:254
#: templates/web/base/js/translation_strings.html:18
msgid "Please enter your name"
msgstr "請輸入您的姓氐"
@@ -3063,19 +3124,19 @@ msgstr "請利用下方表單填寫問題細節,在細節項請儘量述明準
msgid "Please generate a two-factor code and enter it below:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "請選擇您是否願意收到其它問卷"
#. ("JS")
-#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: perllib/FixMyStreet/DB/Result/Problem.pm:389
#: templates/web/base/js/translation_strings.html:11
#, fuzzy
msgid "Please make sure you are not including an email address"
msgstr "請輸入有效的電子郵件"
#. ("JS")
-#: perllib/FixMyStreet/App/Controller/Auth.pm:494
+#: perllib/FixMyStreet/App/Controller/Auth.pm:495
#: templates/web/base/js/translation_strings.html:34
msgid "Please make sure your password is at least %d characters long"
msgstr ""
@@ -3102,24 +3163,28 @@ msgstr ""
msgid "Please note:"
msgstr "請加註記"
-#: perllib/FixMyStreet/App/Controller/Report.pm:471
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:912
+msgid "Please pick your update preference"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:493
msgid "Please provide a duplicate ID or public update for this report."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:453
+#: perllib/FixMyStreet/App/Controller/Report.pm:475
msgid "Please provide a public update for this report."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:256
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252
msgid "Please provide some explanation as to why you're reopening this report"
msgstr "如果您是再次申報,請說明原因"
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:263
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:259
msgid "Please provide some text as well as a photo"
msgstr "請提供一些文字敍述與照片"
#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:114
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
msgid "Please say whether you've ever reported a problem to your council before"
msgstr "請敍明您是否曾向地方政府申報過問題? "
@@ -3127,7 +3192,7 @@ msgstr "請敍明您是否曾向地方政府申報過問題? "
msgid "Please scan this image with your app, or enter the text code into your app, then generate a new one-time code and enter it below:"
msgstr ""
-#: templates/web/zurich/admin/reports/edit.html:194
+#: templates/web/zurich/admin/reports/edit.html:198
msgid "Please select a body."
msgstr "請選擇單位"
@@ -3139,7 +3204,7 @@ msgstr "請選擇訂閱方式"
msgid "Please select the type of alert you want"
msgstr "請選擇更新通知方式"
-#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:241
msgid "Please state whether or not the problem has been fixed"
msgstr "請敍明該問題是否已解決"
@@ -3147,12 +3212,12 @@ msgstr "請敍明該問題是否已解決"
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:119
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:138
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:140
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:82
msgid "Please upload an image only"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:137
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:253
msgid "Please verify at least one of email/phone"
msgstr ""
@@ -3160,27 +3225,23 @@ msgstr ""
msgid "Please write a message"
msgstr "諘寫下您的留言"
-#: templates/web/base/report/update/form_user_loggedin.html:38
-msgid "Post"
-msgstr "張貼"
-
#: templates/web/base/alert/index.html:11
msgid "Postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:215
+#: perllib/FixMyStreet/DB/Result/Comment.pm:276
msgid "Posted anonymously at %s"
msgstr "匿名張貼 %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:257
+#: perllib/FixMyStreet/DB/Result/Comment.pm:318
msgid "Posted by %s at %s"
msgstr "由 %s 在 %s 張貼"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:306
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr "由<strong>%s</strong> (%s) 在%s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:247
+#: perllib/FixMyStreet/DB/Result/Comment.pm:308
msgid "Posted by <strong>%s</strong> at %s"
msgstr "由<strong>%s</strong> 在%s"
@@ -3196,7 +3257,7 @@ msgstr ""
msgid "Prevent new reports from using this category, but keep it available in map filters."
msgstr ""
-#: templates/web/base/admin/extra-metadata-item.html:94
+#: templates/web/base/admin/extra-metadata-item.html:95
msgid "Prevent user from submitting the form until this field is filled in."
msgstr ""
@@ -3204,11 +3265,11 @@ msgstr ""
msgid "Previous"
msgstr "之前"
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:724
msgid "Priorities"
msgstr ""
-#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/_item.html:95
#: templates/web/base/report/inspect/extra_details.html:2
msgid "Priority"
msgstr ""
@@ -3224,9 +3285,9 @@ msgid "Privacy and cookies"
msgstr "隱私與cookies"
#: templates/web/base/admin/bodies/body.html:90
-#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/admin/reports/edit.html:170
#: templates/web/base/report/inspect/information.html:3
-#: templates/web/base/report/new/form_user_loggedin.html:69
+#: templates/web/base/report/new/form_user_loggedin.html:73
msgid "Private"
msgstr "私人"
@@ -3275,7 +3336,7 @@ msgstr "%s 問題已送達到地方政府 %s "
msgid "Problem breakdown by state"
msgstr "本站出現故障問題 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:244
+#: perllib/FixMyStreet/App/Controller/Admin.pm:247
msgid "Problem marked as open."
msgstr "問題標註為開放"
@@ -3283,8 +3344,7 @@ msgstr "問題標註為開放"
msgid "Problem state change based on survey results"
msgstr "依調查結果呈現的問題改善"
-#: perllib/FixMyStreet/Cobrand/Default.pm:754
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
+#: perllib/FixMyStreet/Cobrand/Default.pm:770
#: templates/web/base/admin/flagged.html:10
msgid "Problems"
msgstr "問題"
@@ -3309,18 +3369,18 @@ msgstr "FixMyStreet 最近回報的已修復問題 "
msgid "Problems within %.1fkm of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:905
+#: perllib/FixMyStreet/Cobrand/Default.pm:921
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:220 perllib/FixMyStreet/Cobrand/UK.pm:265
-#: perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:224 perllib/FixMyStreet/Cobrand/UK.pm:269
+#: perllib/FixMyStreet/Cobrand/UK.pm:281
msgid "Problems within %s"
msgstr "在 %s 內的問題"
-#: perllib/FixMyStreet/Cobrand/UK.pm:234
+#: perllib/FixMyStreet/Cobrand/UK.pm:238
msgid "Problems within %s ward"
msgstr "在 %s 里/區的問題"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:275 perllib/FixMyStreet/Cobrand/UK.pm:287
msgid "Problems within %s ward, %s"
msgstr ""
@@ -3328,7 +3388,7 @@ msgstr ""
#: templates/web/base/admin/triage/index.html:0
#: templates/web/base/admin/triage/index.html:14
#: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:27
msgid "Problems within %s, %s"
msgstr "在 %s, %s的問題 "
@@ -3336,11 +3396,15 @@ msgstr "在 %s, %s的問題 "
msgid "Property address:"
msgstr "公物地址:"
-#: templates/web/base/admin/extra-metadata-item.html:105
+#: templates/web/base/admin/extra-metadata-item.html:106
msgid "Protect from Open311 changes"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:69
+#: templates/web/base/admin/bodies/contact-form.html:95
+msgid "Protect this category from being re-named"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:88
msgid "Protect this category's name and group(s) from Open311 changes"
msgstr ""
@@ -3354,11 +3418,11 @@ msgstr "提供更新資訊"
msgid "Provide update as"
msgstr ""
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。"
@@ -3366,12 +3430,12 @@ msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問
msgid "Public details"
msgstr ""
-#: templates/web/zurich/admin/reports/edit.html:230
-#: templates/web/zurich/admin/reports/edit.html:257
+#: templates/web/zurich/admin/reports/edit.html:234
+#: templates/web/zurich/admin/reports/edit.html:261
msgid "Public response:"
msgstr "公眾反應"
-#: templates/web/base/report/inspect/public_update.html:11
+#: templates/web/base/report/inspect/public_update.html:13
msgid "Public update:"
msgstr ""
@@ -3414,11 +3478,11 @@ msgstr "由問題申報者所填之問卷"
msgid "RSS feed"
msgstr "RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "RSS feed for %s"
msgstr "%s RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
+#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
msgid "RSS feed for %s ward, %s"
msgstr "%s里/區 RSS訂閱"
@@ -3426,11 +3490,11 @@ msgstr "%s里/區 RSS訂閱"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183
-#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:306
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:310
msgid "RSS feed of %s"
msgstr "%s RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
+#: perllib/FixMyStreet/Cobrand/UK.pm:301 perllib/FixMyStreet/Cobrand/UK.pm:315
msgid "RSS feed of %s, within %s ward"
msgstr "%s, 在%s 里/區"
@@ -3438,13 +3502,13 @@ msgstr "%s, 在%s 里/區"
msgid "RSS feed of nearby problems"
msgstr " RSS訂閱 %s區域問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:906
+#: perllib/FixMyStreet/Cobrand/Default.pm:922
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:231
msgid "RSS feed of problems within %s"
msgstr "在 %s 內之問題RSS 訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:233
+#: perllib/FixMyStreet/Cobrand/UK.pm:237
msgid "RSS feed of problems within %s ward"
msgstr "在 %s 里/區問題的RSS 訂閱"
@@ -3458,11 +3522,11 @@ msgstr "最近當地問題的RSS訂閱"
msgid "RSS feed of updates to this problem"
msgstr "最近當地問題更新的RSS訂閱"
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
msgid "Read less"
msgstr ""
-#: templates/web/base/report/_item_expandable.html:55
+#: templates/web/base/report/_item_expandable.html:57
msgid "Read more"
msgstr ""
@@ -3475,7 +3539,7 @@ msgstr ""
msgid "Receive email when updates are left on this problem."
msgstr "透過電子郵件收取該問題之更新消息"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:815
+#: perllib/FixMyStreet/DB/Result/Problem.pm:823
msgid "Received by %s moments later"
msgstr ""
@@ -3489,7 +3553,7 @@ msgstr "近期的當地問題%s "
msgid "Recently reported problems"
msgstr "近期申報之問題 "
-#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/admin/triage/_list-filters.html:36
#: templates/web/base/reports/_list-filters-sort.html:9
msgid "Recently updated"
msgstr ""
@@ -3502,7 +3566,8 @@ 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 "記住 FixMyStreet主要為申報可修復之物理性問題。如果您的問題不適合透過本網站投送,請直接到地方政府各機關之網站。 "
-#: templates/web/base/admin/users/form.html:197
+#: templates/web/base/admin/users/form.html:182
+#: templates/web/zurich/admin/users/form.html:39
msgid "Remove account details"
msgstr ""
@@ -3514,8 +3579,8 @@ msgstr ""
msgid "Remove flag"
msgstr "移除標記"
-#: templates/web/base/report/_item.html:12
-#: templates/web/base/report/_item.html:9
+#: templates/web/base/report/_item.html:20
+#: templates/web/base/report/_item.html:23
#: templates/web/base/report/_main.html:147
#: templates/web/base/report/_main.html:24
#: templates/web/base/report/_main.html:32
@@ -3530,17 +3595,21 @@ msgstr ""
msgid "Remove option"
msgstr ""
-#: templates/web/base/admin/reports/edit.html:174
+#: templates/web/base/admin/reports/edit.html:187
#: templates/web/base/admin/update_edit.html:74
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "移陯照片(無法回復)"
-#: templates/web/base/auth/generate_token.html:78
+#: templates/web/base/admin/users/index.html:85
+msgid "Remove staff permissions"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:75
msgid "Replace token"
msgstr ""
-#: templates/web/zurich/admin/reports/edit.html:228
+#: templates/web/zurich/admin/reports/edit.html:232
msgid "Reply to user:"
msgstr "給用戶的回應"
@@ -3548,14 +3617,14 @@ msgstr "給用戶的回應"
msgid "Report"
msgstr "提報 "
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:73
#: templates/web/base/report/inspect/information.html:7
msgid "Report ID:"
msgstr ""
#. ("JS")
#: templates/web/base/header_logo.html:2
-#: templates/web/base/js/translation_strings.html:89
+#: templates/web/base/js/translation_strings.html:91
#: templates/web/base/navigation/_report.html:6
#: templates/web/base/navigation/_report.html:8
#: templates/web/zurich/footer.html:18
@@ -3564,7 +3633,7 @@ msgid "Report a problem"
msgstr "申報問題"
#. ("JS")
-#: templates/web/base/js/translation_strings.html:90
+#: templates/web/base/js/translation_strings.html:92
#: templates/web/base/navigation/_report.html:4
msgid "Report a problem here"
msgstr ""
@@ -3580,7 +3649,7 @@ msgid "Report anonymously"
msgstr "在%s 匿名申報 "
#. ("JS")
-#: templates/web/base/js/translation_strings.html:91
+#: templates/web/base/js/translation_strings.html:93
#: templates/web/base/navigation/_report.html:2
#: templates/web/base/tokens/confirm_problem.html:40
msgid "Report another problem here"
@@ -3616,7 +3685,7 @@ msgstr ""
msgid "Report, view, or discuss local problems"
msgstr "申報,檢視,或討論在地問題"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: perllib/FixMyStreet/DB/Result/Problem.pm:655
#: templates/web/base/contact/index.html:64
msgid "Reported anonymously at %s"
msgstr "在%s 匿名申報 "
@@ -3627,7 +3696,7 @@ msgstr "在%s 匿名申報 "
msgid "Reported before"
msgstr "之前的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: perllib/FixMyStreet/DB/Result/Problem.pm:679
#: templates/web/base/contact/index.html:66
msgid "Reported by %s at %s"
msgstr "由%s 的 %s 申報"
@@ -3641,27 +3710,27 @@ msgstr "由  申報"
msgid "Reported in the %s category"
msgstr "%s 種類之申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
msgid "Reported in the %s category anonymously at %s"
msgstr "%s 種類下的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:673
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
msgid "Reported in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:646
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
msgid "Reported via %s anonymously at %s"
msgstr "在%s 匿名申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:670
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
msgid "Reported via %s by %s at %s"
msgstr "%s 透過 %s 在 %s類別的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:643
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "透過 %s 在 %s類別的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:665
+#: perllib/FixMyStreet/DB/Result/Problem.pm:668
msgid "Reported via %s in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
@@ -3680,17 +3749,15 @@ msgstr "已申報 %s"
msgid "Reporting a problem"
msgstr "申報問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:380
#: templates/web/base/around/tabbed_lists.html:3
#: templates/web/base/dashboard/index.html:108
-#: templates/web/zurich/header.html:48
msgid "Reports"
msgstr "申報"
-#: perllib/FixMyStreet/Cobrand/Bromley.pm:21
+#: perllib/FixMyStreet/Cobrand/Bromley.pm:26
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17
#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
msgid "Reports are limited to %s characters in length. Please shorten your report"
@@ -3718,15 +3785,15 @@ msgid "Reports published"
msgstr "己公開之申報"
#. ("JS")
-#: templates/web/base/js/translation_strings.html:101
+#: templates/web/base/js/translation_strings.html:103
msgid "Reports saved offline."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:295 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "Reports sent to %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
+#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:316
msgid "Reports sent to %s, within %s ward"
msgstr ""
@@ -3739,7 +3806,7 @@ msgstr ""
msgid "Reposition if needed, then hit Continue"
msgstr ""
-#: templates/web/base/admin/extra-metadata-item.html:93
+#: templates/web/base/admin/extra-metadata-item.html:94
msgid "Required"
msgstr ""
@@ -3792,39 +3859,45 @@ msgstr ""
msgid "Right place?"
msgstr "正確地點?"
-#: perllib/FixMyStreet/Geocode/OSM.pm:161
+#: perllib/FixMyStreet/Geocode/OSM.pm:162
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:159
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/maps/fms.html:3 templates/web/base/maps/osm.html:3
+msgid "Roads"
+msgstr ""
+
#: templates/web/base/admin/roles/index.html:5
msgid "Role"
msgstr ""
-#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/form.html:128
#: templates/web/base/admin/users/index.html:29
msgid "Role:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
#: templates/web/base/admin/roles/form.html:1
#: templates/web/base/admin/roles/index.html:1
msgid "Roles"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: perllib/FixMyStreet/App/Controller/Admin.pm:416
-#: templates/web/base/admin/reports/edit.html:171
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: perllib/FixMyStreet/App/Controller/Admin.pm:426
+#: templates/web/base/admin/reports/edit.html:184
#: templates/web/base/admin/update_edit.html:71
#: templates/web/zurich/admin/reports/edit.html:106
msgid "Rotate Left"
msgstr "左轉 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:412
-#: templates/web/base/admin/reports/edit.html:172
+#: perllib/FixMyStreet/App/Controller/Admin.pm:422
+#: templates/web/base/admin/reports/edit.html:185
#: templates/web/base/admin/update_edit.html:72
#: templates/web/zurich/admin/reports/edit.html:107
msgid "Rotate Right"
@@ -3840,20 +3913,20 @@ msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
msgid "Satellite"
msgstr "衛星"
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/report/_inspect.html:79
msgid "Save + close as duplicate"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:131
+#: templates/web/base/admin/bodies/contact-form.html:164
#: templates/web/base/admin/manifesttheme/form.html:58
#: templates/web/base/admin/reportextrafields/edit.html:64
#: templates/web/base/admin/responsepriorities/edit.html:41
#: templates/web/base/admin/roles/form.html:21
-#: templates/web/base/admin/templates/edit.html:84
-#: templates/web/base/admin/triage/_inspect.html:69
-#: templates/web/base/admin/users/index.html:83
-#: templates/web/base/report/_inspect.html:78
+#: templates/web/base/admin/templates/edit.html:73
+#: templates/web/base/admin/triage/_inspect.html:68
+#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/report/_inspect.html:79
#: templates/web/base/report/_main.html:129
#: templates/web/base/report/update.html:58
#: templates/web/zurich/admin/bodies/contact-form.html:51
@@ -3870,13 +3943,12 @@ msgid "Save with a public update"
msgstr ""
#. ("This is followed by a progress count, e.g. 3/5", "JS")
-#: templates/web/base/js/translation_strings.html:102
+#: templates/web/base/js/translation_strings.html:104
msgid "Saving reports offline"
msgstr ""
#: templates/web/base/admin/index.html:26
#: templates/web/base/admin/reports/index.html:1
-#: templates/web/zurich/admin/reports/index.html:1
msgid "Search Reports"
msgstr "搜尋申報"
@@ -3889,7 +3961,7 @@ msgstr "搜尋使用者"
msgid "Search for location of email alert or RSS feed"
msgstr ""
-#: templates/web/zurich/header.html:70
+#: templates/web/zurich/header.html:79
msgid "Search reports"
msgstr "搜尋申報"
@@ -3904,12 +3976,12 @@ msgstr "搜尋"
msgid "Searching found no reports."
msgstr "查無此申報"
-#: templates/web/base/admin/users/index.html:89
+#: templates/web/base/admin/users/index.html:95
msgid "Searching found no users."
msgstr "查無此用戶"
#: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/auth/generate_token.html:49
#: templates/web/base/my/my.html:75
msgid "Security"
msgstr ""
@@ -3919,8 +3991,7 @@ msgstr ""
msgid "See our privacy policy"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:768
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
+#: perllib/FixMyStreet/Cobrand/Default.pm:784
msgid "See user detail for reports created as the council"
msgstr ""
@@ -3930,7 +4001,7 @@ msgid "Select a body"
msgstr "選擇單位"
#: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:87
+#: templates/web/base/admin/users/form.html:58
#: templates/web/zurich/admin/bodies/form.html:37
msgid "Select an area"
msgstr "選擇區域"
@@ -3951,7 +4022,7 @@ msgstr ""
msgid "Select:"
msgstr ""
-#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/enquiry/index.html:76
#: templates/web/base/contact/index.html:120
msgid "Send"
msgstr ""
@@ -3964,7 +4035,7 @@ msgstr ""
msgid "Send extended Open311 statuses with service request updates"
msgstr ""
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/_form_details.html:17
msgid "Send login email"
msgstr ""
@@ -3973,11 +4044,11 @@ msgstr ""
msgid "Sending a confirmation text failed: \"%s\""
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:892
msgid "Sent report back"
msgstr "送回申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:819
+#: perllib/FixMyStreet/DB/Result/Problem.pm:827
msgid "Sent to %s %s later"
msgstr "%s 稍後送給%s"
@@ -4015,7 +4086,7 @@ msgstr ""
msgid "Shortlist"
msgstr ""
-#: templates/web/base/reports/body.html:39
+#: templates/web/base/reports/body.html:34
msgid "Shortlist all visible"
msgstr ""
@@ -4026,7 +4097,7 @@ msgstr ""
msgid "Shortlisted"
msgstr ""
-#: templates/web/base/report/_item.html:15
+#: templates/web/base/report/_item.html:26
#: templates/web/base/report/_main.html:157
msgid "Shortlisted by %s"
msgstr ""
@@ -4051,8 +4122,8 @@ msgstr ""
msgid "Show older"
msgstr ""
-#: templates/web/base/admin/triage/_list-filters.html:43
-#: templates/web/base/reports/_list-filters.html:47
+#: templates/web/base/admin/triage/_list-filters.html:44
+#: templates/web/base/reports/_list-filters.html:49
msgid "Show older reports"
msgstr ""
@@ -4063,7 +4134,7 @@ msgstr ""
#. ("JS")
#: templates/web/base/around/display_location.html:63
#: templates/web/base/around/display_location.html:71
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:75
msgid "Show pins"
msgstr "顯示地圖標示"
@@ -4126,7 +4197,7 @@ msgid "Some photos of recent reports"
msgstr "最近申報之照片"
#. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:62
+#: perllib/FixMyStreet/Template.pm:66
msgid "Some text to localize"
msgstr "有些文字需在地化"
@@ -4135,12 +4206,11 @@ msgid "Someone has moderated this report since you started."
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:78
msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:100
-#: perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/UK.pm:90
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr "抱歉,該郵區號碼我們尚未支援"
@@ -4158,9 +4228,9 @@ msgstr ""
msgid "Sorry, there has been an error confirming your problem."
msgstr "抱歉無法確認你的問題"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:249
-#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:47
-#: perllib/FixMyStreet/Geocode/OSM.pm:53
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:250
+#: perllib/FixMyStreet/Geocode.pm:39 perllib/FixMyStreet/Geocode/Bing.pm:50
+#: perllib/FixMyStreet/Geocode/OSM.pm:54
msgid "Sorry, we could not find that location."
msgstr "抱歉,我們無法找到此位置"
@@ -4170,13 +4240,13 @@ msgstr "抱歉,我們無法找到此位置"
msgid "Sorry, we could not log you in. Please fill in the form below."
msgstr ""
-#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: perllib/FixMyStreet/Geocode/Bing.pm:47
#: perllib/FixMyStreet/Geocode/Google.pm:56
#: perllib/FixMyStreet/Geocode/Zurich.pm:119
msgid "Sorry, we could not parse that location. Please try again."
msgstr "抱歉,我們無法解析此地點,請重試一次"
-#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:102
#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
#: perllib/FixMyStreet/PhotoStorage.pm:63
#, fuzzy
@@ -4191,11 +4261,11 @@ msgstr ""
msgid "Sorry, you don't have permission to do that."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:176
+#: perllib/FixMyStreet/App/Controller/Report.pm:195
msgid "Sorry, you don’t have permission to do that. If you are the problem reporter, or a member of staff, please <a href=\"%s\">sign in</a> to view this report."
msgstr ""
-#: templates/web/base/admin/triage/_list-filters.html:28
+#: templates/web/base/admin/triage/_list-filters.html:29
#: templates/web/base/reports/_list-filters-sort.html:2
msgid "Sort by"
msgstr ""
@@ -4204,11 +4274,11 @@ msgstr ""
msgid "Staff only"
msgstr ""
-#: templates/web/base/admin/users/form.html:65
+#: templates/web/base/admin/users/form.html:36
msgid "Staff users have permission to log in to the admin."
msgstr ""
-#: templates/web/base/admin/users/form.html:69
+#: templates/web/base/admin/users/form.html:40
msgid "Staff:"
msgstr ""
@@ -4232,18 +4302,18 @@ msgstr ""
#: templates/web/base/admin/users/alerts.html:11
#: templates/web/base/dashboard/index.html:102
#: templates/web/base/report/_inspect.html:34
-#: templates/web/base/report/_item.html:78
-#: templates/web/base/report/update/form_update.html:41
+#: templates/web/base/report/_item.html:91
+#: templates/web/base/report/update/form_update.html:18
#: templates/web/zurich/admin/bodies/contact-form.html:37
msgid "State"
msgstr "陳述"
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:110
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:111
msgid "State and external status code cannot be used simultaneously."
msgstr ""
-#: perllib/FixMyStreet/Script/Alerts.pm:106
+#: perllib/FixMyStreet/Script/Alerts.pm:107
#: templates/web/base/report/_update_state.html:7
#: templates/web/base/report/updates.html:21
msgid "State changed to:"
@@ -4252,31 +4322,28 @@ msgstr ""
#: templates/web/base/admin/reports/edit.html:128
#: templates/web/base/admin/update_edit.html:28
#: templates/web/zurich/admin/report_edit-sdm.html:63
-#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:143
#: templates/web/zurich/admin/reports/edit.html:91
#: templates/web/zurich/admin/update_edit.html:17
msgid "State:"
msgstr "陳述:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:686
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:401
#: templates/web/base/admin/states/index.html:1
msgid "States"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:680
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:383
#: templates/web/base/admin/stats/index.html:1
#: templates/web/base/admin/stats/state.html:1
#: templates/web/zurich/admin/stats/index.html:1
-#: templates/web/zurich/header.html:61
+#: templates/web/zurich/header.html:70
msgid "Stats"
msgstr "統計"
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
msgid "Status"
msgstr "狀態"
@@ -4294,7 +4361,7 @@ msgstr "街景圖"
msgid "Subcategory"
msgstr ""
-#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/_index_table.html:9
msgid "Subdivision/Body"
msgstr "下屬單位/機關"
@@ -4313,50 +4380,48 @@ msgstr "主旨:"
#: templates/web/base/auth/2fa/form.html:20
#: templates/web/base/auth/smsform.html:27
#: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: templates/web/base/report/form/submit.html:1
+#: templates/web/base/report/form/submit.html:2
#: templates/web/base/report/form/user_loggedout_password.html:29
#: templates/web/base/report/new/form_report.html:21
-#: templates/web/base/report/new/form_user_loggedin.html:73
-#: templates/web/base/report/new/login_success_form.html:17
-#: templates/web/base/report/new/oauth_email_form.html:20
#: templates/web/base/report/new/report_import.html:103
-#: templates/web/zurich/report/new/fill_in_details_form.html:73
+#: templates/web/zurich/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "Submit"
msgstr "送出"
-#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:198
#: templates/web/base/admin/reports/edit.html:25
#: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:189
-#: templates/web/zurich/admin/report_edit-sdm.html:111
-#: templates/web/zurich/admin/reports/edit.html:253
+#: templates/web/base/admin/users/form.html:174
+#: templates/web/zurich/admin/report_edit-sdm.html:117
+#: templates/web/zurich/admin/reports/edit.html:257
#: templates/web/zurich/admin/update_edit.html:38
+#: templates/web/zurich/admin/users/form.html:31
msgid "Submit changes"
msgstr "送出更新"
-#: templates/web/base/questionnaire/index.html:112
+#: templates/web/base/questionnaire/index.html:89
msgid "Submit questionnaire"
msgstr "送出問卷"
-#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/_index_table.html:5
#: templates/web/zurich/admin/index-dm.html:8
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
msgid "Submitted"
msgstr "已送出"
-#: templates/web/base/alert/_list.html:72
-#: templates/web/base/alert/_list.html:75
-#: templates/web/base/alert/updates.html:24
-#: templates/web/base/alert/updates.html:27
-#: templates/web/base/alert/updates.html:34
-#: templates/web/base/report/display_tools.html:53
-#: templates/web/base/report/display_tools.html:56
-#: templates/web/base/report/display_tools.html:62
+#: templates/web/base/alert/_list.html:73
+#: templates/web/base/alert/_list.html:76
+#: templates/web/base/alert/updates.html:26
+#: templates/web/base/alert/updates.html:29
+#: templates/web/base/alert/updates.html:36
+#: templates/web/base/report/display_tools.html:54
+#: templates/web/base/report/display_tools.html:57
+#: templates/web/base/report/display_tools.html:63
msgid "Subscribe"
msgstr "訂閱"
-#: templates/web/base/alert/_list.html:67
+#: templates/web/base/alert/_list.html:68
msgid "Subscribe by email"
msgstr ""
@@ -4369,7 +4434,7 @@ msgstr ""
msgid "Summaries are limited to %d characters in length. Please shorten your summary"
msgstr "更新內容有 %s 字數限制,請簡化您的更新。"
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:137
#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
msgid "Summaries are limited to %s characters in length. Please shorten your summary"
msgstr ""
@@ -4383,20 +4448,19 @@ msgstr ""
msgid "Summarise the problem"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:123
+#: templates/web/base/admin/bodies/contact-form.html:156
msgid "Summarise your changes"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:678
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:379
#: templates/web/base/admin/bodies/index.html:29
#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
#: templates/web/base/status/index.html:3
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:45
+#: templates/web/zurich/header.html:46
msgid "Summary"
msgstr "摘要"
@@ -4407,14 +4471,19 @@ msgstr "申報摘要"
#: templates/web/base/admin/stats/index.html:15
#: templates/web/base/dashboard/index.html:21
+#: templates/web/base/dashboard/status.html:14
msgid "Summary statistics"
msgstr ""
-#: templates/web/base/admin/users/form.html:130
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:238
+msgid "Superuser"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:115
msgid "Superuser:"
msgstr ""
-#: templates/web/base/admin/users/form.html:126
+#: templates/web/base/admin/users/form.html:111
msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
msgstr ""
@@ -4432,13 +4501,17 @@ msgstr ""
msgid "Template &laquo;%s&raquo;"
msgstr "模版 &laquo;%s&raquo;"
-#: perllib/FixMyStreet/Cobrand/Default.pm:704
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:390
#: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:65
+#: templates/web/zurich/header.html:74
msgid "Templates"
msgstr "模版"
+#: templates/web/base/dashboard/heatmap-list.html:9
+msgid "Ten least recently updated open reports"
+msgstr ""
+
#: templates/web/zurich/admin/templates/view.html:9
msgid "Text"
msgstr "內文"
@@ -4459,6 +4532,11 @@ msgstr "文字版"
msgid "Text:"
msgstr "內文:"
+#: templates/web/base/admin/extra-metadata-item.html:70
+#, fuzzy
+msgid "Textarea"
+msgstr "內文"
+
#: templates/web/base/tokens/confirm_problem.html:29
msgid "Thank you for reporting this issue!"
msgstr "感謝您申報此問題"
@@ -4488,7 +4566,7 @@ msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever
msgstr "謝謝,很高興知道此問題己修復了。請問您過去是否曾申報過問題? "
#: templates/web/base/auth/2fa/intro.html:11
-#: templates/web/base/auth/generate_token.html:30
+#: templates/web/base/auth/generate_token.html:34
msgid "Thanks, you have successfully enabled two-factor authentication on your account."
msgstr ""
@@ -4500,27 +4578,29 @@ msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 "
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "該地區似乎非該地方政府管轄,它可能在轄區外,請再試 一次 "
-#: perllib/FixMyStreet/App/Controller/Location.pm:161
+#: perllib/FixMyStreet/App/Controller/Location.pm:186
msgid "That location does not appear to be in the UK; please try again."
msgstr "這地點似乎不在台灣; 請再試 一次。"
+#: perllib/FixMyStreet/App/Controller/Auth.pm:499
+msgid "That password has appeared in a known third-party data breach (<a href=\"https://haveibeenpwned.com/Passwords\" target=\"_blank\">more information</a>); please choose another"
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
-#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:93
-#: perllib/FixMyStreet/Cobrand/UK.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:83
msgid "That postcode was not recognised, sorry."
msgstr "抱歉此郵遞區號無法辨識"
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:272
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:288
msgid "That problem has been marked as sent."
msgstr "問題被標註為送出"
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:265
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:281
msgid "That problem will now be resent."
msgstr "此問題將重新送出"
-#: perllib/FixMyStreet/App/Controller/Report.pm:156
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
msgid "That report has been removed from FixMyStreet."
msgstr "該申報已遭FixMyStreet 移除 "
@@ -4570,8 +4650,8 @@ msgstr ""
msgid "The <strong>name</strong> is a string that represents the name of the web application as it is usually displayed to the user (e.g., amongst a list of other applications, or as a label for an icon)."
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:76
-#: templates/web/base/admin/bodies/contact-form.html:77
+#: templates/web/base/admin/bodies/contact-form.html:108
+#: templates/web/base/admin/bodies/contact-form.html:109
#: templates/web/base/admin/bodies/form.html:101
#: templates/web/base/admin/bodies/form.html:102
msgid ""
@@ -4630,7 +4710,7 @@ msgstr "顯示錯誤為: %s"
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 "下列 Open311 v2 屬性視要求之回覆而定: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
-#: perllib/FixMyStreet/Geocode/OSM.pm:153
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "下方關於最近道路之資訊未必準確,如果鄰近有多條道路或是在OpenStreetMap上無登記路名資料。"
@@ -4692,8 +4772,8 @@ msgstr "用戶無法在地點上標示問題,但可以看到他們輸入的地
msgid "The user has been sent a login email"
msgstr ""
-#: templates/web/base/admin/users/form.html:13
-#: templates/web/base/admin/users/form.html:14
+#: templates/web/base/admin/users/_form_details.html:4
+#: templates/web/base/admin/users/_form_details.html:5
msgid ""
"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
" Names are not necessarily unique."
@@ -4728,7 +4808,7 @@ msgstr ""
msgid "There is already a template with that title."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:138
msgid "There is already an auto-response template for this category/state."
msgstr ""
@@ -4746,12 +4826,12 @@ msgstr "本頁出現錯誤,請再試一次"
msgid "There was a problem with your login information."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:916
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:161
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:944
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:165
msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:376
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:380
msgid "There was a problem with your update. Please try again."
msgstr "您的申報有問題,請重試一次"
@@ -4759,7 +4839,7 @@ msgstr "您的申報有問題,請重試一次"
msgid "There were problems with your report. Please see below."
msgstr "您的申報有問題,請見下方說明"
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:417
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:431
msgid "There were problems with your update. Please see below."
msgstr "您的更新有問題,請見下方說明"
@@ -4845,10 +4925,10 @@ 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:1091
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1163
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1210
-#: perllib/FixMyStreet/Cobrand/UK.pm:51
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1125
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1197
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1244
+#: perllib/FixMyStreet/Cobrand/UK.pm:55
msgid "This information is required"
msgstr "本項資訊必填"
@@ -4865,19 +4945,23 @@ msgstr ""
msgid "This is the problem"
msgstr ""
+#: templates/web/base/admin/users/form.html:79
+msgid "This means the user will only see front end staff features (such as the inspector form) in their assigned categories."
+msgstr ""
+
#: templates/web/base/admin/users/import.html:65
msgid "This page is a quick way to create many new staff users in one go."
msgstr ""
-#: templates/web/base/report/update/form_state_checkbox.html:14
+#: templates/web/base/report/update/form_state_checkbox.html:16
msgid "This problem has been fixed"
msgstr "問題己處理完畢"
-#: templates/web/base/report/update/form_state_checkbox.html:7
+#: templates/web/base/report/update/form_state_checkbox.html:9
msgid "This problem has not been fixed"
msgstr "問題尚未解決"
-#: templates/web/base/report/update/form_state_checkbox.html:5
+#: templates/web/base/report/update/form_state_checkbox.html:7
msgid "This problem is still ongoing"
msgstr ""
@@ -4890,26 +4974,26 @@ msgstr ""
msgid "This report is a duplicate. Please leave updates on the original report:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:144
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "此問題尚待審核"
-#: perllib/FixMyStreet/Script/Alerts.pm:123
+#: perllib/FixMyStreet/Script/Alerts.pm:124
msgid "This report is currently marked as closed."
msgstr "該申報目前注記為結案狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:122
msgid "This report is currently marked as fixed."
msgstr "該申報目前注記為解決狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:125
+#: perllib/FixMyStreet/Script/Alerts.pm:126
msgid "This report is currently marked as open."
msgstr "該申報目前注記為開放狀態"
#: templates/web/base/report/_updates_disallowed_message.html:1
-#: templates/web/base/report/display.html:58
+#: templates/web/base/report/display.html:55
msgid "This report is now closed to updates."
msgstr ""
@@ -4917,15 +5001,18 @@ msgstr ""
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "本頁包括由用戶提供反應問題的照片 "
-#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/base/auth/generate_token.html:16
+msgid "This will be the only time this token is visible, so please make a note of it now."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:112
#: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:136
#: templates/web/zurich/admin/reports/edit.html:94
msgid "Time spent (in minutes):"
msgstr "花費時間(以分鐘計):"
-#: perllib/FixMyStreet/Cobrand/Default.pm:679
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
#: templates/web/base/admin/timeline.html:1
#: templates/web/base/admin/users/index.html:68
#: templates/web/base/admin/users/log.html:1
@@ -4949,6 +5036,10 @@ msgstr "標題"
msgid "Title:"
msgstr "標題"
+#: templates/web/base/dashboard/heatmap.html:30
+msgid "To"
+msgstr ""
+
#: templates/web/base/alert/_index_text.html:21
msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
msgstr "找出適合您的在地通知,請輸入您的郵編或街名區域"
@@ -4974,7 +5065,7 @@ msgid "To view a map of the precise location of this issue"
msgstr "檢視地圖上問題之確切位置"
#: templates/web/base/auth/generate_token.html:11
-#: templates/web/base/auth/generate_token.html:66
+#: templates/web/base/auth/generate_token.html:70
msgid "Token"
msgstr ""
@@ -4999,11 +5090,6 @@ msgstr ""
msgid "Total"
msgstr "總數"
-#: templates/web/base/report/_item.html:86
-#: templates/web/base/report/inspect/extra_details.html:13
-msgid "Traffic management required?"
-msgstr ""
-
#: templates/web/base/admin/bodies/_translations.html:7
msgid "Translation"
msgstr ""
@@ -5026,16 +5112,16 @@ msgstr "何不直接發信給我們:"
#: templates/web/base/auth/2fa/intro.html:2
#: templates/web/base/auth/2fa/intro.html:6
-#: templates/web/base/auth/generate_token.html:36
-#: templates/web/base/auth/generate_token.html:49
+#: templates/web/base/auth/generate_token.html:40
+#: templates/web/base/auth/generate_token.html:53
msgid "Two-factor authentication"
msgstr ""
-#: templates/web/base/auth/generate_token.html:29
+#: templates/web/base/auth/generate_token.html:33
msgid "Two-factor authentication has been activated"
msgstr ""
-#: templates/web/base/auth/generate_token.html:21
+#: templates/web/base/auth/generate_token.html:25
msgid "Two-factor authentication has been deactivated"
msgstr ""
@@ -5045,7 +5131,7 @@ msgstr ""
msgid "Type"
msgstr ""
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
msgid "Unban"
msgstr ""
@@ -5075,10 +5161,10 @@ msgstr "未知的錯誤"
#: perllib/FixMyStreet/App/Controller/Develop.pm:188
#: perllib/FixMyStreet/App/Controller/Develop.pm:207
-#: perllib/FixMyStreet/App/Controller/My.pm:229
-#: perllib/FixMyStreet/App/Controller/Report.pm:141
-#: perllib/FixMyStreet/App/Controller/Report.pm:147
-#: perllib/FixMyStreet/App/Controller/Report.pm:150
+#: perllib/FixMyStreet/App/Controller/My.pm:244
+#: perllib/FixMyStreet/App/Controller/Report.pm:161
+#: perllib/FixMyStreet/App/Controller/Report.pm:167
+#: perllib/FixMyStreet/App/Controller/Report.pm:170
msgid "Unknown problem ID"
msgstr "未知的問題編號  "
@@ -5090,13 +5176,13 @@ msgstr ""
msgid "Unshortlisted"
msgstr ""
-#: templates/web/base/report/_item.html:26
+#: templates/web/base/report/_item.html:37
msgid "Up one"
msgstr ""
#: templates/web/base/admin/states/index.html:76
#: templates/web/base/admin/users/alerts.html:58
-#: templates/web/base/report/update/form_update.html:31
+#: templates/web/base/report/update/form_update.html:8
msgid "Update"
msgstr "更新"
@@ -5147,29 +5233,27 @@ msgstr "更新重申報之問題 "
msgid "Update statuses"
msgstr "更新之狀態"
-#: templates/web/zurich/admin/index-dm.html:25
-#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports/index.html:13
+#: templates/web/zurich/admin/_index_table.html:5
msgid "Updated"
msgstr "已更新"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:312
msgid "Updated by <strong>%s</strong> (%s) at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:253
+#: perllib/FixMyStreet/DB/Result/Comment.pm:314
msgid "Updated by <strong>%s</strong> at %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:239
-#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:366
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:368
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:171
#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:57
#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:572
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:837
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:935
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:856
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:925
msgid "Updated!"
msgstr "已更新!"
@@ -5180,7 +5264,7 @@ msgstr "已更新!"
msgid "Updates"
msgstr "更新"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/DB/Result/Comment.pm:204
msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr "更新內容有 %s 字數限制,請簡化您的更新。"
@@ -5210,6 +5294,14 @@ msgstr ""
msgid "Use this for issues that you want to allow users to report, but for which there is no public interest in displaying the report, like requesting an extra rubbish bin at a specific address."
msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:102
+msgid "Use this if you wish only users assigned to this category to see staff-related features (such as the inspector form) in the front end."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:75
+msgid "Use this where you do not want problem reporters to be able to reopen their fixed or closed reports when leaving an update."
+msgstr ""
+
#: templates/web/base/admin/bodies/open311-form-fields.html:90
msgid "User ID to attribute fetched comments to"
msgstr ""
@@ -5223,8 +5315,8 @@ msgstr ""
msgid "User added to abuse list"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:148
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:277
msgid "User already exists"
msgstr ""
@@ -5242,7 +5334,7 @@ msgid "User flagged"
msgstr "給用戶標記警告"
#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/_form_details.html:31
#: templates/web/base/admin/users/index.html:65
msgid "User in abuse table"
msgstr ""
@@ -5255,27 +5347,25 @@ msgstr "用戶找到相符的名稱與電子郵件"
msgid "User's alerts"
msgstr ""
-#: templates/web/base/admin/reports/edit.html:142
+#: templates/web/base/admin/reports/edit.html:155
#: templates/web/base/admin/update_edit.html:36
msgid "User:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
-#: perllib/FixMyStreet/Cobrand/Default.pm:770
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:204
-#: perllib/FixMyStreet/Cobrand/KiitC.pm:336
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:395
#: templates/web/base/admin/flagged.html:29
#: templates/web/base/admin/roles/index.html:25
-#: templates/web/zurich/header.html:57
+#: templates/web/zurich/header.html:66
msgid "Users"
msgstr "使用者"
-#: templates/web/base/admin/users/form.html:140
+#: templates/web/base/admin/users/form.html:125
msgid "Users can be assigned one or more roles to give them all the permissions of those roles. Selecting a role or roles will disable manual permission selection."
msgstr ""
-#: templates/web/base/admin/users/form.html:156
+#: templates/web/base/admin/users/form.html:141
msgid "Users can perform the following actions within their assigned body or area."
msgstr ""
@@ -5283,9 +5373,9 @@ msgstr ""
msgid "Users with this role can perform the following actions within their assigned body or area."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:212
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:359
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:211
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:329
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:372
msgid "Values updated"
msgstr "數值更新"
@@ -5311,7 +5401,7 @@ msgstr ""
msgid "View report on site"
msgstr "檢視本站之申報 "
-#: templates/web/base/reports/body.html:21
+#: templates/web/base/reports/body.html:16
msgid "View reports by ward"
msgstr "檢視里/區之申報 "
@@ -5319,7 +5409,7 @@ msgstr "檢視里/區之申報 "
msgid "View wards"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:759
+#: perllib/FixMyStreet/Cobrand/Default.pm:775
msgid "View/Mark private reports"
msgstr ""
@@ -5337,7 +5427,7 @@ msgstr "檢視問題 "
msgid "Ward:"
msgstr ""
-#: templates/web/base/reports/body.html:23
+#: templates/web/base/reports/body.html:18
msgid "Wards of this council"
msgstr "地方政府轄下的里/區"
@@ -5407,7 +5497,7 @@ msgstr "何時送出"
msgid "Which problems do you want alerts about?"
msgstr ""
-#: templates/web/base/report/_inspect.html:40
+#: templates/web/base/report/_inspect.html:41
msgid "Which report is it a duplicate of?"
msgstr ""
@@ -5427,7 +5517,7 @@ msgstr ""
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"https://fixmystreet.org\">available at fixmystreet.org</a>."
msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼,可從 <a href=\"https://fixmystreet.org\">fixmystreet.org</a>官網進一步了解 "
-#: templates/web/base/questionnaire/index.html:103
+#: templates/web/base/questionnaire/index.html:80
msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
msgstr "您是否願意4週後再收到另一份問卷?以提醒您確認最新的狀況"
@@ -5439,7 +5529,6 @@ msgstr ""
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "請注意留言內容,勿用注音文並應加上標點符號以利閱讀。"
-#: perllib/FixMyStreet/Cobrand/Default.pm:1261
#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:121
#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:122
#: templates/web/base/admin/bodies/category.html:6
@@ -5450,12 +5539,12 @@ msgstr "請注意留言內容,勿用注音文並應加上標點符號以利閱
#: templates/web/base/admin/list_updates.html:36
#: templates/web/base/admin/problem_row.html:20
#: templates/web/base/admin/reports/edit.html:101
-#: templates/web/base/admin/reports/edit.html:137
+#: templates/web/base/admin/reports/edit.html:150
#: templates/web/base/admin/update_edit.html:25
#: templates/web/base/admin/users/alerts.html:21
#: templates/web/base/admin/users/index.html:65
-#: templates/web/base/questionnaire/index.html:106
#: templates/web/base/questionnaire/index.html:39
+#: templates/web/base/questionnaire/index.html:83
msgid "Yes"
msgstr "是"
@@ -5468,7 +5557,7 @@ msgid "You are not sure of the origin or validity of the contact."
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:103
+#: templates/web/base/js/translation_strings.html:105
msgid "You are offline"
msgstr ""
@@ -5481,7 +5570,7 @@ msgid "You are reporting the following update for being abusive, containing pers
msgstr "您檢舉下列問題之更為濫用,包括個人資料或相似"
#: templates/web/base/report/_updates_disallowed_message.html:2
-#: templates/web/base/report/display.html:59
+#: templates/web/base/report/display.html:56
msgid "You can <a href=\"%s\">make a new report in the same location</a>."
msgstr ""
@@ -5490,7 +5579,7 @@ msgstr ""
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>."
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:97
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr "您可以新增某位用戶到濫用者名單,它會自動隱藏(不會送出)該名用戶所提交的申報 "
@@ -5523,7 +5612,7 @@ msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件,把
msgid "You can mark a body as deleted if you do not want it to be active on the site."
msgstr "您可以刪除某一單位如果不想讓它在本站激活"
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:241
msgid "You cannot rename a category to an existing category"
msgstr ""
@@ -5533,7 +5622,7 @@ msgid "You declined; please fill in the box above"
msgstr "您受到拒絕,請填寫上方表格。"
#. ("JS")
-#: templates/web/base/js/translation_strings.html:105
+#: templates/web/base/js/translation_strings.html:107
msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
msgstr ""
@@ -5541,7 +5630,7 @@ msgstr ""
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 "您已回覆過本問卷。如果您有問題,請<href='%s'>保持聯絡</a>, 或是<a href='%s'>檢視 您作的申報</a>\n"
-#: templates/web/base/contact/enquiry/index.html:58
+#: templates/web/base/contact/enquiry/index.html:59
#, fuzzy
msgid "You have already attached files 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 "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)"
@@ -5551,8 +5640,7 @@ msgstr "在此申報中你已經附加了照片(注意你最多可附3張照片,
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 "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)"
-#: templates/web/base/questionnaire/index.html:89
-#: templates/web/base/report/update/form_update.html:16
+#: templates/web/base/report/form/photo_upload.html:13
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 ""
@@ -5619,9 +5707,9 @@ msgstr "您的申報 "
#: templates/web/base/auth/2fa/intro.html:12
#: templates/web/base/auth/change_password.html:13
-#: templates/web/base/auth/generate_token.html:15
-#: templates/web/base/auth/generate_token.html:23
-#: templates/web/base/auth/generate_token.html:31
+#: templates/web/base/auth/generate_token.html:19
+#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/generate_token.html:35
#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
msgid "Your account"
msgstr ""
@@ -5630,13 +5718,14 @@ msgstr ""
msgid "Your account requires two-factor authentication to be set up."
msgstr ""
-#: templates/web/base/alert/updates.html:30
+#: templates/web/base/alert/updates.html:32
#: templates/web/base/auth/create.html:50
#: templates/web/base/auth/general.html:56
#: templates/web/base/contact/enquiry/index.html:18
#: templates/web/base/contact/index.html:91
-#: templates/web/base/report/display_tools.html:59
-#: templates/web/base/report/form/user_loggedout_email.html:7
+#: templates/web/base/report/display_tools.html:60
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_email.html:6
#: templates/web/base/report/new/duplicate_suggestions.html:42
#: templates/web/zurich/report/new/fill_in_details_form.html:53
msgid "Your email"
@@ -5665,16 +5754,16 @@ msgstr "姓名"
msgid "Your name has already been sent to %s, but we can hide it on this page:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:301
+#: perllib/FixMyStreet/App/Controller/My.pm:316
msgid "Your name has been hidden from all your reports and updates."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:297
+#: perllib/FixMyStreet/App/Controller/My.pm:312
msgid "Your name has been hidden."
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:95
+#: templates/web/base/js/translation_strings.html:97
msgid "Your offline reports"
msgstr ""
@@ -5694,8 +5783,8 @@ msgid "Your password has expired, please create a new one below. When you click
msgstr ""
#: templates/web/base/auth/create.html:67
-#: templates/web/base/report/form/user_loggedout_by_email.html:57
-#: templates/web/base/report/form/user_loggedout_by_email.html:59
+#: templates/web/base/report/form/user_loggedout_by_email.html:80
+#: templates/web/base/report/form/user_loggedout_by_email.html:82
#: templates/web/zurich/auth/general.html:56
msgid "Your password should include %d or more characters."
msgstr ""
@@ -5728,7 +5817,7 @@ msgid "Your update"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:96
+#: templates/web/base/js/translation_strings.html:98
msgid "Your update has been saved offline for submission when back online."
msgstr ""
@@ -5759,19 +5848,19 @@ msgstr ""
#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:18
#: templates/web/base/admin/category-checkboxes.html:5
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:152
msgid "all"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:344
-#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:161
+#: perllib/FixMyStreet/DB/Result/Comment.pm:127
+#: perllib/FixMyStreet/DB/Result/Comment.pm:281
+#: perllib/FixMyStreet/DB/Result/User.pm:349
#: templates/web/base/admin/update_edit.html:92
#: templates/web/base/report/update/moderation_meta.html:2
msgid "an administrator"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:261
+#: perllib/FixMyStreet/DB/Result/Comment.pm:322
msgid "and a defect raised"
msgstr ""
@@ -5779,8 +5868,8 @@ msgstr ""
msgid "by %s"
msgstr "由 %s"
-#: templates/web/base/reports/body.html:13
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:8
+#: templates/web/base/reports/body.html:9
msgid "council"
msgstr "地方政府"
@@ -5811,6 +5900,10 @@ msgstr "用戶編輯"
msgid "from %s different users"
msgstr "從不同的用戶%s "
+#: templates/web/zurich/admin/users/form.html:24
+msgid "government-internal"
+msgstr ""
+
#: templates/web/base/report/_item_small.html:22
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
@@ -5828,7 +5921,7 @@ msgstr "不適用"
#: perllib/FixMyStreet/App/Form/Widget/Field/CheckboxGroup.pm:19
#: templates/web/base/admin/category-checkboxes.html:6
-#: templates/web/base/admin/users/form.html:168
+#: templates/web/base/admin/users/form.html:153
msgid "none"
msgstr ""
@@ -5911,12 +6004,12 @@ msgid "today"
msgstr "今天"
#. ("JS")
-#: templates/web/base/js/translation_strings.html:106
+#: templates/web/base/js/translation_strings.html:108
msgid "update"
msgstr ""
#. ("JS")
-#: templates/web/base/js/translation_strings.html:107
+#: templates/web/base/js/translation_strings.html:109
msgid "updates"
msgstr ""
@@ -5941,7 +6034,7 @@ msgid "user removed from abuse list"
msgstr ""
#: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:10
+#: templates/web/base/reports/body.html:5
msgid "ward"
msgstr "路檔"
@@ -5993,7 +6086,7 @@ msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: templates/web/fixmystreet.com/reports/summary.html:153
+#: templates/web/base/reports/index.html:120
#, perl-format
msgid "%s day"
msgid_plural "%s days"
@@ -6011,7 +6104,7 @@ msgid "%s problem reported"
msgid_plural "%s problems reported"
msgstr[0] ""
-#: templates/web/fixmystreet.com/reports/summary.html:168
+#: templates/web/base/reports/index.html:136
#, perl-format
msgid "%s report"
msgid_plural "%s reports"
@@ -6029,19 +6122,19 @@ msgid "<big>%s</big> fixed in past month"
msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "上個月解決的<big>%s</big> "
-#: templates/web/westminster/front/stats.html:8
+#: 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> 上一週的申報 "
-#: templates/web/westminster/front/stats.html:13
+#: templates/web/base/front/stats.html:13
#, perl-format
msgid "<big>%s</big> report recently"
msgid_plural "<big>%s</big> reports recently"
msgstr[0] "近期的申報 <big>%s</big> "
-#: templates/web/westminster/front/stats.html:19
+#: templates/web/base/front/stats.html:25
#, perl-format
msgid "<big>%s</big> update on reports"
msgid_plural "<big>%s</big> updates on reports"
@@ -6071,18 +6164,30 @@ msgid "last updated %d day ago"
msgid_plural "last updated %d days ago"
msgstr[0] ""
-#: templates/email/fixamingata/inactive-account.txt:8
+#: templates/email/default/inactive-account.txt:8
#, perl-format
msgid "month"
msgid_plural "months"
msgstr[0] ""
-#: templates/email/westminster/archive.txt:9
+#: templates/email/rutland/archive.html:28
#, perl-format
msgid "report"
msgid_plural "reports"
msgstr[0] ""
+#~ msgid "Closed by council"
+#~ msgstr "由地方政府關閉"
+
+#~ msgid "Filter report list"
+#~ msgstr "過濾初次申報 "
+
+#~ msgid "Invalid agency_responsible value %s"
+#~ msgstr "無效的權責單位數值 %s"
+
+#~ msgid "Post"
+#~ msgstr "張貼"
+
#~ msgid ""
#~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
#~ " <br>\n"