aboutsummaryrefslogtreecommitdiffstats
path: root/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po')
-rw-r--r--locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po2848
1 files changed, 1638 insertions, 1210 deletions
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index b527539e7..89493593d 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: 2019-04-29 18:56+0100\n"
+"POT-Creation-Date: 2020-03-03 15:29+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,23 +20,24 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:678
-#: perllib/FixMyStreet/DB/Result/Problem.pm:680
-#: perllib/FixMyStreet/Script/Reports.pm:198
+#: perllib/FixMyStreet/DB/Result/Problem.pm:714
+#: perllib/FixMyStreet/DB/Result/Problem.pm:716
+#: perllib/FixMyStreet/Script/Reports.pm:174
msgid " and "
msgstr "與"
-#: templates/web/base/js/translation_strings.html:50
-#: templates/web/base/report/new/category_extras.html:15
-#: templates/web/base/report/new/councils_text_all.html:5
-#: templates/web/base/report/new/top_message_none.html:12
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/top_message_none.html:13
#: templates/web/base/report/new/top_message_none.html:15
+#: templates/web/base/report/new/top_message_some.html:10
#: templates/web/base/report/new/top_message_some.html:12
-#: templates/web/base/report/new/top_message_some.html:9
msgid " or "
msgstr "或"
-#: templates/web/base/report/_inspect.html:171
+#: templates/web/base/report/inspect/_extra_details_field.html:5
msgid "%d characters maximum"
msgstr ""
@@ -52,8 +53,10 @@ msgstr "%d 到 %d 的 %d "
msgid "%d users already existed"
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:24
+#: templates/web/base/reports/body.html:31
msgid "%s - Summary reports"
msgstr "%s -申報總結"
@@ -76,7 +79,7 @@ msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
msgstr "%s 地方政府承辦人員 &ndash; %s 確認 %s 尚未確認"
#. ("%s is the site name")
-#: templates/web/base/alert/index.html:8
+#: templates/web/base/alert/_index_text.html:3
msgid ""
"%s has a variety of RSS feeds and email alerts for local\n"
"problems, including alerts for all problems within a particular ward, or all\n"
@@ -87,7 +90,7 @@ msgstr ""
"或是某一範圍內各類問題的通知"
#. ("%s is the site name")
-#: templates/web/base/alert/index.html:12
+#: templates/web/base/alert/_index_text.html:7
msgid ""
"%s has a variety of RSS feeds and email alerts for local problems, including\n"
"alerts for all problems within a particular ward or council, or all problems\n"
@@ -101,8 +104,8 @@ msgstr ""
msgid "%s live updates"
msgstr "%s 現場更新"
-#: templates/web/base/dashboard/index.html:164
-#: templates/web/base/dashboard/index.html:168
+#: templates/web/base/dashboard/index.html:166
+#: templates/web/base/dashboard/index.html:169
msgid "%s opened, %s closed, %s fixed"
msgstr ""
@@ -122,13 +125,13 @@ msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap
msgid "(Defect &amp; location of defect)"
msgstr "(缺陷 &amp; 缺陷地點)"
-#: templates/web/zurich/admin/report_edit-sdm.html:62
-#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/reports/edit.html:78
msgid "(No name)"
msgstr "(沒有姓名)"
-#: templates/web/zurich/admin/report_edit-sdm.html:69
-#: templates/web/zurich/admin/report_edit.html:97
+#: templates/web/zurich/admin/report_edit-sdm.html:57
+#: templates/web/zurich/admin/reports/edit.html:85
msgid "(No phone number)"
msgstr "(沒有電話號碼)"
@@ -140,7 +143,7 @@ msgstr ""
msgid "(closed)"
msgstr "(結束)"
-#: templates/web/base/alert/_list.html:30
+#: templates/web/base/alert/_list_rss_local.html:8
msgid "(covers roughly 200,000 people)"
msgstr ""
@@ -148,10 +151,6 @@ msgstr ""
msgid "(fixed)"
msgstr "(己處理)"
-#: templates/web/base/admin/extra-metadata-form.html:63
-msgid "(ignored if type is \"String\")"
-msgstr ""
-
#: templates/web/base/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )"
@@ -178,13 +177,13 @@ msgid "(sent to both)"
msgstr "兩個都送出"
#. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]")
-#: templates/web/base/alert/_list.html:36
+#: templates/web/base/alert/_list.html:29
msgid "(we also have RSS feeds for problems within %s)"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:251
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:710
-#: perllib/FixMyStreet/DB/Result/Problem.pm:386
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:764
+#: templates/web/zurich/admin/bodies/form.html:27
msgid "-- Pick a category --"
msgstr "選擇分類"
@@ -192,6 +191,11 @@ msgstr "選擇分類"
msgid "-- Pick an option --"
msgstr ""
+#: templates/web/base/contact/enquiry/index.html:35
+#, fuzzy
+msgid "-- Please select --"
+msgstr "請選擇單位"
+
#: templates/web/base/admin/response_templates_select.html:3
msgid "--Choose a template--"
msgstr ""
@@ -214,11 +218,13 @@ msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
msgstr ""
#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:70
+#: templates/web/base/admin/triage/_list-filters.html:23
+#: templates/web/base/reports/_list-filters.html:39
msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
msgstr ""
-#: templates/web/base/js/translation_strings.html:101
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:104
msgid "<span>%s</span> saved."
msgstr ""
@@ -243,23 +249,29 @@ msgstr "<strong>不</strong> 我要用電子郵件收到更新通知"
msgid "<strong>No</strong> Let me confirm my update by email/text"
msgstr ""
-#: templates/web/base/report/_inspect.html:200
-msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
-msgstr ""
-
-#: templates/web/base/report/_inspect.html:202
-msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
-msgstr ""
-
#: templates/web/base/report/form/user_loggedout_password.html:4
msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>是</strong> 我有密碼"
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:78
+msgid "<u>Take or choose existing photo</u>"
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:12
+msgid "A service ID (Open311 or similar)."
+msgstr ""
+
#: templates/web/base/report/new/form_user.html:8
msgid "About the problem"
msgstr ""
-#: templates/web/base/auth/generate_token.html:54
+#: perllib/FixMyStreet/App/Controller/Root.pm:128
+msgid "Access denied"
+msgstr ""
+
+#: templates/web/base/auth/2fa/intro.html:20
+#: templates/web/base/auth/generate_token.html:61
msgid "Activate two-factor authentication"
msgstr ""
@@ -283,13 +295,18 @@ msgstr ""
msgid "Add a contact using the form below."
msgstr "增加聯絡人請使用下方表單"
+#: templates/web/base/admin/bodies/contact-form.html:101
+#, fuzzy
+msgid "Add another parent category"
+msgstr "新增種類"
+
#: templates/web/base/admin/bodies/form.html:139
#: templates/web/base/admin/bodies/index.html:78
-#: templates/web/zurich/admin/bodies/form.html:51
+#: templates/web/zurich/admin/bodies/form.html:63
msgid "Add body"
msgstr "新增有關單位"
-#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:2
#: templates/web/base/auth/change_email.html:7
msgid "Add email address"
msgstr ""
@@ -298,7 +315,7 @@ msgstr ""
msgid "Add extra fields"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:89
+#: templates/web/base/admin/extra-metadata-form.html:11
msgid "Add field"
msgstr ""
@@ -306,16 +323,16 @@ msgstr ""
msgid "Add fixed state"
msgstr ""
-#: templates/web/base/admin/bodies/body.html:127
+#: templates/web/base/admin/bodies/body.html:146
#: templates/web/zurich/admin/bodies/body.html:33
msgid "Add new category"
msgstr "新增種類"
-#: templates/web/base/admin/extra-metadata-form.html:82
+#: templates/web/base/admin/extra-metadata-item.html:87
msgid "Add option"
msgstr ""
-#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:2
#: templates/web/base/auth/change_phone.html:7
msgid "Add phone number"
msgstr ""
@@ -329,24 +346,25 @@ msgid "Add to shortlist"
msgstr ""
#: templates/web/base/admin/users/edit.html:4
-#: templates/web/base/admin/users/index.html:48
-#: templates/web/base/admin/users/index.html:51
+#: templates/web/base/admin/users/index.html:95
+#: templates/web/base/admin/users/index.html:98
msgid "Add user"
msgstr "新增使用者"
-#: perllib/FixMyStreet/Cobrand/Default.pm:736
+#: perllib/FixMyStreet/Cobrand/Default.pm:777
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:209
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:738
+#: perllib/FixMyStreet/Cobrand/Default.pm:779
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:737
+#: perllib/FixMyStreet/Cobrand/Default.pm:778
msgid "Add/edit response templates"
msgstr ""
-#: templates/web/base/my/my.html:115
+#: templates/web/base/my/my.html:119
msgid "Added %s"
msgstr "新增 %s"
@@ -354,7 +372,7 @@ msgstr "新增 %s"
msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
msgstr ""
-#: templates/web/base/main_nav_items.html:55
+#: templates/web/base/main_nav_items.html:39
msgid "Admin"
msgstr ""
@@ -370,19 +388,20 @@ msgstr "%s創建之 %d通知, 種類 %s, 參數 %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "%d 關閉通知 "
-#: templates/web/base/report/form/user_loggedout_by_email.html:50
+#: templates/web/base/report/form/user_loggedout_by_email.html:46
#: templates/web/base/report/update/form_user_loggedin.html:35
msgid "Alert me to future updates"
msgstr "通知我此事後續"
-#: templates/web/base/admin/report_edit.html:91
+#: templates/web/base/admin/reports/edit.html:96
msgid "Alerts:"
msgstr ""
#: templates/web/base/dashboard/index.html:40
-#: templates/web/base/dashboard/index.html:51
-#: templates/web/base/dashboard/index.html:64
-#: templates/web/base/reports/_list-filters.html:4
+#: 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/reports/_list-filter-status.html:2
msgid "All"
msgstr ""
@@ -395,8 +414,8 @@ msgid "All Reports as CSV"
msgstr "所有事件申報存成CSV格式"
#: templates/web/base/admin/category-multiselect.html:5
-#: templates/web/base/admin/responsepriorities/list.html:20
-#: templates/web/base/admin/templates.html:19
+#: templates/web/base/admin/responsepriorities/index.html:26
+#: templates/web/base/admin/templates/view.html:19
msgid "All categories"
msgstr ""
@@ -408,9 +427,9 @@ msgstr ""
msgid "All languages"
msgstr ""
-#: templates/web/base/main_nav_items.html:0
-#: templates/web/base/main_nav_items.html:35
-#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/base/navigation/_all_reports.html:0
+#: templates/web/base/navigation/_all_reports.html:12
+#: templates/web/zurich/admin/index-dm.html:14
#: templates/web/zurich/admin/stats/index.html:11
#: templates/web/zurich/footer.html:20
#: templates/web/zurich/nav_over_content.html:6
@@ -437,7 +456,17 @@ msgstr ""
msgid "Always fetch all problems"
msgstr ""
-#: templates/web/base/questionnaire/index.html:31
+#: templates/web/base/admin/bodies/contact-form.html:10
+#: templates/web/base/admin/bodies/contact-form.html:16
+msgid "An email address or service ID (Open311 or similar)."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:14
+#, fuzzy
+msgid "An email address."
+msgstr "您的電子郵件"
+
+#: templates/web/base/questionnaire/index.html:33
msgid "An update marked this problem as fixed."
msgstr "本問題已解決之更新標註"
@@ -451,7 +480,7 @@ msgstr "匿名"
msgid "Anonymous user"
msgstr ""
-#: templates/web/base/admin/report_edit.html:130
+#: templates/web/base/admin/reports/edit.html:135
#: 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
@@ -463,24 +492,29 @@ msgstr "匿名:"
msgid "Another user"
msgstr ""
-#: templates/web/base/js/translation_strings.html:76
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:79
msgid "Are you sure you want to cancel this upload?"
msgstr ""
-#: templates/web/base/admin/report_edit.html:85
-#: templates/web/base/admin/template_edit.html:91
-#: templates/web/base/js/translation_strings.html:96
-#: templates/web/base/report/display_tools.html:6
+#. ("JS")
+#: templates/web/base/admin/manifesttheme/form.html:62
+#: 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/report/display_tools.html:7
msgid "Are you sure?"
msgstr ""
#: templates/web/base/admin/bodies/body.html:21
#: templates/web/base/admin/bodies/form.html:77
-#: templates/web/zurich/admin/bodies/form.html:24
+#: templates/web/zurich/admin/bodies/form.html:36
msgid "Area covered"
msgstr "涵蓋區域"
-#: templates/web/base/admin/users/form.html:82
+#: templates/web/base/admin/users/form.html:85
msgid "Area:"
msgstr ""
@@ -489,28 +523,33 @@ msgstr ""
msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category."
msgstr "作為一個支援平台 %s出錯,本站所作的申報將送達給申報者,而不是申報類別下提供的承辦人員。  "
-#: templates/web/zurich/admin/report_edit.html:211
+#: templates/web/base/admin/users/index.html:73
+#, fuzzy
+msgid "Assign selected to role:"
+msgstr "派給 %s"
+
+#: templates/web/zurich/admin/reports/edit.html:199
msgid "Assign to competent body:"
msgstr "分派給適任的機關 "
-#: templates/web/zurich/admin/report_edit.html:170
+#: templates/web/zurich/admin/reports/edit.html:158
#: templates/web/zurich/admin/stats/index.html:57
msgid "Assign to different category:"
msgstr "歸至其它種類"
-#: templates/web/zurich/admin/report_edit.html:209
+#: templates/web/zurich/admin/reports/edit.html:197
msgid "Assign to external body:"
msgstr "分派給外部機:"
-#: templates/web/zurich/admin/report_edit.html:188
+#: templates/web/zurich/admin/reports/edit.html:176
msgid "Assign to subdivision:"
msgstr "交派給下級單位:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:733
+#: perllib/FixMyStreet/Cobrand/Default.pm:774
msgid "Assign users to areas"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:183
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:185
msgid "Assigned to %s"
msgstr "派給 %s"
@@ -522,31 +561,22 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求,依
msgid "At the moment only searching for and looking at reports work."
msgstr "目前僅提供部份查詢與查閱"
-#: templates/web/base/admin/users/form.html:98
#: templates/web/base/admin/users/form.html:99
msgid "Authorised staff users can be associated with the categories in which they operate."
msgstr ""
-#: templates/web/base/admin/templates.html:9
+#: templates/web/base/admin/templates/view.html:9
msgid "Auto Response"
msgstr ""
-#: templates/web/base/admin/template_edit.html:80
+#: templates/web/base/admin/templates/edit.html:77
msgid "Auto-response:"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:14
-msgid "Automated"
-msgstr ""
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:762
msgid "Automatically populate report subject/detail"
msgstr ""
-#: templates/web/base/admin/report-category.html:8
-msgid "Available categories"
-msgstr ""
-
#: templates/web/base/reports/index.html:112
msgid "Average time between a problem being reported and being fixed, last 100 reports."
msgstr ""
@@ -555,12 +585,13 @@ msgstr ""
msgid "Avoid personal information and vehicle number plates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:349
+#: perllib/FixMyStreet/DB/Result/Problem.pm:342
#: templates/web/zurich/report/_item.html:11
msgid "Awaiting moderation"
msgstr "待核可"
-#: templates/web/base/js/translation_strings.html:43
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:45
msgid "Back"
msgstr "回上層"
@@ -568,29 +599,39 @@ msgstr "回上層"
msgid "Back to all reports"
msgstr ""
+#: templates/web/base/admin/manifesttheme/index.html:9
+msgid "Background Colour"
+msgstr ""
+
#: templates/web/base/admin/report_blocks.html:18
msgid "Ban user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:647
-#: perllib/FixMyStreet/Cobrand/Default.pm:735
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:408
+#: templates/web/base/admin/extra-metadata-item.html:35
+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
#: templates/web/base/admin/bodies/index.html:1
-#: templates/web/base/admin/report_edit.html:56
-#: templates/web/zurich/header.html:49
+#: templates/web/base/admin/reports/edit.html:56
+#: templates/web/zurich/header.html:52
msgid "Bodies"
msgstr "有關單位"
#: templates/web/base/admin/flagged.html:17
-#: templates/web/base/admin/index.html:63
-#: templates/web/base/admin/reports.html:15
+#: templates/web/base/admin/index.html:69
+#: templates/web/base/admin/reports/index.html:15
#: templates/web/base/admin/users/import.html:25
#: templates/web/base/admin/users/import.html:48
-#: templates/web/base/admin/users/index.html:18
+#: templates/web/base/admin/users/index.html:45
msgid "Body"
msgstr "有關單位"
-#: templates/web/base/admin/users/form.html:50
+#: templates/web/base/admin/users/form.html:53
msgid "Body:"
msgstr "有關單位:"
@@ -598,10 +639,6 @@ msgstr "有關單位:"
msgid "CSV File"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:46
-msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
-msgstr ""
-
#: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20
msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
msgstr "你的信箱中找不到我們的來信嗎?先檢查看看垃圾回收桶,通常99%的問題可獲解決"
@@ -610,39 +647,42 @@ msgstr "你的信箱中找不到我們的來信嗎?先檢查看看垃圾回收
msgid "Can't see the map? <em>Skip this step</em>"
msgstr "無法顯示地圖? <em>略過本步驟</em>"
-#: perllib/FixMyStreet/Cobrand/Default.pm:647
-#: templates/web/base/admin/responsepriorities/list.html:8
-#: templates/web/base/admin/templates.html:7
+#: perllib/FixMyStreet/Cobrand/Default.pm:693
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:325
+#: templates/web/base/admin/responsepriorities/index.html:8
+#: templates/web/base/admin/templates/view.html:7
msgid "Categories"
msgstr ""
-#: templates/web/base/admin/category-checkboxes.html:2
+#: templates/web/base/admin/category-checkboxes.html:26
#: templates/web/base/admin/category-multiselect.html:2
+#: templates/web/base/admin/responsepriorities/edit.html:31
msgid "Categories:"
msgstr ""
+#: templates/web/base/admin/bodies/_category_field.html:12
#: templates/web/base/admin/bodies/body.html:73
-#: templates/web/base/admin/bodies/contact-form.html:19
#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/dashboard/index.html:100
-#: templates/web/base/report/_inspect.html:72
-#: templates/web/base/report/_item.html:64
-#: templates/web/base/report/new/category.html:22
+#: 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/new/category.html:23
#: templates/web/base/report/new/category_wrapper.html:3
#: templates/web/zurich/admin/bodies/body.html:14
-#: templates/web/zurich/admin/index-dm.html:23
+#: 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.html:13
+#: 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"
msgstr "類別"
-#: templates/web/base/dashboard/index.html:103
+#: templates/web/base/dashboard/index.html:104
msgid "Category and State"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:618
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:412
msgid "Category changed from ‘%s’ to ‘%s’"
msgstr ""
@@ -651,12 +691,12 @@ msgstr ""
msgid "Category fix rate for problems > 4 weeks old"
msgstr "4週前己修復問題之類別"
-#: templates/web/base/admin/report_edit.html:126
+#: templates/web/base/admin/reports/edit.html:131
#: templates/web/base/dashboard/index.html:39
#: templates/web/base/report/update/moderation_diff.html:7
#: templates/web/zurich/admin/bodies/contact-form.html:8
-#: templates/web/zurich/admin/report_edit-sdm.html:72
-#: templates/web/zurich/admin/report_edit.html:100
+#: templates/web/zurich/admin/report_edit-sdm.html:60
+#: templates/web/zurich/admin/reports/edit.html:88
msgid "Category:"
msgstr "類別:"
@@ -665,54 +705,38 @@ msgstr "類別:"
msgid "Change"
msgstr ""
-#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:2
#: templates/web/base/auth/change_email.html:3
msgid "Change email address"
msgstr ""
-#: templates/web/base/auth/change_password.html:1
+#: templates/web/base/auth/change_password.html:2
#: templates/web/base/auth/change_password.html:5
-#: templates/web/base/my/my.html:65
+#: templates/web/base/my/my.html:64 templates/web/base/my/my.html:68
msgid "Change password"
msgstr "更換密碼"
-#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:2
#: templates/web/base/auth/change_phone.html:3
msgid "Change phone number"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:80
-msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
+#: templates/web/base/auth/generate_token.html:56
+msgid "Change two-factor authentication"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:64
-msgid ""
-"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
-" <br>\n"
-" Normally, categories are not private.\n"
-" <br>\n"
-" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
-" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
-" at a specific address."
-msgstr ""
-"檢查 <strong>私人類別</strong> 如果申報在此類別下 <strong>將不會公開在網頁上</strong>\n"
-"<br>\n"
-"一般而言類別不會設為私人\n"
-"<br>\n"
-"這類問題適合於用戶申報給有關機關,但公開申報資料並無公益性\n"
-"例如在英國想在某特定地點要求多安置垃圾筒"
-
-#: templates/web/base/admin/bodies/contact-form.html:11
+#: templates/web/base/admin/bodies/_category_field.html:3
msgid ""
"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
" to the body too. These will appear in the drop-down menu on the report-a-problem page."
msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。"
-#: templates/web/base/report/_inspect.html:127
+#: templates/web/base/report/_inspect.html:44
msgid "Choose another"
msgstr ""
-#: templates/web/base/js/translation_strings.html:95
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:98
msgid "Clear offline data"
msgstr ""
@@ -749,57 +773,61 @@ msgid "Close"
msgstr ""
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:159
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:158
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:161
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:72
#: templates/web/base/admin/states/index.html:103
#: templates/web/base/admin/states/index.html:27
#: templates/web/base/admin/states/index.html:33
-#: templates/web/base/dashboard/index.html:117
+#: templates/web/base/dashboard/index.html:118
#: templates/web/zurich/admin/stats/index.html:52
msgid "Closed"
msgstr "關閉"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:866
+#: perllib/FixMyStreet/DB/Result/Problem.pm:905
msgid "Closed by council"
msgstr "由地方政府關閉"
-#: templates/web/base/admin/report_edit.html:176
+#: templates/web/base/admin/reports/edit.html:181
msgid "Closed to updates"
msgstr ""
-#: templates/web/base/admin/report_edit.html:38
+#: templates/web/base/admin/reports/edit.html:38
msgid "Co-ordinates:"
msgstr "協同單位:"
#: templates/web/base/admin/list_updates.html:10
+#: templates/web/base/admin/manifesttheme/index.html:6
#: templates/web/base/admin/reportextrafields/edit.html:24
#: templates/web/base/admin/reportextrafields/index.html:7
msgid "Cobrand"
msgstr "聯合品牌"
-#: templates/web/base/admin/report_edit.html:94
+#: templates/web/base/admin/reports/edit.html:99
#: templates/web/base/admin/update_edit.html:54
msgid "Cobrand data:"
msgstr "聯合品牌資料:"
-#: templates/web/base/admin/report_edit.html:93
+#: templates/web/base/admin/reports/edit.html:98
#: templates/web/base/admin/update_edit.html:53
msgid "Cobrand:"
msgstr "聯合品牌:"
-#: templates/web/base/admin/extra-metadata-form.html:24
-#: templates/web/base/auth/2faform.html:17
+#: templates/web/base/admin/extra-metadata-item.html:29
+#: templates/web/base/auth/2fa/form-add.html:11
+#: templates/web/base/auth/2fa/form.html:17
#: templates/web/base/auth/smsform.html:24
msgid "Code"
msgstr ""
-#: templates/web/base/js/translation_strings.html:67
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:69
msgid "Collapse map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:642
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:422
+#: perllib/FixMyStreet/Cobrand/Default.pm:687
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:321
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:432
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr "設定"
@@ -808,12 +836,12 @@ msgstr "設定"
msgid "Confirm"
msgstr "確認"
-#: templates/web/base/auth/2faform.html:1
+#: templates/web/base/auth/2fa/form.html:1
#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
msgid "Confirm account"
msgstr "確認帳戶"
-#: templates/web/base/report/form/user_loggedout_password.html:30
+#: templates/web/base/report/form/user_loggedout_password.html:26
msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
msgstr ""
@@ -825,16 +853,16 @@ msgstr ""
msgid "Confirmation"
msgstr "確認"
-#: templates/web/base/admin/bodies/contact-form.html:56
+#: templates/web/base/admin/bodies/contact-form.html:30
#: templates/web/base/admin/users/alerts.html:10
-#: templates/web/zurich/admin/bodies/contact-form.html:35
+#: templates/web/zurich/admin/bodies/contact-form.html:39
#: templates/web/zurich/admin/stats/index.html:61
msgid "Confirmed"
msgstr "已確認"
#: templates/web/base/admin/list_updates.html:40
#: templates/web/base/admin/problem_row.html:36
-#: templates/web/base/admin/report_edit.html:79
+#: templates/web/base/admin/reports/edit.html:79
msgid "Confirmed:"
msgstr "已確認:"
@@ -849,10 +877,12 @@ msgstr "聯絡 %s"
msgid "Contact Us"
msgstr "連絡我們"
-#: templates/web/base/contact/index.html:15
+#: templates/web/base/contact/index.html:18
msgid "Contact the team"
msgstr "連結本團隊"
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:62
#: templates/web/base/report/form/user.html:8
msgid "Continue"
msgstr ""
@@ -865,17 +895,13 @@ msgstr ""
msgid "Convert location from Easting/Northing"
msgstr ""
-#: templates/web/zurich/admin/report_edit-sdm.html:42
-#: templates/web/zurich/admin/report_edit.html:61
-msgid "Coordinates:"
-msgstr "協同單位:"
-
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:723
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:753
msgid "Could not find user"
msgstr "找不到該戶用"
-#: templates/web/base/js/translation_strings.html:53
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:55
msgid "Could not look up location"
msgstr "找不到此地點"
@@ -895,7 +921,7 @@ msgstr "聯繋地方政府 %s"
msgid "Council ref:&nbsp;%s"
msgstr "地方政府流水號 ref:&nbsp;%s"
-#: templates/web/base/dashboard/index.html:50
+#: templates/web/base/dashboard/index.html:51
msgid "Council:"
msgstr "地方政府"
@@ -904,6 +930,8 @@ msgstr "地方政府"
msgid "Count"
msgstr "數量"
+#: templates/web/base/admin/manifesttheme/index.html:31
+#: templates/web/base/admin/roles/index.html:32
#: templates/web/base/admin/states/index.html:114
msgid "Create"
msgstr ""
@@ -912,38 +940,42 @@ msgstr ""
msgid "Create a report"
msgstr "創建申報"
-#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:7
msgid "Create an account"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:156
-#: templates/web/zurich/admin/bodies/contact-form.html:49
+#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/zurich/admin/bodies/contact-form.html:51
msgid "Create category"
msgstr "創建類別"
-#: templates/web/base/admin/responsepriorities/edit.html:58
+#: templates/web/base/admin/responsepriorities/edit.html:41
+#: templates/web/base/admin/responsepriorities/index.html:41
msgid "Create priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:765
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:200
msgid "Create reports/updates as anonymous user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:719
+#: perllib/FixMyStreet/Cobrand/Default.pm:766
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:201
msgid "Create reports/updates as the council"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:717
+#: perllib/FixMyStreet/Cobrand/Default.pm:764
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:199
msgid "Create reports/updates on a user's behalf"
msgstr ""
-#: templates/web/base/admin/template_edit.html:87
-#: templates/web/zurich/admin/template_edit.html:29
+#: templates/web/base/admin/templates/edit.html:84
+#: templates/web/zurich/admin/templates/edit.html:32
msgid "Create template"
msgstr "創建模版"
#: templates/web/base/admin/problem_row.html:34
-#: templates/web/zurich/admin/templates.html:10
+#: templates/web/zurich/admin/templates/view.html:10
msgid "Created"
msgstr "建立"
@@ -952,7 +984,7 @@ msgid "Created %d new users"
msgstr ""
#: templates/web/base/admin/list_updates.html:39
-#: templates/web/base/admin/report_edit.html:78
+#: templates/web/base/admin/reports/edit.html:78
#: templates/web/base/admin/update_edit.html:55
#: templates/web/zurich/admin/update_edit.html:29
msgid "Created:"
@@ -962,11 +994,11 @@ msgstr "建立:"
msgid "Current password:"
msgstr ""
-#: templates/web/base/auth/generate_token.html:46
+#: templates/web/base/auth/generate_token.html:72
msgid "Current token:"
msgstr ""
-#: templates/web/base/dashboard/index.html:92
+#: templates/web/base/dashboard/index.html:93
msgid "Currently grouped by %s"
msgstr ""
@@ -975,19 +1007,19 @@ msgstr ""
msgid "Currently no bodies have been created."
msgstr "目前未創建內文"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:871
-#: templates/web/zurich/admin/report_edit-sdm.html:105
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
+#: templates/web/zurich/admin/report_edit-sdm.html:92
msgid "Customer not contactable"
msgstr "無法聨絡上的客戶"
-#: templates/web/base/dashboard/index.html:7
+#: templates/web/base/dashboard/index.html:8
#: templates/web/base/dashboard/index.html:9
#: templates/web/base/reports/index.html:15
#: templates/web/base/reports/index.html:18
msgid "Dashboard"
msgstr "控制台"
-#: templates/web/base/auth/generate_token.html:54
+#: templates/web/base/auth/generate_token.html:58
msgid "Deactivate two-factor authentication"
msgstr ""
@@ -995,35 +1027,33 @@ msgstr ""
msgid "Dealt with by subdivision within 5 working days"
msgstr "下屬單位5個工作天內處理。"
-#: templates/web/base/admin/responsepriorities/list.html:9
+#: templates/web/base/admin/responsepriorities/index.html:9
msgid "Default"
msgstr ""
-#: templates/web/base/admin/responsepriorities/edit.html:39
-msgid "Default priority"
-msgstr ""
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Default.pm:767
msgid "Default to creating reports/updates as the council"
msgstr ""
-#: templates/web/base/report/_inspect.html:96
-msgid "Defect type"
-msgstr ""
-
+#: templates/web/base/admin/roles/form.html:25
#: templates/web/base/admin/users/alerts.html:15
msgid "Delete"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:773
-#: templates/web/base/admin/template_edit.html:91
-#: templates/web/zurich/admin/template_edit.html:33
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:79
+#: templates/web/base/admin/templates/edit.html:88
+#: templates/web/zurich/admin/templates/edit.html:36
msgid "Delete template"
msgstr "刪除模版"
-#: templates/web/base/admin/bodies/contact-form.html:58
+#: templates/web/base/admin/manifesttheme/form.html:62
+#, fuzzy
+msgid "Delete theme"
+msgstr "刪除模版"
+
+#: templates/web/base/admin/bodies/contact-form.html:40
#: templates/web/base/admin/bodies/index.html:31
-#: templates/web/zurich/admin/bodies/contact-form.html:36
+#: templates/web/zurich/admin/bodies/contact-form.html:41
msgid "Deleted"
msgstr "刪除"
@@ -1032,49 +1062,45 @@ msgstr "刪除"
msgid "Describe why you are moderating this"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:42
-#: templates/web/base/admin/responsepriorities/list.html:7
-#: templates/web/zurich/admin/index-dm.html:22
+#: 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.html:12
+#: templates/web/zurich/admin/reports/index.html:12
msgid "Description"
msgstr "描述"
-#: templates/web/base/admin/responsepriorities/edit.html:17
-msgid "Description:"
-msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:7
+#, fuzzy
+msgid "Destination"
+msgstr "描述"
-#: perllib/FixMyStreet/App/Controller/Report.pm:416
+#: perllib/FixMyStreet/App/Controller/Report.pm:442
msgid "Detailed information is limited to %d characters."
msgstr ""
+#. ("JS")
#: templates/web/base/admin/users/alerts.html:12
-#: templates/web/base/js/translation_strings.html:45
+#: templates/web/base/js/translation_strings.html:47
#: templates/web/zurich/report/new/fill_in_details_form.html:45
msgid "Details"
msgstr "細節"
-#: templates/web/base/admin/report_edit.html:119
+#: templates/web/base/admin/reports/edit.html:124
#: templates/web/base/report/update/moderation_diff.html:3
#: templates/web/zurich/admin/report_edit-sdm.html:29
-#: templates/web/zurich/admin/report_edit.html:31
-#: templates/web/zurich/admin/report_edit.html:45
+#: templates/web/zurich/admin/reports/edit.html:31
+#: templates/web/zurich/admin/reports/edit.html:45
msgid "Details:"
msgstr "細節:"
-#: templates/web/base/dashboard/index.html:104
+#: templates/web/base/dashboard/index.html:105
msgid "Device and Site"
msgstr ""
-#: templates/web/base/admin/bodies/body.html:93
+#: templates/web/base/admin/bodies/body.html:94
msgid "Devolved"
msgstr "下放"
-#: templates/web/zurich/admin/report_edit-sdm.html:52
-#: templates/web/zurich/admin/report_edit.html:71
-msgid "Didn't use map"
-msgstr "不使用地圖"
-
#: templates/web/base/admin/bodies/edit-league.html:8
msgid "Diligency prize league table"
msgstr "勤奮表現名單"
@@ -1083,6 +1109,15 @@ msgstr "勤奮表現名單"
msgid "Disable"
msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:58
+#: templates/web/base/admin/extra-metadata-item.html:99
+msgid "Disable form when this category is selected"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-option.html:18
+msgid "Disable form when this option is selected"
+msgstr ""
+
#: templates/web/base/admin/users/alerts.html:23
msgid "Disabled:"
msgstr ""
@@ -1092,6 +1127,14 @@ msgstr ""
msgid "Discard changes"
msgstr ""
+#: templates/web/base/admin/extra-metadata-item.html:67
+msgid "Display as"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-option.html:10
+msgid "Displayed label"
+msgstr ""
+
#: templates/web/base/admin/bodies/open311-form-fields.html:107
msgid "Do not send email alerts on fetched comments to problem creator"
msgstr ""
@@ -1101,15 +1144,11 @@ msgstr ""
msgid "Do you have a %s password?"
msgstr "您是否有 %s密碼? "
-#: templates/web/base/report/_inspect.html:111
-msgid "Do you want to automatically raise a defect?"
-msgstr ""
-
-#: templates/web/base/questionnaire/index.html:41
+#: templates/web/base/questionnaire/index.html:43
msgid "Don&rsquo;t know"
msgstr "不知道"
-#: templates/web/base/contact/index.html:124
+#: templates/web/base/contact/index.html:128
msgid "Don't like forms?"
msgstr "不喜歡此表單?"
@@ -1117,19 +1156,24 @@ msgstr "不喜歡此表單?"
msgid "Down one"
msgstr ""
-#: templates/web/base/js/translation_strings.html:75
-msgid "Drag and drop photos here or <u>click to upload</u>"
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:77
+msgid "Drag photos here or <u>browse photos</u>"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:70
+msgid "Drop-down list"
msgstr ""
-#: templates/web/base/report/_inspect.html:122
+#: templates/web/base/report/_inspect.html:39
msgid "Duplicate of"
msgstr ""
-#: templates/web/base/report/_inspect.html:132
+#: templates/web/base/report/_inspect.html:49
msgid "Duplicates"
msgstr ""
-#: templates/web/base/admin/bodies/body.html:117
+#: templates/web/base/admin/bodies/body.html:136
msgid ""
"Each contact for the body has a category, which is displayed to the public. \n"
" Different categories <strong>can have the same contact</strong> (email address).\n"
@@ -1140,32 +1184,35 @@ msgstr ""
"不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n"
"這表示你可以多加一些類別,即使你只聯絡一位承辦人員。"
-#: templates/web/base/report/_inspect.html:35
-#: templates/web/base/report/_item.html:55
+#: templates/web/base/report/_item.html:65
+#: templates/web/base/report/inspect/information.html:22
msgid "Easting/Northing:"
msgstr ""
#: templates/web/base/admin/list_updates.html:44
+#: templates/web/base/admin/manifesttheme/index.html:22
#: templates/web/base/admin/problem_row.html:43
-#: templates/web/base/admin/responsepriorities/list.html:28
-#: templates/web/base/admin/templates.html:31
-#: templates/web/base/admin/users/index.html:34
+#: templates/web/base/admin/responsepriorities/index.html:34
+#: 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/templates.html:20
+#: templates/web/zurich/admin/templates/view.html:20
msgid "Edit"
msgstr "編輯"
-#: templates/web/base/admin/bodies/body.html:142
-#: templates/web/base/admin/index.html:39
+#: templates/web/base/admin/bodies/body.html:161
+#: templates/web/base/admin/index.html:43
#: templates/web/zurich/admin/bodies/body.html:47
msgid "Edit body details"
msgstr "編輯有關單位細節"
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:772
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:206
msgid "Edit other users' permissions"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:757
msgid "Edit report category"
msgstr ""
@@ -1173,15 +1220,17 @@ msgstr ""
msgid "Edit report details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:758
msgid "Edit report priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:756
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:198
msgid "Edit reports"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:771
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:205
msgid "Edit users' details/search for their reports"
msgstr ""
@@ -1189,13 +1238,13 @@ msgstr ""
msgid "Edit your update"
msgstr ""
-#: templates/web/base/admin/report_edit.html:0
-#: templates/web/base/admin/report_edit.html:15
-#: templates/web/base/admin/report_edit.html:6
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/base/admin/reports/edit.html:0
+#: templates/web/base/admin/reports/edit.html:15
+#: templates/web/base/admin/reports/edit.html:6
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:6
-#: templates/web/zurich/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit.html:6
+#: templates/web/zurich/admin/reports/edit.html:2
+#: templates/web/zurich/admin/reports/edit.html:6
msgid "Editing problem %d"
msgstr "編輯問題 %d"
@@ -1217,7 +1266,10 @@ msgstr "編輯器"
#: templates/web/base/admin/flagged.html:38
#: templates/web/base/admin/users/import.html:24
#: templates/web/base/admin/users/import.html:47
-#: templates/web/base/admin/users/index.html:17
+#: templates/web/base/admin/users/index.html:44
+#: templates/web/base/alert/updates.html:21
+#: templates/web/base/report/display_tools.html:50
+#: 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
#: templates/web/zurich/auth/general.html:14
@@ -1225,15 +1277,14 @@ msgstr "編輯器"
msgid "Email"
msgstr "電子郵件"
-#: templates/web/base/admin/bodies/contact-form.html:38
-#: templates/web/base/alert/_list.html:74
+#: templates/web/base/alert/_list.html:69
#: 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:42
+#: templates/web/base/report/form/user_loggedout_by_email.html:38
#: templates/web/base/report/new/form_user_loggedin.html:60
msgid "Email address (optional)"
msgstr ""
@@ -1246,21 +1297,21 @@ msgstr "建立電郵通知"
msgid "Email alert deleted"
msgstr "取消電郵通知"
-#: templates/web/base/auth/general.html:99
+#: templates/web/base/auth/general.html:106
msgid "Email me a link or text me a code to sign in"
msgstr ""
-#: templates/web/base/auth/general.html:101
+#: templates/web/base/auth/general.html:108
msgid "Email me a link to sign in"
msgstr ""
-#: templates/web/base/admin/users/form.html:25
+#: templates/web/base/admin/users/form.html:28
msgid "Email verified:"
msgstr ""
-#: templates/web/base/admin/report_edit.html:146
-#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36
-#: templates/web/zurich/admin/bodies/contact-form.html:18
+#: 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/zurich/admin/bodies/contact-form.html:23
msgid "Email:"
msgstr "電子郵件:"
@@ -1319,7 +1370,7 @@ msgstr ""
msgid "Enabling this will suppress the error message that is normally emitted when an update has no description"
msgstr ""
-#: templates/web/base/dashboard/index.html:78
+#: templates/web/base/dashboard/index.html:79
msgid "End Date"
msgstr ""
@@ -1327,11 +1378,12 @@ msgstr ""
msgid "Endpoint"
msgstr "結束點"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:81
-msgid "Enter a Z&uuml;rich street name"
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:83
+#, fuzzy
+msgid "Enter a Zürich street name"
msgstr "輸入街道名稱 "
-#: perllib/FixMyStreet/Cobrand/UK.pm:16
+#: perllib/FixMyStreet/Cobrand/UK.pm:21
msgid "Enter a nearby UK postcode, or street name and area"
msgstr "輸入本區的郵編,街名或區域。"
@@ -1340,7 +1392,6 @@ msgstr "輸入本區的郵編,街名或區域。"
msgid "Enter a nearby postcode, or street name and area"
msgstr "輸入本區的郵編,街名或區域。"
-#: templates/web/base/around/postcode_form.html:7
#: templates/web/base/around/postcode_form.html:8
msgid "Enter a nearby street name and area"
msgstr "輸入最近的街名或地區"
@@ -1349,8 +1400,9 @@ msgstr "輸入最近的街名或地區"
msgid "Enter details of the problem"
msgstr "請在此填寫問題的細節"
+#. ("JS")
#: templates/web/base/errors/generic.html:1
-#: templates/web/base/errors/generic.html:8
+#: templates/web/base/js/translation_strings.html:7
#: templates/web/base/tokens/abuse.html:1
#: templates/web/base/tokens/abuse.html:3
#: templates/web/base/tokens/error.html:1
@@ -1358,8 +1410,10 @@ msgstr "請在此填寫問題的細節"
msgid "Error"
msgstr "錯誤"
-#: templates/web/base/reports/_list-filters.html:50
-#: templates/web/base/reports/_list-filters.html:59
+#: templates/web/base/admin/triage/_list-filters.html:12
+#: 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
msgid "Everything"
msgstr "一切"
@@ -1372,7 +1426,7 @@ msgstr "郵遞區號範例 %s"
msgid "Examples:"
msgstr "範例:"
-#: templates/web/base/admin/report-category.html:3
+#: templates/web/base/admin/report-category.html:10
msgid "Existing category"
msgstr ""
@@ -1380,20 +1434,20 @@ msgstr ""
msgid "Existing users won't be modified."
msgstr ""
-#: templates/web/base/js/translation_strings.html:66
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:68
msgid "Expand map"
msgstr ""
-#: templates/web/base/report/new/form_report.html:53
+#: templates/web/base/report/new/form_report.html:65
msgid "Explain what’s wrong"
msgstr ""
-#: templates/web/base/dashboard/index.html:106
+#: templates/web/base/dashboard/index.html:107
msgid "Export as CSV"
msgstr ""
-#: templates/web/base/admin/report_edit.html:98
-#: templates/web/base/admin/responsepriorities/edit.html:27
+#: templates/web/base/admin/reports/edit.html:103
msgid "External ID"
msgstr ""
@@ -1401,12 +1455,12 @@ msgstr ""
msgid "External URL"
msgstr "外部網址"
-#: templates/web/base/admin/report_edit.html:100
+#: templates/web/base/admin/reports/edit.html:105
msgid "External body"
msgstr ""
-#: templates/web/base/admin/report_edit.html:107
-#: templates/web/base/admin/template_edit.html:66
+#: templates/web/base/admin/reports/edit.html:112
+#: templates/web/base/admin/templates/edit.html:63
msgid "External status code"
msgstr ""
@@ -1414,32 +1468,37 @@ msgstr ""
msgid "External status code:"
msgstr ""
-#: templates/web/base/admin/report_edit.html:102
+#: templates/web/base/admin/reports/edit.html:107
msgid "External team"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:671
+#: perllib/FixMyStreet/Cobrand/Default.pm:718
#: 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:159
-#: templates/web/base/admin/report_edit.html:129
+#: templates/web/base/admin/bodies/contact-form.html:107
+#: 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/_inspect.html:168
-#: templates/web/base/report/_item.html:80
+#: templates/web/base/report/_item.html:90
+#: templates/web/base/report/inspect/_extra_details_field.html:2
+#: templates/web/base/report/new/category_extras.html:15
msgid "Extra details"
msgstr ""
-#: templates/web/zurich/admin/bodies/contact-form.html:22
+#: templates/web/zurich/admin/bodies/contact-form.html:27
msgid "Extra fields:"
msgstr ""
+#: templates/web/base/admin/extra-metadata-item.html:38
+msgid "Extra question shown to user"
+msgstr ""
+
#: templates/web/base/contact/submit.html:13
msgid "Failed to send message"
msgstr "無法送出留言"
@@ -1449,18 +1508,27 @@ msgstr "無法送出留言"
msgid "Fields"
msgstr ""
-#: templates/web/base/report/form/user_loggedout_password.html:25
+#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:42
+msgid "File type not recognised. Please upload an image."
+msgstr ""
+
+#: templates/web/base/report/form/user_loggedout_password.html:21
#: templates/web/base/report/form/user_loggedout_password.html:8
msgid "Fill in your details manually."
msgstr ""
-#: templates/web/zurich/admin/index-dm.html:33
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:71
+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:66
+#: templates/web/base/questionnaire/index.html:68
msgid "First time"
msgstr "首次"
@@ -1472,21 +1540,20 @@ msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:179
#: templates/web/base/admin/states/index.html:29
#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/dashboard/index.html:118
+#: templates/web/base/dashboard/index.html:119
msgid "Fixed"
msgstr "已處理"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:66
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:67
msgid "Fixed - Council"
msgstr "已處理-地方政府"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:67
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:68
msgid "Fixed - User"
msgstr "已處理-用戶"
#: templates/web/base/admin/bodies/form.html:96
-#: templates/web/base/admin/responsepriorities/edit.html:53
-#: templates/web/zurich/admin/bodies/form.html:35
+#: templates/web/zurich/admin/bodies/form.html:47
msgid "Flag as deleted"
msgstr "標記警告為刪除 "
@@ -1494,8 +1561,8 @@ msgstr "標記警告為刪除 "
msgid "Flag user"
msgstr "標記警告用戶"
-#: perllib/FixMyStreet/Cobrand/Default.pm:640
-#: templates/web/base/admin/users/index.html:20
+#: perllib/FixMyStreet/Cobrand/Default.pm:685
+#: templates/web/base/admin/users/index.html:47
msgid "Flagged"
msgstr "標記警告"
@@ -1503,7 +1570,7 @@ msgstr "標記警告"
msgid "Flagged reports and users"
msgstr "標記警告申報與用戶"
-#: templates/web/base/admin/users/form.html:114
+#: templates/web/base/admin/users/form.html:110
msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
@@ -1511,8 +1578,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/report_edit.html:150
-#: templates/web/base/admin/users/form.html:121
+#: templates/web/base/admin/reports/edit.html:155
+#: templates/web/base/admin/users/form.html:117
msgid "Flagged:"
msgstr "警告:"
@@ -1524,29 +1591,25 @@ msgstr "追踪里/區連結,以檢視該區內之申報"
msgid "For best results include a close-up and a wide shot"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:62
-msgid "For each option, <strong>Key</strong> is the value which is stored in the database for that option and <strong>Name</strong> is the value displayed to the user."
-msgstr ""
-
#: templates/web/base/admin/bodies/form.html:73
msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
msgstr "更多資訊,請詳見<a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>(英文)"
-#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:3
msgid "Forgot password"
msgstr ""
-#: templates/web/base/auth/general.html:91
-#: templates/web/base/report/form/user_loggedout_password.html:24
-#: templates/web/base/report/form/user_loggedout_password.html:29
+#: templates/web/base/auth/general.html:98
+#: templates/web/base/report/form/user_loggedout_password.html:20
+#: templates/web/base/report/form/user_loggedout_password.html:25
msgid "Forgotten your password?"
msgstr "忘記您的密碼?"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:786
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:818
msgid "Forwarded to external body"
msgstr "轉寄給外部機構"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:787
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:819
msgid "Forwarded wish to external body"
msgstr "轉寄願望給外部機構"
@@ -1556,28 +1619,34 @@ msgstr "轉寄願望給外部機構"
msgid "Frequently Asked Questions"
msgstr "常見問題回覆 "
-#: templates/web/base/auth/generate_token.html:52
+#: 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
msgid "Generate token"
msgstr ""
#: templates/web/base/around/_updates.html:3
-#: templates/web/base/report/display_tools.html:14
-#: templates/web/base/report/new/duplicate_suggestions.html:32
-#: templates/web/base/report/new/duplicate_suggestions.html:37
+#: templates/web/base/report/display_tools.html:15
+#: templates/web/base/report/new/duplicate_suggestions.html:36
+#: templates/web/base/report/new/duplicate_suggestions.html:39
+#: templates/web/base/report/new/duplicate_suggestions.html:45
msgid "Get updates"
msgstr "取得更新"
-#: templates/web/base/reports/_rss.html:3
-#: templates/web/base/reports/_rss.html:9
+#: templates/web/base/reports/_rss.html:12
+#: templates/web/base/reports/_rss.html:4
msgid "Get updates of %s problems"
msgstr "取得 %s問題之更新"
-#: templates/web/base/reports/_rss.html:11
-#: templates/web/base/reports/_rss.html:3
+#: templates/web/base/reports/_rss.html:14
+#: templates/web/base/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "取得 %s區域內的問題更新"
-#: templates/web/base/alert/_list.html:85
+#: templates/web/base/alert/_list.html:80
msgid "Give me an RSS feed"
msgstr "我要訂閱RSS"
@@ -1589,60 +1658,66 @@ msgstr ""
msgid "Glad to hear it’s been fixed!"
msgstr "很高興聽到問題已處理了。"
-#: templates/web/base/admin/index.html:28
-#: templates/web/base/admin/index.html:34
-#: templates/web/base/admin/index.html:49
-#: templates/web/base/alert/index.html:37
-#: templates/web/base/around/postcode_form.html:16
-#: templates/web/base/reports/_list-filters.html:71
-#: templates/web/base/reports/_list-filters.html:86
-#: templates/web/base/reports/_list-filters.html:92
+#: templates/web/base/admin/index.html:29
+#: 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/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/index.html:89
#: templates/web/zurich/admin/stats/index.html:37
msgid "Go"
msgstr "走"
-#: templates/web/base/admin/report_edit.html:96
+#: templates/web/base/admin/reports/edit.html:101
msgid "Going to send questionnaire?"
msgstr "即將送出問卷?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:773
msgid "Grant access to the admin"
msgstr ""
-#: templates/web/base/admin/index.html:76
+#: templates/web/base/admin/index.html:82
msgid "Graph of problem creation by status over time"
msgstr "隨時間産生的問題圖片"
-#: templates/web/base/admin/bodies/contact-form.html:134
-msgid "Group"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:94
+#: templates/web/base/dashboard/index.html:95
msgid "Group by %s"
msgstr ""
-#: templates/web/base/dashboard/index.html:99
+#: templates/web/base/dashboard/index.html:100
msgid "Group by:"
msgstr ""
-#: templates/web/base/questionnaire/index.html:32
+#: templates/web/base/questionnaire/index.html:34
msgid "Has this problem been fixed?"
msgstr "問題已處理了嗎?"
-#: templates/web/base/questionnaire/index.html:61
+#: templates/web/base/questionnaire/index.html:63
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "您之前是否曾向地方政府申報過問題?或者此為您的首次申報? "
-#: templates/web/base/main_nav_items.html:48
+#: templates/web/base/admin/stats/index.html:15
+#: templates/web/base/admin/stats/index.html:9
+msgid "Heatmap"
+msgstr ""
+
+#: templates/web/base/main_nav_items.html:32
#: templates/web/zurich/about/faq-de-ch.html:1
#: templates/web/zurich/footer.html:22
#: templates/web/zurich/nav_over_content.html:8
msgid "Help"
msgstr "協助"
-#: templates/web/base/report/new/category_extras.html:15
-#: templates/web/base/report/new/category_extras.html:16
+#: templates/web/base/report/new/category_extras.html:17
+#: templates/web/base/report/new/category_extras.html:18
msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
msgstr ""
@@ -1654,18 +1729,18 @@ msgstr ""
msgid "Hi %s"
msgstr "您好 %s"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/stats/index.html:53
#: templates/web/zurich/admin/update_edit.html:18
msgid "Hidden"
msgstr "隱藏"
-#: templates/web/base/admin/extra-metadata-form.html:18
-msgid "Hidden Field"
+#: templates/web/base/admin/extra-metadata-item.html:46
+msgid "Hidden data in reporting form"
msgstr ""
-#: templates/web/base/admin/users/form.html:204
+#: templates/web/base/admin/users/form.html:196
msgid "Hide all reports and updates"
msgstr ""
@@ -1690,12 +1765,18 @@ msgstr ""
msgid "Hide my name on this report"
msgstr ""
-#: templates/web/base/around/display_location.html:61
-#: templates/web/base/around/display_location.html:69
-#: templates/web/base/js/translation_strings.html:72
+#. ("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
msgid "Hide pins"
msgstr "隱藏地圖標示"
+#: templates/web/base/admin/bodies/contact-form.html:52
+#, fuzzy
+msgid "Hide reports made in this category"
+msgstr "%s 種類之申報"
+
#: templates/web/base/report/update.html:18
msgid "Hide update completely?"
msgstr ""
@@ -1705,15 +1786,11 @@ msgstr ""
msgid "Hide your name?"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:48
-msgid "Hint"
-msgstr ""
-
#: templates/web/base/admin/bodies/category.html:25
msgid "History"
msgstr "歷程 "
-#: templates/web/base/around/display_location.html:74
+#: templates/web/base/around/display_location.html:78
msgid "Home"
msgstr "首頁"
@@ -1721,7 +1798,8 @@ msgstr "首頁"
msgid "How to report a problem"
msgstr "如何申報問題 "
-#: templates/web/base/js/translation_strings.html:44
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:46
msgid "How to send successful reports"
msgstr "如何成功地送出申報"
@@ -1740,15 +1818,15 @@ msgid "I'm afraid we couldn't locate your problem in the database.\n"
msgstr " 我們無法在資料庫中找到您的問題。\n"
#: templates/web/base/admin/flagged.html:14
-#: templates/web/base/admin/index.html:60
+#: templates/web/base/admin/index.html:66
#: templates/web/base/admin/list_updates.html:6
-#: templates/web/base/admin/reports.html:12
+#: templates/web/base/admin/reports/index.html:12
#: templates/web/base/admin/users/alerts.html:8
-#: templates/web/zurich/admin/index-dm.html:21
+#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:19
#: templates/web/zurich/admin/list_updates.html:24
#: templates/web/zurich/admin/list_updates.html:38
-#: templates/web/zurich/admin/reports.html:11
+#: templates/web/zurich/admin/reports/index.html:11
msgid "ID"
msgstr "帳戶"
@@ -1765,19 +1843,23 @@ msgstr ""
msgid "If there's a user associated with the address you entered, we've sent a confirmation email."
msgstr ""
-#: templates/web/base/admin/responsepriorities/edit.html:23
+#: templates/web/base/admin/responsepriorities/edit.html:12
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-form.html:34
-msgid "If ticked the user won’t see an input field, just the ‘Description’ text."
+#: templates/web/base/admin/extra-metadata-item.html:100
+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
+msgid "If ticked, this extra data will not be edited or deleted by the Open311 population script."
msgstr ""
-#: templates/web/base/admin/template_edit.html:75
+#: templates/web/base/admin/templates/edit.html:72
msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:14
+#: templates/web/base/admin/bodies/_category_field.html:6
msgid ""
"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
" the menu. Make sure you use the same category name in the bodies if you want this to happen."
@@ -1786,11 +1868,11 @@ msgstr ""
"\n"
"如果你想這樣,請確保你在有關單位中使用同一類別。"
-#: templates/web/base/contact/index.html:112
+#: templates/web/base/contact/index.html:116
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:61
+#: templates/web/base/auth/generate_token.html:83
msgid "If you generate a new token the existing token will no longer work."
msgstr ""
@@ -1802,28 +1884,27 @@ msgstr "如果你對申報之問題有進一步狀況,歡迎回到本站留言
msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed."
msgstr ""
-#: templates/web/base/admin/responsepriorities/edit.html:45
+#: templates/web/base/admin/responsepriorities/edit.html:28
msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
msgstr ""
-#: templates/web/base/admin/template_edit.html:39
+#: templates/web/base/admin/templates/edit.html:39
msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
msgstr ""
#: templates/web/base/report/new/top_message_none.html:10
-#: templates/web/base/report/new/top_message_none.html:9
msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
msgstr ""
-#: templates/web/base/admin/template_edit.html:62
+#: templates/web/base/admin/templates/edit.html:59
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 ""
-#: templates/web/base/admin/template_edit.html:49
+#: templates/web/base/admin/templates/edit.html:46
msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
msgstr ""
-#: templates/web/base/questionnaire/index.html:70
+#: templates/web/base/questionnaire/index.html:72
msgid ""
"If you wish to leave a public update on the problem, please enter it here\n"
"(please note it will not be sent to the council)."
@@ -1831,10 +1912,6 @@ msgstr ""
"如果您希望公開留言該問題之更新,請在此輸入\n"
"(請注意它不會自動送到地方政府)"
-#: templates/web/base/admin/bodies/contact-form.html:32
-msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
-msgstr "如果您使用 <strong>非電子郵件送出申訴方式</strong>, 請在此輸入此服務代號 (Open311) 或同等的代號。"
-
#: templates/web/base/admin/bodies/open311-form-fields.html:112
#: templates/web/base/admin/bodies/open311-form-fields.html:113
msgid ""
@@ -1858,11 +1935,15 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:152
+#: templates/web/base/admin/bodies/contact-form.html:117
+msgid "If you’ve made changes, leave a note explaining what, for other admins to see."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:166
msgid "Illegal ID"
msgstr "無效帳戶"
-#: perllib/FixMyStreet/App/Controller/Alert.pm:103
+#: perllib/FixMyStreet/App/Controller/Alert.pm:106
msgid "Illegal feed selection"
msgstr "無效的訂閱選項"
@@ -1878,7 +1959,8 @@ 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 (只有在同意姓名公開下才會呈現)."
-#: templates/web/base/admin/bodies/contact-form.html:57
+#: templates/web/base/admin/bodies/contact-form.html:35
+#: templates/web/zurich/admin/bodies/contact-form.html:40
msgid "Inactive"
msgstr ""
@@ -1886,44 +1968,46 @@ msgstr ""
msgid "Inbox zero, here we come!"
msgstr "信箱已閱畢!"
-#: templates/web/zurich/admin/report_edit.html:225
+#: templates/web/zurich/admin/reports/edit.html:213
msgid "Include reporter personal details"
msgstr "包括申報人的個人細節"
-#: perllib/FixMyStreet/App/Controller/Open311.pm:354
+#: perllib/FixMyStreet/App/Controller/Open311.pm:348
msgid "Incorrect has_photo value \"%s\""
msgstr "不正確的照片值數 \"%s\""
-#: templates/web/base/report/_inspect.html:8
+#: templates/web/base/admin/triage/_inspect.html:31
+#: templates/web/base/report/_inspect.html:5
msgid "Inspect report"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:85
-msgid "Inspection required"
+#: perllib/FixMyStreet/Cobrand/Default.pm:761
+msgid "Instruct contractors to fix problems"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
-msgid "Instruct contractors to fix problems"
+#: templates/web/base/admin/extra-metadata-item.html:50
+msgid "Internal data set by Open311"
msgstr ""
+#: templates/web/base/admin/extra-metadata-option.html:6
+#, fuzzy
+msgid "Internal key"
+msgstr "內部筆記"
+
#: templates/web/zurich/admin/list_updates.html:35
msgid "Internal notes"
msgstr "內部筆記"
-#: templates/web/base/offline/appcache.html:4
-msgid "Internet glitch"
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:339
+#: perllib/FixMyStreet/App/Controller/Open311.pm:333
msgid "Invalid agency_responsible value %s"
msgstr "無效的權責單位數值 %s"
-#: perllib/FixMyStreet/App/Controller/Open311.pm:435
+#: perllib/FixMyStreet/App/Controller/Open311.pm:443
msgid "Invalid format %s specified."
msgstr "無效的%s 特定格式"
#: perllib/FixMyStreet/App/Controller/Moderate.pm:305
-#: perllib/FixMyStreet/App/Controller/Report.pm:485
+#: perllib/FixMyStreet/App/Controller/Report.pm:504
msgid "Invalid location. New location must be covered by the same council."
msgstr ""
@@ -1935,10 +2019,6 @@ msgstr "最快方式是 <a href=\"%s\">先查看問答集</a> ,看看答案是
msgid "It’s on its way to the council right now."
msgstr "正呈送給地方政府中"
-#: templates/web/base/admin/extra-metadata-form.html:71
-msgid "Key"
-msgstr ""
-
#: templates/web/base/admin/states/index.html:9
#: templates/web/base/admin/states/index.html:95
msgid "Label"
@@ -1962,11 +2042,16 @@ msgstr ""
msgid "Last editor"
msgstr "最後編輯 "
-#: templates/web/base/questionnaire/index.html:53
+#: templates/web/base/admin/reports/edit.html:92
+#, fuzzy
+msgid "Last failure:"
+msgstr "上回更新:"
+
+#: templates/web/base/questionnaire/index.html:55
msgid "Last update"
msgstr ""
-#: templates/web/base/admin/report_edit.html:90
+#: templates/web/base/admin/reports/edit.html:95
msgid "Last update:"
msgstr "上回更新:"
@@ -1974,13 +2059,14 @@ msgstr "上回更新:"
msgid "Last&nbsp;update:"
msgstr "上一次更新:"
-#: templates/web/base/report/_inspect.html:39
-#: templates/web/base/report/_item.html:60
+#: templates/web/base/report/_item.html:70
+#: templates/web/base/report/inspect/information.html:26
#: templates/web/base/report/update/moderation_diff.html:6
msgid "Latitude/Longitude:"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:83
+#: templates/web/base/admin/triage/_list-filters.html:36
+#: templates/web/base/reports/_list-filters-sort.html:10
msgid "Least recently updated"
msgstr ""
@@ -1988,10 +2074,6 @@ msgstr ""
msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\"),此處請保留空白 "
-#: templates/web/base/admin/extra-metadata-form.html:57
-msgid "List"
-msgstr ""
-
#: templates/web/base/admin/bodies/body.html:32
msgid "List all reported problems"
msgstr "列出所有申報的問題 "
@@ -2000,25 +2082,26 @@ msgstr "列出所有申報的問題 "
msgid "Loading reports…"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1552
#: templates/web/base/report/new/category_wrapper.html:9
msgid "Loading..."
msgstr "載入中...."
#: templates/web/base/alert/choose.html:2
#: templates/web/base/alert/choose.html:4 templates/web/base/alert/index.html:2
-#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:2
#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
#: templates/web/base/tokens/confirm_alert.html:1
msgid "Local RSS feeds and email alerts"
msgstr "當地問題訂閱與電郵通知"
-#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12
-#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3
+#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14
+#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "當地問題訂閱與電郵通知 %s "
-#: templates/web/base/main_nav_items.html:39
-#: templates/web/base/main_nav_items.html:45
+#: templates/web/base/main_nav_items.html:24
+#: templates/web/base/main_nav_items.html:29
msgid "Local alerts"
msgstr "當地問題 "
@@ -2031,77 +2114,97 @@ msgstr "在地圖上標記問題之區域"
msgid "Log in with Facebook"
msgstr ""
-#: templates/web/base/auth/general.html:37
-#: templates/web/base/report/form/user.html:19
+#: templates/web/base/auth/general.html:44
+#: templates/web/base/report/form/user.html:24
msgid "Log in with Twitter"
msgstr ""
-#: templates/web/base/js/translation_strings.html:82
-#: templates/web/base/report/form/user.html:22
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:85
+#: templates/web/base/report/form/user.html:27
msgid "Log in with email"
msgstr ""
-#: templates/web/base/js/translation_strings.html:80
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:83
msgid "Log in with email/text"
msgstr ""
-#: templates/web/base/admin/users/form.html:202
+#: templates/web/base/admin/users/form.html:194
msgid "Log out of all sessions"
msgstr ""
-#: templates/web/base/dashboard/index.html:82
+#: templates/web/base/auth/general.html:36
+#: templates/web/base/report/form/user.html:18
+msgid "Login with %s"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:83
msgid "Look up"
msgstr ""
-#: templates/web/base/js/translation_strings.html:61
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:63
msgid "MAP"
msgstr "地圖"
-#: templates/web/base/admin/users/form.html:203
+#: templates/web/base/admin/users/form.html:195
msgid "Make anonymous on all reports and updates"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:763
msgid "Manage shortlist"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:78
+#: perllib/FixMyStreet/Cobrand/Default.pm:688
+msgid "Manifest Theme"
+msgstr ""
+
+#: templates/web/base/admin/triage/_list-filters.html:31
+#: templates/web/base/reports/_list-filters-sort.html:5
msgid "Manual order"
msgstr ""
-#: templates/web/base/js/translation_strings.html:63
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:65
msgid "Map"
msgstr "地圖"
-#: templates/web/base/admin/report_edit.html:87
+#: templates/web/base/admin/reports/edit.html:87
msgid "Mark as sent"
msgstr "標註為關閉"
-#: templates/web/base/admin/users/form.html:112
+#: templates/web/base/admin/users/form.html:108
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>."
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:760
msgid "Markup problem details"
msgstr ""
-#: templates/web/base/contact/index.html:105
+#: templates/web/base/contact/enquiry/index.html:41
+#: templates/web/base/contact/index.html:109
msgid "Message"
msgstr "留言"
-#: templates/web/zurich/admin/report_edit.html:281
+#: templates/web/zurich/admin/reports/edit.html:269
msgid "Message to competent body:"
msgstr "給適任單位的訊息"
-#: templates/web/zurich/admin/report_edit.html:279
+#: templates/web/zurich/admin/reports/edit.html:267
msgid "Message to external body:"
msgstr "給外部機構的訊息"
-#: templates/web/base/admin/report_edit.html:72
+#: templates/web/base/admin/bodies/contact-form.html:62
+#: templates/web/base/admin/extra-metadata-option.html:21
+msgid "Message to show when form is disabled (HTML permitted)"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:72
msgid "Missing bodies:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:443
+#: perllib/FixMyStreet/App/Controller/Open311.pm:451
msgid "Missing jurisdiction_id"
msgstr "遺失 jurisdiction_id"
@@ -2109,7 +2212,8 @@ msgstr "遺失 jurisdiction_id"
msgid "Moderate"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:708
+#: perllib/FixMyStreet/Cobrand/Default.pm:755
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:197
msgid "Moderate report details"
msgstr ""
@@ -2132,36 +2236,44 @@ msgstr ""
msgid "Moderated by division within one working day"
msgstr "一個工作天內協調出部門"
-#: templates/web/base/admin/report_edit.html:188
+#: templates/web/base/admin/reports/edit.html:193
#: templates/web/base/admin/update_edit.html:86
msgid "Moderation history"
msgstr ""
-#: templates/web/base/dashboard/index.html:102
+#: templates/web/base/dashboard/index.html:103
#: templates/web/zurich/admin/stats/index.html:9
msgid "Month"
msgstr "月份"
-#: templates/web/base/reports/_list-filters.html:84
+#: templates/web/base/admin/triage/_list-filters.html:37
+#: 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
+#: templates/web/base/admin/category-checkboxes.html:32
+msgid "Multiple Groups"
+msgstr ""
+
#: templates/web/base/admin/bodies/form.html:24
#: templates/web/base/admin/bodies/index.html:25
-#: templates/web/base/admin/extra-metadata-form.html:75
#: templates/web/base/admin/flagged.html:16
#: templates/web/base/admin/flagged.html:37
-#: templates/web/base/admin/index.html:62
+#: templates/web/base/admin/index.html:68
#: templates/web/base/admin/list_updates.html:7
+#: templates/web/base/admin/manifesttheme/index.html:7
#: templates/web/base/admin/reportextrafields/edit.html:11
#: templates/web/base/admin/reportextrafields/index.html:6
-#: templates/web/base/admin/reports.html:14
-#: templates/web/base/admin/responsepriorities/list.html:6
+#: templates/web/base/admin/reports/index.html:14
+#: templates/web/base/admin/responsepriorities/index.html:6
#: templates/web/base/admin/states/index.html:108
#: templates/web/base/admin/states/index.html:11
#: templates/web/base/admin/users/import.html:23
#: templates/web/base/admin/users/import.html:46
-#: templates/web/base/admin/users/index.html:16
+#: templates/web/base/admin/users/index.html:43
#: templates/web/base/report/form/user_name.html:2
#: templates/web/zurich/admin/bodies/form.html:4
#: templates/web/zurich/auth/general.html:43
@@ -2169,28 +2281,27 @@ msgstr ""
msgid "Name"
msgstr "名字"
-#: templates/web/base/admin/report_edit.html:135
-#: templates/web/base/admin/responsepriorities/edit.html:13
+#: templates/web/base/admin/reports/edit.html:140
#: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35
+#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:35
#: templates/web/zurich/admin/stats/index.html:62
msgid "Name:"
msgstr "名字:"
-#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
-#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:20
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:26
msgid "Names are limited to %d characters in length."
msgstr ""
-#: templates/web/base/report/_inspect.html:53
+#: templates/web/base/report/inspect/information.html:40
msgid "Navigate to this problem"
msgstr ""
-#: templates/web/base/report/_inspect.html:48
+#: templates/web/base/report/inspect/information.html:35
msgid "Nearest calculated address:"
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:151
+#: perllib/FixMyStreet/Geocode/OSM.pm:154
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産生): %s%s"
@@ -2198,12 +2309,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:562
+#: perllib/FixMyStreet/Cobrand/Default.pm:607
#: 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:344
+#: perllib/FixMyStreet/Script/Alerts.pm:358
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -2219,16 +2330,16 @@ msgstr ""
msgid "Nearly done! Now check your email&hellip;"
msgstr "差不多快完成了,現在檢查您的電子信箱"
-#: templates/web/base/auth/2faform.html:8
+#: templates/web/base/auth/2fa/form.html:8
#: templates/web/base/auth/smsform.html:19
msgid "Nearly done! Now check your phone&hellip;"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:54
msgid "New body added"
msgstr "新增內文"
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:316
msgid "New category contact added"
msgstr "新增類別承辦 人"
@@ -2236,8 +2347,13 @@ msgstr "新增類別承辦 人"
msgid "New email address:"
msgstr ""
-#: templates/web/zurich/admin/report_edit-sdm.html:109
-#: templates/web/zurich/admin/report_edit.html:137
+#: templates/web/base/admin/extra-metadata-item.html:14
+#: templates/web/base/admin/extra-metadata-item.html:20
+msgid "New field"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:96
+#: templates/web/zurich/admin/reports/edit.html:125
msgid "New internal note:"
msgstr "新內部筆記"
@@ -2245,13 +2361,13 @@ msgstr "新內部筆記"
msgid "New local problems on FixMyStreet"
msgstr "FixMyStreet之新近當地問題 "
-#: templates/web/zurich/admin/report_edit-sdm.html:113
+#: templates/web/zurich/admin/report_edit-sdm.html:100
msgid "New note to DM:"
msgstr ""
#: templates/web/base/auth/change_password.html:47
-#: templates/web/base/auth/create.html:49
-#: templates/web/base/report/form/user_loggedout_by_email.html:54
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/report/form/user_loggedout_by_email.html:50
msgid "New password:"
msgstr ""
@@ -2259,8 +2375,8 @@ msgstr ""
msgid "New phone number:"
msgstr ""
-#: templates/web/base/admin/responsepriorities/edit.html:4
-#: templates/web/base/admin/responsepriorities/list.html:34
+#: templates/web/base/admin/responsepriorities/edit.html:3
+#: templates/web/base/admin/responsepriorities/index.html:52
msgid "New priority"
msgstr ""
@@ -2317,10 +2433,10 @@ msgstr "新的申報 "
msgid "New state"
msgstr "新陳述"
-#: templates/web/base/admin/template_edit.html:4
-#: templates/web/base/admin/templates.html:37
-#: templates/web/zurich/admin/template_edit.html:9
-#: templates/web/zurich/admin/templates.html:26
+#: templates/web/base/admin/templates/edit.html:4
+#: templates/web/base/admin/templates/view.html:37
+#: templates/web/zurich/admin/templates/edit.html:9
+#: templates/web/zurich/admin/templates/view.html:26
msgid "New template"
msgstr "新模版"
@@ -2328,7 +2444,8 @@ msgstr "新模版"
msgid "New updates on report <a href=\"%s\">%s</a>"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:80
+#: templates/web/base/admin/triage/_list-filters.html:33
+#: templates/web/base/reports/_list-filters-sort.html:7
msgid "Newest"
msgstr ""
@@ -2340,33 +2457,36 @@ msgstr "下一步"
msgid "Next:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:1201
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117
+#: 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
#: templates/web/base/admin/list_updates.html:33
#: templates/web/base/admin/list_updates.html:35
#: templates/web/base/admin/list_updates.html:36
#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:133
-#: templates/web/base/admin/report_edit.html:96
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:138
#: templates/web/base/admin/update_edit.html:26
#: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/questionnaire/index.html:106
-#: templates/web/base/questionnaire/index.html:39
-#: templates/web/base/report/_inspect.html:116
+#: templates/web/base/questionnaire/index.html:108
+#: templates/web/base/questionnaire/index.html:41
msgid "No"
msgstr "無"
+#: templates/web/base/admin/category-checkboxes.html:31
+msgid "No Group"
+msgstr ""
+
#: templates/web/base/report/form/user_loggedout_password.html:7
msgid "No account?"
msgstr ""
-#: templates/web/base/admin/users/form.html:52
+#: templates/web/base/admin/users/form.html:55
msgid "No body"
msgstr "無有關單位"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:377
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374
msgid "No council selected"
msgstr "未選擇地方政府"
@@ -2382,24 +2502,22 @@ msgstr "未發現標記警告問題 "
msgid "No flagged users found."
msgstr "未發現標記警告用戶"
-#: templates/web/zurich/admin/report_edit-sdm.html:125
-#: templates/web/zurich/admin/report_edit.html:260
+#: templates/web/zurich/admin/report_edit-sdm.html:112
+#: templates/web/zurich/admin/reports/edit.html:248
msgid "No further updates"
msgstr "尚無更新"
-#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70
-msgid "No inspections by that inspector in the selected date range."
-msgstr ""
-
-#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72
-msgid "No inspections in the selected date range."
+#: templates/web/base/report/form/user.html:33
+#: templates/web/base/report/form/user.html:40
+msgid "No personal details will be stored, and you will not receive updates about this report."
msgstr ""
#: templates/web/base/around/on_map_list_items.html:13
msgid "No reports to show on map, here are some nearby:"
msgstr ""
-#: templates/web/base/js/translation_strings.html:54
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:56
msgid "No result returned"
msgstr "查無結果"
@@ -2412,26 +2530,26 @@ msgstr ""
"某區目前尚無資籵,因為<code>MAPIT_URL</code> 您的地圖檔設定\n"
"未指MapIt 服務。"
-#: templates/web/base/report/_support.html:2
+#: templates/web/base/report/_support.html:3
#: templates/web/base/report/_support.html:4
msgid "No supporters"
msgstr "無支援"
-#: templates/web/base/admin/report_edit.html:67
-#: templates/web/base/admin/report_edit.html:92
-#: templates/web/base/admin/report_edit.html:94
+#: templates/web/base/admin/reports/edit.html:67
+#: templates/web/base/admin/reports/edit.html:97
+#: templates/web/base/admin/reports/edit.html:99
msgid "None"
msgstr "沒有"
-#: templates/web/base/admin/users/form.html:76
-#: templates/web/base/admin/users/form.html:77
+#: templates/web/base/admin/users/form.html:79
+#: templates/web/base/admin/users/form.html:80
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:42
-#: templates/web/base/admin/users/form.html:43
+#: templates/web/base/admin/users/form.html:45
+#: templates/web/base/admin/users/form.html:46
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"
@@ -2443,7 +2561,7 @@ msgstr ""
"這要看具體落實執行狀況,工作人員可能有權使用控制台(其關構下的\n"
"所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。"
-#: templates/web/zurich/admin/report_edit-sdm.html:104
+#: templates/web/zurich/admin/report_edit-sdm.html:88
msgid "Not for my subdivision"
msgstr "非下屬單位"
@@ -2461,7 +2579,7 @@ msgstr "未呈報給地方政府"
msgid "Note"
msgstr "註記"
-#: templates/web/zurich/admin/bodies/contact-form.html:45
+#: templates/web/zurich/admin/bodies/contact-form.html:47
msgid "Note:"
msgstr "註記:"
@@ -2473,8 +2591,12 @@ msgstr "筆記: <strong>%s</strong>"
msgid "Notes from SDM to DM"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:36
-msgid "Notice"
+#: templates/web/base/admin/extra-metadata-item.html:42
+msgid "Notice shown to user"
+msgstr ""
+
+#: templates/web/base/admin/extra-metadata-item.html:61
+msgid "Notice text"
msgstr ""
#: templates/web/base/reports/index.html:127
@@ -2485,15 +2607,17 @@ msgstr ""
msgid "Number of problems reported in each ward, in the last 7 days."
msgstr ""
-#: templates/web/base/js/translation_strings.html:60
-msgid "OK"
-msgstr "好了"
+#: templates/web/base/offline/fallback.html:4
+msgid "Offline"
+msgstr ""
-#: templates/web/base/js/translation_strings.html:97
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:100
msgid "Offline data cleared"
msgstr ""
-#: templates/web/base/js/translation_strings.html:94
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:97
msgid "Offline update data saved"
msgstr ""
@@ -2501,22 +2625,27 @@ msgstr ""
msgid "Old state"
msgstr "舊陳述"
-#: templates/web/base/reports/_list-filters.html:81
+#: templates/web/base/admin/triage/_list-filters.html:34
+#: templates/web/base/reports/_list-filters-sort.html:8
msgid "Oldest"
msgstr ""
-#: perllib/FixMyStreet/SendReport/Email.pm:94
+#: perllib/FixMyStreet/SendReport/Email.pm:98
msgid "On behalf of %s"
msgstr ""
+#: templates/web/base/admin/bodies/contact-form.html:46
+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:154
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:70
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:156
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
#: templates/web/base/admin/states/index.html:102
#: templates/web/base/admin/states/index.html:25
#: templates/web/base/admin/states/index.html:32
#: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:116
+#: templates/web/base/dashboard/index.html:117
#: templates/web/zurich/admin/update_edit.html:18
msgid "Open"
msgstr "開放"
@@ -2541,7 +2670,7 @@ msgstr "Open311 啟動網頁"
msgid "Open311 specification"
msgstr "Open311 規範 "
-#: templates/web/base/admin/extra-metadata-form.html:63
+#: templates/web/base/admin/extra-metadata-item.html:75
msgid "Options"
msgstr ""
@@ -2553,25 +2682,26 @@ msgstr ""
msgid "Or sign in with password to prefill this information."
msgstr ""
-#: templates/web/base/alert/_list.html:84
+#: templates/web/base/alert/_list.html:79
msgid "Or subscribe by RSS"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:8
+#: templates/web/base/admin/extra-metadata-item.html:55
msgid "Order"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:711
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:712
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:750
-#: perllib/FixMyStreet/DB/Result/Problem.pm:605
-#: perllib/FixMyStreet/DB/Result/Problem.pm:612
-#: perllib/FixMyStreet/DB/Result/Problem.pm:627
-#: perllib/FixMyStreet/DB/Result/Problem.pm:636
-#: perllib/FixMyStreet/Script/Reports.pm:192
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: 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:1423
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:765
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:766
+#: 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/Script/Reports.pm:168
+#: perllib/FixMyStreet/Script/Reports.pm:175
msgid "Other"
msgstr "其它"
@@ -2601,21 +2731,37 @@ msgstr "找無此頁"
msgid "Parent"
msgstr "上級 "
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
+#: templates/web/base/admin/bodies/contact-form.html:91
+#, fuzzy
+msgid "Parent categories"
+msgstr "創建類別"
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:66
msgid "Partial"
msgstr "部份"
-#: templates/web/base/report/form/user_loggedout_by_email.html:55
+#: templates/web/base/report/form/user_loggedout_by_email.html:51
#: templates/web/zurich/auth/general.html:20
#: templates/web/zurich/auth/general.html:46
msgid "Password (optional)"
msgstr "密碼(任選):"
-#: templates/web/base/js/translation_strings.html:69
-msgid "Permalink"
+#: perllib/FixMyStreet/App/Controller/Auth/Social.pm:248
+#, fuzzy
+msgid "Password change cancelled."
+msgstr "密碼已更新"
+
+#: templates/web/base/auth/create.html:2 templates/web/base/auth/create.html:5
+#, fuzzy
+msgid "Password expired"
+msgstr "密碼(任選):"
+
+#: templates/web/base/admin/roles/index.html:6
+#, fuzzy
+msgid "Permissions"
msgstr "永久連結"
-#: templates/web/base/admin/users/form.html:170
+#: templates/web/base/admin/users/form.html:159
msgid "Permissions:"
msgstr ""
@@ -2623,7 +2769,7 @@ msgstr ""
msgid "Permit blank updates"
msgstr ""
-#: templates/web/base/report/_inspect.html:28
+#: templates/web/base/report/inspect/information.html:15
msgid "Phone Reporter:"
msgstr ""
@@ -2634,39 +2780,39 @@ 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:37
+#: templates/web/base/report/form/user_loggedout_by_email.html:33
#: templates/web/base/report/new/form_user_loggedin.html:53
msgid "Phone number (optional)"
msgstr "電話號碼(非必填)"
-#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:30
msgid "Phone numbers are limited to %s characters in length."
msgstr ""
-#: templates/web/base/admin/users/form.html:29
+#: templates/web/base/admin/users/form.html:32
msgid "Phone verified:"
msgstr ""
-#: templates/web/base/admin/report_edit.html:143
-#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47
+#: 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/zurich/admin/stats/index.html:60
msgid "Phone:"
msgstr "電話"
#: templates/web/base/admin/update_edit.html:95
-#: templates/web/base/questionnaire/index.html:78
-#: templates/web/base/questionnaire/index.html:93
+#: templates/web/base/questionnaire/index.html:80
#: templates/web/base/questionnaire/index.html:95
-#: templates/web/base/report/new/form_report.html:29
-#: templates/web/base/report/new/form_report.html:44
-#: templates/web/base/report/new/form_report.html:46
+#: templates/web/base/questionnaire/index.html:97
+#: 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:29
+#: templates/web/zurich/admin/index-dm.html:31
#: templates/web/zurich/admin/index-sdm.html:24
-#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/reports/index.html:16
#: 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
@@ -2674,20 +2820,20 @@ msgstr "電話"
msgid "Photo"
msgstr "照片"
-#: perllib/FixMyStreet/App/Controller/Photo.pm:196
+#: perllib/FixMyStreet/App/Controller/Photo.pm:213
msgid "Photo is required."
msgstr "要求提供照片"
-#: templates/web/zurich/admin/bodies/contact-form.html:42
+#: templates/web/zurich/admin/bodies/contact-form.html:44
msgid "Photo required"
msgstr "要求提供照片"
-#: perllib/FixMyStreet/App/Controller/Photo.pm:113
+#: perllib/FixMyStreet/App/Controller/Photo.pm:130
msgid "Photo upload failed."
msgstr ""
-#: templates/web/base/questionnaire/index.html:78
-#: templates/web/base/report/new/form_report.html:29
+#: templates/web/base/questionnaire/index.html:80
+#: 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"
@@ -2697,6 +2843,10 @@ msgstr ""
msgid "Photos of recent nearby reports"
msgstr "最近申報之照片"
+#: templates/web/base/contact/enquiry/index.html:49
+msgid "Photos/Documents"
+msgstr ""
+
#: templates/web/base/reports/index.html:76
#: templates/web/base/reports/index.html:79
msgid "Pick your council"
@@ -2707,8 +2857,9 @@ msgstr ""
msgid "Pick your ward"
msgstr ""
-#: templates/web/base/around/display_location.html:75
-#: templates/web/base/js/translation_strings.html:42
+#. ("JS")
+#: templates/web/base/around/display_location.html:79
+#: templates/web/base/js/translation_strings.html:44
msgid "Place pin on map"
msgstr "在地圖上作標記"
@@ -2732,31 +2883,31 @@ msgstr "請再次確認您的密碼"
msgid "Please check your email address is correct"
msgstr "請確認您電郵地址無誤"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426
-#: perllib/FixMyStreet/DB/Result/User.pm:220
-#: perllib/FixMyStreet/DB/Result/User.pm:221
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:521
+#: perllib/FixMyStreet/DB/Result/User.pm:263
+#: perllib/FixMyStreet/DB/Result/User.pm:264
#: 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:1003
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
-#: perllib/FixMyStreet/DB/Result/Problem.pm:388
-#: templates/web/base/js/translation_strings.html:19
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1029
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1073
+#: templates/web/base/js/translation_strings.html:21
msgid "Please choose a category"
msgstr "請選擇類別"
-#: perllib/FixMyStreet/App/Controller/Auth.pm:387
-#: perllib/FixMyStreet/App/Controller/Auth.pm:413
+#: 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:287
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:307
#: templates/web/base/admin/bodies/body.html:12
#: templates/web/base/admin/bodies/index.html:4
-#: templates/web/base/admin/template_edit.html:13
+#: templates/web/base/admin/templates/edit.html:13
msgid "Please correct the errors below"
msgstr "請更正下方之錯誤"
@@ -2774,104 +2925,122 @@ msgstr ""
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr "請勿濫用本服務,濫用將造成您的政府輕視其它使用者之意見 "
+#. ("JS")
#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233
-#: perllib/FixMyStreet/DB/Result/Comment.pm:149
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:293
+#: perllib/FixMyStreet/DB/Result/Comment.pm:143
#: templates/web/base/js/translation_strings.html:6
msgid "Please enter a message"
msgstr "請寫下您的留言"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424
-#: perllib/FixMyStreet/DB/Result/User.pm:223
-#: perllib/FixMyStreet/DB/Result/User.pm:224
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:519
+#: perllib/FixMyStreet/DB/Result/User.pm:266
+#: perllib/FixMyStreet/DB/Result/User.pm:267
#: 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:214
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:270
msgid "Please enter a name"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:431
msgid "Please enter a name for this body"
msgstr ""
+#. ("JS")
#: templates/web/base/auth/change_password.html:26
#: templates/web/base/auth/change_password.html:29
-#: templates/web/base/js/translation_strings.html:29
+#: templates/web/base/js/translation_strings.html:31
msgid "Please enter a password"
msgstr "請輸入密碼"
-#: perllib/FixMyStreet/App/Controller/Contact.pm:133
-#: perllib/FixMyStreet/DB/Result/Problem.pm:371
-#: templates/web/base/js/translation_strings.html:8
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Contact.pm:147
+#: perllib/FixMyStreet/DB/Result/Problem.pm:365
+#: templates/web/base/js/translation_strings.html:9
msgid "Please enter a subject"
msgstr "請填下主旨"
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92
-#: perllib/FixMyStreet/DB/Result/User.pm:213
-#: templates/web/base/js/translation_strings.html:22
-#: templates/web/base/js/translation_strings.html:26
+#. ("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
+#: templates/web/base/js/translation_strings.html:24
+#: templates/web/base/js/translation_strings.html:28
msgid "Please enter a valid email"
msgstr "請輸入有效電子郵件"
#: perllib/FixMyStreet/App/Controller/Alert.pm:355
-#: perllib/FixMyStreet/App/Controller/Contact.pm:143
+#: perllib/FixMyStreet/App/Controller/Contact.pm:157
msgid "Please enter a valid email address"
msgstr "請輸入有效的電子郵件"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:139
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:255
msgid "Please enter a valid email or phone number"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374
-#: templates/web/base/js/translation_strings.html:12
+#. ("JS")
+#: perllib/FixMyStreet/DB/Result/Problem.pm:371
+#: templates/web/base/js/translation_strings.html:14
msgid "Please enter some details"
msgstr "請填寫進一步細節"
-#: perllib/FixMyStreet/App/Controller/Contact.pm:132
-#: perllib/FixMyStreet/DB/Result/User.pm:211
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Contact.pm:146
+#: perllib/FixMyStreet/DB/Result/User.pm:254
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:8
#: templates/web/base/auth/change_email.html:24
#: templates/web/base/auth/change_email.html:26
-#: templates/web/base/js/translation_strings.html:21
-#: templates/web/base/js/translation_strings.html:25
+#: templates/web/base/js/translation_strings.html:23
+#: templates/web/base/js/translation_strings.html:27
msgid "Please enter your email"
msgstr "請輸入您的電子郵件"
-#: templates/web/base/js/translation_strings.html:38
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:40
msgid "Please enter your first name"
msgstr "請輸入您的大名"
-#: perllib/FixMyStreet/Cobrand/UK.pm:330
-#: templates/web/base/js/translation_strings.html:17
+#. ("JS")
+#: perllib/FixMyStreet/Cobrand/UK.pm:343
+#: 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 "請輸入您的全名,地方政府需要此資料 – 如果您不希望名字公開在網站上,請在下面方格中劃掉勾選。"
-#: perllib/FixMyStreet/App/Controller/Contact.pm:131
-#: perllib/FixMyStreet/DB/Result/Comment.pm:146
-#: perllib/FixMyStreet/DB/Result/Problem.pm:382
-#: perllib/FixMyStreet/DB/Result/User.pm:206
-#: templates/web/base/js/translation_strings.html:16
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:35
+#, fuzzy
+msgid "Please enter your full name."
+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
+#: templates/web/base/js/translation_strings.html:18
msgid "Please enter your name"
msgstr "請輸入您的姓氐"
+#. ("JS")
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:6
-#: templates/web/base/js/translation_strings.html:35
+#: templates/web/base/js/translation_strings.html:37
msgid "Please enter your phone number"
msgstr "請輸入您的電話號碼"
-#: templates/web/base/js/translation_strings.html:39
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:41
msgid "Please enter your second name"
msgstr "請輸入您的別名"
-#: templates/web/base/js/translation_strings.html:37
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:39
msgid "Please enter your title"
msgstr "請輸入您的稱呼"
@@ -2880,7 +3049,7 @@ msgstr "請輸入您的稱呼"
msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
msgstr "歡迎<a href=\"%s\">再次登入</a>, 或是再次光臨 <a href=\"/\">本網站</a>."
-#: templates/web/base/report/new/fill_in_details_text.html:1
+#: templates/web/base/report/new/fill_in_details_text.html:2
#: templates/web/base/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "請在下方輸入問題的細節"
@@ -2890,7 +3059,7 @@ msgstr "請在下方輸入問題的細節"
msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
msgstr "請利用下方表單填寫問題細節,在細節項請儘量述明準確的位置。 "
-#: templates/web/base/auth/2faform.html:9
+#: templates/web/base/auth/2fa/form.html:9
msgid "Please generate a two-factor code and enter it below:"
msgstr ""
@@ -2898,8 +3067,16 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "請選擇您是否願意收到其它問卷"
-#: perllib/FixMyStreet/App/Controller/Auth.pm:410
-#: templates/web/base/js/translation_strings.html:32
+#. ("JS")
+#: perllib/FixMyStreet/DB/Result/Problem.pm:368
+#: 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
+#: templates/web/base/js/translation_strings.html:34
msgid "Please make sure your password is at least %d characters long"
msgstr ""
@@ -2925,11 +3102,11 @@ msgstr ""
msgid "Please note:"
msgstr "請加註記"
-#: perllib/FixMyStreet/App/Controller/Report.pm:445
+#: perllib/FixMyStreet/App/Controller/Report.pm:471
msgid "Please provide a duplicate ID or public update for this report."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report.pm:427
+#: perllib/FixMyStreet/App/Controller/Report.pm:453
msgid "Please provide a public update for this report."
msgstr ""
@@ -2946,15 +3123,19 @@ msgstr "請提供一些文字敍述與照片"
msgid "Please say whether you've ever reported a problem to your council before"
msgstr "請敍明您是否曾向地方政府申報過問題? "
-#: templates/web/zurich/admin/report_edit.html:206
+#: templates/web/base/auth/2fa/form-add.html:1
+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
msgid "Please select a body."
msgstr "請選擇單位"
-#: perllib/FixMyStreet/App/Controller/Alert.pm:83
+#: perllib/FixMyStreet/App/Controller/Alert.pm:86
msgid "Please select the feed you want"
msgstr "請選擇訂閱方式"
-#: perllib/FixMyStreet/App/Controller/Alert.pm:131
+#: perllib/FixMyStreet/App/Controller/Alert.pm:134
msgid "Please select the type of alert you want"
msgstr "請選擇更新通知方式"
@@ -2962,19 +3143,20 @@ msgstr "請選擇更新通知方式"
msgid "Please state whether or not the problem has been fixed"
msgstr "請敍明該問題是否已解決"
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
-#: templates/web/base/js/translation_strings.html:77
+#. ("JS")
+#: 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
msgid "Please upload an image only"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:142
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:258
msgid "Please verify at least one of email/phone"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:134
+#: perllib/FixMyStreet/App/Controller/Contact.pm:148
msgid "Please write a message"
msgstr "諘寫下您的留言"
@@ -2982,23 +3164,23 @@ msgstr "諘寫下您的留言"
msgid "Post"
msgstr "張貼"
-#: templates/web/base/alert/index.html:33
+#: templates/web/base/alert/index.html:11
msgid "Postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:221
+#: perllib/FixMyStreet/DB/Result/Comment.pm:215
msgid "Posted anonymously at %s"
msgstr "匿名張貼 %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:258
+#: perllib/FixMyStreet/DB/Result/Comment.pm:257
msgid "Posted by %s at %s"
msgstr "由 %s 在 %s 張貼"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:246
+#: perllib/FixMyStreet/DB/Result/Comment.pm:245
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr "由<strong>%s</strong> (%s) 在%s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:248
+#: perllib/FixMyStreet/DB/Result/Comment.pm:247
msgid "Posted by <strong>%s</strong> at %s"
msgstr "由<strong>%s</strong> 在%s"
@@ -3006,20 +3188,32 @@ msgstr "由<strong>%s</strong> 在%s"
msgid "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
msgstr "Powered by <a class=\"platform-logo\" href=\"https://fixmystreet.org/\">FixMyStreet Platform</a>"
+#: templates/web/base/admin/bodies/contact-form.html:41
+msgid "Prevent new reports from using this category, <em>and</em> also remove it from map filters."
+msgstr ""
+
+#: templates/web/base/admin/bodies/contact-form.html:36
+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
+msgid "Prevent user from submitting the form until this field is filled in."
+msgstr ""
+
#: templates/web/base/pagination.html:4
msgid "Previous"
msgstr "之前"
-#: perllib/FixMyStreet/Cobrand/Default.pm:662
+#: perllib/FixMyStreet/Cobrand/Default.pm:708
msgid "Priorities"
msgstr ""
-#: templates/web/base/report/_inspect.html:147
-#: templates/web/base/report/_item.html:72
+#: templates/web/base/report/_item.html:82
+#: templates/web/base/report/inspect/extra_details.html:2
msgid "Priority"
msgstr ""
-#: templates/web/base/main_nav_items.html:51
+#: templates/web/base/main_nav_items.html:35
msgid "Privacy"
msgstr "隱私"
@@ -3029,15 +3223,14 @@ msgstr "隱私"
msgid "Privacy and cookies"
msgstr "隱私與cookies"
-#: templates/web/base/admin/bodies/body.html:89
-#: templates/web/base/admin/bodies/contact-form.html:75
-#: templates/web/base/admin/report_edit.html:152
-#: templates/web/base/report/_inspect.html:16
+#: templates/web/base/admin/bodies/body.html:90
+#: templates/web/base/admin/reports/edit.html:157
+#: templates/web/base/report/inspect/information.html:3
#: templates/web/base/report/new/form_user_loggedin.html:67
msgid "Private"
msgstr "私人"
-#: templates/web/base/reports/_list-filters.html:28
+#: templates/web/base/reports/_list-filter-status.html:28
msgid "Private only"
msgstr ""
@@ -3049,10 +3242,29 @@ msgstr "問題"
msgid "Problem %d created"
msgstr "%d提出的問題"
+#: templates/web/base/admin/users/log.html:54
+#, fuzzy
+msgid "Problem %s added to shortlist"
+msgstr "%s 問題已送達到地方政府 %s "
+
#: templates/web/base/admin/timeline.html:24
msgid "Problem %s confirmed"
msgstr "%s 問題已被確認 "
+#: templates/web/base/admin/users/log.html:47
+#, fuzzy
+msgid "Problem %s created"
+msgstr "%d提出的問題"
+
+#: templates/web/base/admin/users/log.html:49
+#, fuzzy
+msgid "Problem %s created on behalf of %s"
+msgstr "%d提出的問題"
+
+#: templates/web/base/admin/users/log.html:56
+msgid "Problem %s removed from shortlist"
+msgstr ""
+
#: templates/web/base/admin/timeline.html:26
msgid "Problem %s sent to council %s"
msgstr "%s 問題已送達到地方政府 %s "
@@ -3063,7 +3275,7 @@ msgstr "%s 問題已送達到地方政府 %s "
msgid "Problem breakdown by state"
msgstr "本站出現故障問題 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:921
+#: perllib/FixMyStreet/App/Controller/Admin.pm:276
msgid "Problem marked as open."
msgstr "問題標註為開放"
@@ -3071,7 +3283,8 @@ msgstr "問題標註為開放"
msgid "Problem state change based on survey results"
msgstr "依調查結果呈現的問題改善"
-#: perllib/FixMyStreet/Cobrand/Default.pm:707
+#: perllib/FixMyStreet/Cobrand/Default.pm:754
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:196
#: templates/web/base/admin/flagged.html:10
msgid "Problems"
msgstr "問題"
@@ -3080,11 +3293,11 @@ msgstr "問題"
msgid "Problems in an area"
msgstr ""
-#: templates/web/base/report/display_tools.html:22
+#: templates/web/base/report/display_tools.html:24
msgid "Problems nearby"
msgstr "鄰近的問題"
-#: templates/web/base/report/display_tools.html:20
+#: templates/web/base/report/display_tools.html:22
msgid "Problems on the map"
msgstr "地圖上的問題"
@@ -3092,37 +3305,43 @@ msgstr "地圖上的問題"
msgid "Problems recently reported fixed on FixMyStreet"
msgstr "FixMyStreet 最近回報的已修復問題 "
-#: templates/web/base/alert/_list.html:29
+#: templates/web/base/alert/_list_rss_local.html:7
msgid "Problems within %.1fkm of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:847
+#: perllib/FixMyStreet/Cobrand/Default.pm:905
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141
-#: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258
-#: perllib/FixMyStreet/Cobrand/UK.pm:270
+#: perllib/FixMyStreet/Cobrand/UK.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:271
+#: perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "Problems within %s"
msgstr "在 %s 內的問題"
-#: perllib/FixMyStreet/Cobrand/UK.pm:227
+#: perllib/FixMyStreet/Cobrand/UK.pm:240
msgid "Problems within %s ward"
msgstr "在 %s 里/區的問題"
-#: perllib/FixMyStreet/Cobrand/UK.pm:264 perllib/FixMyStreet/Cobrand/UK.pm:276
+#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
msgid "Problems within %s ward, %s"
msgstr ""
#. ("First %s is the body name, second %s the site name")
+#: 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:25
+#: templates/web/base/reports/body.html:32
msgid "Problems within %s, %s"
msgstr "在 %s, %s的問題 "
-#: templates/web/base/admin/report_edit.html:75
+#: templates/web/base/admin/reports/edit.html:75
msgid "Property address:"
msgstr "公物地址:"
+#: templates/web/base/admin/extra-metadata-item.html:105
+msgid "Protect from Open311 changes"
+msgstr ""
+
#: templates/web/base/report/duplicate-no-updates.html:3
-#: templates/web/base/report/update-form-wrapper.html:3
+#: templates/web/base/report/update-form-wrapper.html:9
#: templates/web/base/report/update-form.html:9
msgid "Provide an update"
msgstr "提供更新資訊"
@@ -3131,32 +3350,37 @@ msgstr "提供更新資訊"
msgid "Provide update as"
msgstr ""
-#: templates/web/base/report/form/user_loggedout_by_email.html:61
+#: templates/web/base/report/form/user_loggedout_by_email.html:57
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:63
+#: templates/web/base/report/form/user_loggedout_by_email.html:59
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。"
-#: templates/web/base/report/new/form_report.html:13
+#: templates/web/base/report/new/form_public_councils_text.html:2
msgid "Public details"
msgstr ""
-#: templates/web/zurich/admin/report_edit.html:242
-#: templates/web/zurich/admin/report_edit.html:269
+#: templates/web/zurich/admin/reports/edit.html:230
+#: templates/web/zurich/admin/reports/edit.html:257
msgid "Public response:"
msgstr "公眾反應"
-#: templates/web/base/report/_inspect.html:192
+#: templates/web/base/report/inspect/public_update.html:11
msgid "Public update:"
msgstr ""
-#: templates/web/zurich/admin/report_edit.html:122
+#: templates/web/zurich/admin/reports/edit.html:110
#: templates/web/zurich/admin/stats/index.html:59
msgid "Publish photo"
msgstr "發出照片"
+#: templates/web/base/admin/extra-metadata-item.html:60
+#, fuzzy
+msgid "Question text"
+msgstr "問卷"
+
#: templates/web/base/questionnaire/completed.html:1
#: templates/web/base/questionnaire/index.html:0
#: templates/web/base/questionnaire/index.html:14
@@ -3173,23 +3397,24 @@ msgid "Questionnaire %d sent for problem %d"
msgstr "關於 %d問題所送出之 %d問卷 "
#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205
-#: templates/web/base/report/updates.html:17
+#: templates/web/base/report/updates.html:20
msgid "Questionnaire filled in by problem reporter"
msgstr "由問題申報者所填之問卷"
-#: templates/web/base/alert/_list.html:26
+#: templates/web/base/alert/_list.html:35
+#: templates/web/base/alert/_list.html:53
+#: templates/web/base/alert/_list_rss_local.html:3
#: templates/web/base/alert/updates.html:9
-#: templates/web/base/around/display_location.html:1
#: templates/web/base/around/display_location.html:3
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
msgid "RSS feed"
msgstr "RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:259 perllib/FixMyStreet/Cobrand/UK.pm:271
+#: perllib/FixMyStreet/Cobrand/UK.pm:272 perllib/FixMyStreet/Cobrand/UK.pm:284
msgid "RSS feed for %s"
msgstr "%s RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+#: perllib/FixMyStreet/Cobrand/UK.pm:278 perllib/FixMyStreet/Cobrand/UK.pm:290
msgid "RSS feed for %s ward, %s"
msgstr "%s里/區 RSS訂閱"
@@ -3197,52 +3422,56 @@ 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:285 perllib/FixMyStreet/Cobrand/UK.pm:299
+#: perllib/FixMyStreet/Cobrand/UK.pm:298 perllib/FixMyStreet/Cobrand/UK.pm:312
msgid "RSS feed of %s"
msgstr "%s RSS訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304
+#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:317
msgid "RSS feed of %s, within %s ward"
msgstr "%s, 在%s 里/區"
-#: templates/web/base/alert/_list.html:26
+#: templates/web/base/alert/_list_rss_local.html:3
msgid "RSS feed of nearby problems"
msgstr " RSS訂閱 %s區域問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:848
+#: perllib/FixMyStreet/Cobrand/Default.pm:906
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140
-#: perllib/FixMyStreet/Cobrand/UK.pm:220
+#: perllib/FixMyStreet/Cobrand/UK.pm:233
msgid "RSS feed of problems within %s"
msgstr "在 %s 內之問題RSS 訂閱"
-#: perllib/FixMyStreet/Cobrand/UK.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:239
msgid "RSS feed of problems within %s ward"
msgstr "在 %s 里/區問題的RSS 訂閱"
-#: templates/web/base/around/display_location.html:1
+#: templates/web/base/around/display_location.html:3
#: templates/web/base/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "最近當地問題的RSS訂閱"
#: templates/web/base/alert/updates.html:9
-#: templates/web/base/report/display_tools.html:42
+#: templates/web/base/report/display_tools.html:44
msgid "RSS feed of updates to this problem"
msgstr "最近當地問題更新的RSS訂閱"
-#: templates/web/base/report/_item_expandable.html:50
+#: templates/web/base/report/_item_expandable.html:55
msgid "Read less"
msgstr ""
-#: templates/web/base/report/_item_expandable.html:50
+#: templates/web/base/report/_item_expandable.html:55
msgid "Read more"
msgstr ""
+#: templates/web/base/admin/reports/edit.html:93
+msgid "Reason:"
+msgstr ""
+
#: templates/web/base/alert/updates.html:14
-#: templates/web/base/report/display_tools.html:44
+#: templates/web/base/report/display_tools.html:46
msgid "Receive email when updates are left on this problem."
msgstr "透過電子郵件收取該問題之更新消息"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:778
+#: perllib/FixMyStreet/DB/Result/Problem.pm:815
msgid "Received by %s moments later"
msgstr ""
@@ -3256,11 +3485,12 @@ msgstr "近期的當地問題%s "
msgid "Recently reported problems"
msgstr "近期申報之問題 "
-#: templates/web/base/reports/_list-filters.html:82
+#: templates/web/base/admin/triage/_list-filters.html:35
+#: templates/web/base/reports/_list-filters-sort.html:9
msgid "Recently updated"
msgstr ""
-#: templates/web/base/report/_inspect.html:63
+#: templates/web/base/report/inspect/information.html:52
msgid "Reject report"
msgstr ""
@@ -3268,15 +3498,11 @@ 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/extra-metadata-form.html:78
-msgid "Remove"
-msgstr ""
-
-#: templates/web/base/admin/users/form.html:205
+#: templates/web/base/admin/users/form.html:197
msgid "Remove account details"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:4
+#: templates/web/base/admin/extra-metadata-item.html:23
msgid "Remove field"
msgstr ""
@@ -3292,21 +3518,25 @@ msgstr "移除標記"
msgid "Remove from shortlist"
msgstr ""
-#: templates/web/base/report/display_tools.html:6
+#: templates/web/base/report/display_tools.html:7
msgid "Remove from site"
msgstr ""
-#: templates/web/base/admin/report_edit.html:169
+#: templates/web/base/admin/extra-metadata-option.html:26
+msgid "Remove option"
+msgstr ""
+
+#: templates/web/base/admin/reports/edit.html:174
#: 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:52
+#: templates/web/base/auth/generate_token.html:78
msgid "Replace token"
msgstr ""
-#: templates/web/zurich/admin/report_edit.html:240
+#: templates/web/zurich/admin/reports/edit.html:228
msgid "Reply to user:"
msgstr "給用戶的回應"
@@ -3314,30 +3544,38 @@ msgstr "給用戶的回應"
msgid "Report"
msgstr "提報 "
-#: templates/web/base/report/_inspect.html:20
-#: templates/web/base/report/_item.html:50
+#: templates/web/base/report/_item.html:60
+#: 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:86
+#: templates/web/base/js/translation_strings.html:89
#: templates/web/base/main_nav_items.html:6
#: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "申報問題"
-#: templates/web/base/js/translation_strings.html:87
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:90
#: templates/web/base/main_nav_items.html:4
msgid "Report a problem here"
msgstr ""
-#: templates/web/base/report/display_tools.html:10
-#: templates/web/base/report/display_tools.html:9
+#: templates/web/base/report/display_tools.html:11
msgid "Report abuse"
msgstr "申報濫用"
-#: templates/web/base/js/translation_strings.html:88
+#: templates/web/base/report/form/user.html:32
+#: templates/web/base/report/form/user.html:39
+#, fuzzy
+msgid "Report anonymously"
+msgstr "在%s 匿名申報 "
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:91
#: templates/web/base/main_nav_items.html:2
#: templates/web/base/tokens/confirm_problem.html:40
msgid "Report another problem here"
@@ -3347,17 +3585,20 @@ msgstr ""
msgid "Report as"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Rss.pm:303
+#: templates/web/base/report/new/form_public_councils_text.html:3
+#, fuzzy
+msgid "Report details"
+msgstr "申報濫用"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:306
msgid "Report on %s"
msgstr "在%s 申報 "
-#: templates/web/base/dashboard/index.html:62
+#: templates/web/base/dashboard/index.html:63
msgid "Report state:"
msgstr ""
-#: templates/web/base/report/new/fill_in_details_form.html:1
-#: templates/web/base/report/new/login_success_form.html:1
-#: templates/web/base/report/new/oauth_email_form.html:1
+#: templates/web/base/report/new/form_heading.html:1
msgid "Report your problem"
msgstr "申報你的問題"
@@ -3370,24 +3611,24 @@ msgstr ""
msgid "Report, view, or discuss local problems"
msgstr "申報,檢視,或討論在地問題"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:616
-#: templates/web/base/contact/index.html:60
+#: perllib/FixMyStreet/DB/Result/Problem.pm:652
+#: templates/web/base/contact/index.html:64
msgid "Reported anonymously at %s"
msgstr "在%s 匿名申報 "
#: templates/web/base/admin/stats/questionnaire.html:5
#: templates/web/base/questionnaire/creator_fixed.html:14
-#: templates/web/base/questionnaire/index.html:64
+#: templates/web/base/questionnaire/index.html:66
msgid "Reported before"
msgstr "之前的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:640
-#: templates/web/base/contact/index.html:62
+#: perllib/FixMyStreet/DB/Result/Problem.pm:676
+#: templates/web/base/contact/index.html:66
msgid "Reported by %s at %s"
msgstr "由%s 的 %s 申報"
-#: templates/web/zurich/admin/report_edit-sdm.html:60
-#: templates/web/zurich/admin/report_edit.html:88
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/reports/edit.html:76
msgid "Reported by:"
msgstr "由  申報"
@@ -3395,59 +3636,63 @@ msgstr "由  申報"
msgid "Reported in the %s category"
msgstr "%s 種類之申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:613
+#: perllib/FixMyStreet/DB/Result/Problem.pm:649
msgid "Reported in the %s category anonymously at %s"
msgstr "%s 種類下的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:637
+#: perllib/FixMyStreet/DB/Result/Problem.pm:673
msgid "Reported in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:610
+#: perllib/FixMyStreet/DB/Result/Problem.pm:646
msgid "Reported via %s anonymously at %s"
msgstr "在%s 匿名申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:634
+#: perllib/FixMyStreet/DB/Result/Problem.pm:670
msgid "Reported via %s by %s at %s"
msgstr "%s 透過 %s 在 %s類別的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:607
+#: perllib/FixMyStreet/DB/Result/Problem.pm:643
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "透過 %s 在 %s類別的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:629
+#: perllib/FixMyStreet/DB/Result/Problem.pm:665
msgid "Reported via %s in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
#: templates/web/zurich/admin/report_edit-sdm.html:38
-#: templates/web/zurich/admin/report_edit.html:57
+#: templates/web/zurich/admin/reports/edit.html:57
msgid "Reported:"
msgstr "已申報 %s"
+#. ("JS")
#: templates/web/base/around/index.html:3
#: templates/web/base/around/lookup_by_ref.html:3
-#: templates/web/base/js/translation_strings.html:59
+#: templates/web/base/js/translation_strings.html:61
#: templates/web/base/report/new/fill_in_details.html:0
#: templates/web/base/report/new/fill_in_details.html:10
#: templates/web/zurich/report/new/fill_in_details_form.html:4
msgid "Reporting a problem"
msgstr "申報問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:652
-#: perllib/FixMyStreet/Cobrand/Default.pm:666
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:400
-#: templates/web/base/dashboard/index.html:107
-#: templates/web/zurich/header.html:45
+#: perllib/FixMyStreet/Cobrand/Default.pm:698
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:330
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: 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/Oxfordshire.pm:17
-#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:38
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr "申請內容有 %s 字數限制,請簡化您的申報。"
-#: templates/web/base/js/translation_strings.html:13
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:15
msgid "Reports are limited to {0} characters in length. Please shorten your report"
msgstr ""
@@ -3455,14 +3700,10 @@ msgstr ""
msgid "Reports awaiting approval"
msgstr "待核實之申報"
-#: templates/web/base/alert/_list.html:54
+#: templates/web/base/alert/_list.html:48
msgid "Reports by destination"
msgstr ""
-#: templates/web/base/admin/users/form.html:130
-msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
-msgstr ""
-
#: templates/web/base/alert/_list.html:15
msgid "Reports near %s are sent to different councils, depending on the type of problem."
msgstr ""
@@ -3471,63 +3712,61 @@ msgstr ""
msgid "Reports published"
msgstr "己公開之申報"
-#: templates/web/base/js/translation_strings.html:98
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:101
msgid "Reports saved offline."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:311
msgid "Reports sent to %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305
+#: perllib/FixMyStreet/Cobrand/UK.pm:304 perllib/FixMyStreet/Cobrand/UK.pm:318
msgid "Reports sent to %s, within %s ward"
msgstr ""
-#: templates/web/base/admin/index.html:56
+#: templates/web/base/admin/index.html:62
msgid "Reports waiting to be sent"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:90
-msgid "Reports will automatically be sent without needing to be inspected if the user's <strong>reputation</strong> is at or above this value. Set to <strong>0</strong> if all reports must be inspected regardless."
-msgstr ""
-
-#: templates/web/base/admin/bodies/contact-form.html:95
-msgid "Reputation threshold"
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:42
+msgid "Reposition if needed, then hit Continue"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:30
+#: templates/web/base/admin/extra-metadata-item.html:93
msgid "Required"
msgstr ""
-#: templates/web/base/admin/report_edit.html:85
+#: templates/web/base/admin/reports/edit.html:85
msgid "Resend report"
msgstr "重新送出申報"
-#: templates/web/base/admin/responsepriorities/index.html:1
-msgid "Response Priorities"
+#: templates/web/base/auth/create.html:72
+msgid "Reset"
msgstr ""
-#: templates/web/base/admin/responsepriorities/list.html:1
-msgid "Response Priorities for %s"
+#: templates/web/base/admin/responsepriorities/index.html:1
+msgid "Response Priorities"
msgstr ""
#: templates/web/base/admin/responsepriorities/edit.html:1
msgid "Response Priority for %s"
msgstr ""
-#: templates/web/base/admin/template_edit.html:1
+#: templates/web/base/admin/templates/edit.html:1
msgid "Response Template for %s"
msgstr ""
-#: templates/web/base/admin/templates_index.html:1
+#: templates/web/base/admin/templates/index.html:1
msgid "Response Templates"
msgstr ""
-#: templates/web/base/admin/templates.html:1
-#: templates/web/zurich/admin/template_edit.html:1
-#: templates/web/zurich/admin/template_edit.html:4
-#: templates/web/zurich/admin/templates.html:1
-#: templates/web/zurich/admin/templates.html:3
+#: templates/web/base/admin/templates/view.html:1
+#: templates/web/zurich/admin/templates/edit.html:1
+#: templates/web/zurich/admin/templates/edit.html:4
+#: templates/web/zurich/admin/templates/view.html:1
+#: templates/web/zurich/admin/templates/view.html:3
msgid "Response Templates for %s"
msgstr "%s的回應模版"
@@ -3543,56 +3782,77 @@ msgstr ""
msgid "Revert to original title"
msgstr ""
-#: templates/web/base/js/translation_strings.html:40
-#: templates/web/base/js/translation_strings.html:57
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:59
msgid "Right place?"
msgstr "正確地點?"
-#: perllib/FixMyStreet/Geocode/OSM.pm:158
+#: perllib/FixMyStreet/Geocode/OSM.pm:161
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
-#: perllib/FixMyStreet/Geocode/OSM.pm:155
+#: perllib/FixMyStreet/Geocode/OSM.pm:158
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1089
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1093
-#: templates/web/base/admin/report_edit.html:166
+#: templates/web/base/admin/roles/index.html:5
+msgid "Role"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:143
+#: templates/web/base/admin/users/index.html:29
+msgid "Role:"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: 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:444
+#: perllib/FixMyStreet/App/Controller/Admin.pm:448
+#: templates/web/base/admin/reports/edit.html:171
#: templates/web/base/admin/update_edit.html:71
-#: templates/web/zurich/admin/report_edit.html:118
+#: templates/web/zurich/admin/reports/edit.html:106
msgid "Rotate Left"
msgstr "左轉 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1089
-#: templates/web/base/admin/report_edit.html:167
+#: perllib/FixMyStreet/App/Controller/Admin.pm:444
+#: templates/web/base/admin/reports/edit.html:172
#: templates/web/base/admin/update_edit.html:72
-#: templates/web/zurich/admin/report_edit.html:119
+#: templates/web/zurich/admin/reports/edit.html:107
msgid "Rotate Right"
msgstr "右轉 "
-#: templates/web/zurich/admin/report_edit.html:110
+#: templates/web/zurich/admin/reports/edit.html:98
msgid "Rotating this photo will discard unsaved changes to the report."
msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
-#: templates/web/base/js/translation_strings.html:64
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:66
#: templates/web/base/maps/google-ol.html:2
msgid "Satellite"
msgstr "衛星"
-#: templates/web/base/report/_inspect.html:212
+#: templates/web/base/admin/triage/_inspect.html:69
+#: templates/web/base/report/_inspect.html:78
msgid "Save + close as duplicate"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:156
+#: templates/web/base/admin/bodies/contact-form.html:124
+#: templates/web/base/admin/manifesttheme/form.html:58
#: templates/web/base/admin/reportextrafields/edit.html:64
-#: templates/web/base/admin/responsepriorities/edit.html:58
-#: templates/web/base/admin/template_edit.html:87
-#: templates/web/base/report/_inspect.html:212
+#: 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/report/_main.html:129
#: templates/web/base/report/update.html:58
-#: templates/web/zurich/admin/bodies/contact-form.html:49
-#: templates/web/zurich/admin/template_edit.html:29
+#: templates/web/zurich/admin/bodies/contact-form.html:51
+#: templates/web/zurich/admin/templates/edit.html:32
msgid "Save changes"
msgstr "儲存變動"
@@ -3600,58 +3860,62 @@ msgstr "儲存變動"
msgid "Save new fields"
msgstr ""
-#: templates/web/base/report/_inspect.html:188
+#: templates/web/base/report/inspect/public_update.html:7
msgid "Save with a public update"
msgstr ""
-#. ("This is followed by a progress count, e.g. 3/5")
-#: templates/web/base/js/translation_strings.html:99
+#. ("This is followed by a progress count, e.g. 3/5", "JS")
+#: templates/web/base/js/translation_strings.html:102
msgid "Saving reports offline"
msgstr ""
#: templates/web/base/admin/index.html:26
-#: templates/web/base/admin/reports.html:1
-#: templates/web/zurich/admin/reports.html:1
+#: templates/web/base/admin/reports/index.html:1
+#: templates/web/zurich/admin/reports/index.html:1
msgid "Search Reports"
msgstr "搜尋申報"
-#: templates/web/base/admin/index.html:32
+#: templates/web/base/admin/index.html:34
#: templates/web/base/admin/users/index.html:1
msgid "Search Users"
msgstr "搜尋使用者"
-#: templates/web/zurich/header.html:67
+#: templates/web/base/alert/index.html:10
+msgid "Search for location of email alert or RSS feed"
+msgstr ""
+
+#: templates/web/zurich/header.html:70
msgid "Search reports"
msgstr "搜尋申報"
-#: templates/web/base/admin/reports.html:5
-#: templates/web/base/admin/users/index.html:8
-#: templates/web/zurich/admin/reports.html:5
+#: templates/web/base/admin/reports/index.html:5
+#: templates/web/base/admin/users/index.html:26
+#: templates/web/zurich/admin/reports/index.html:5
msgid "Search:"
msgstr "搜尋"
-#: templates/web/base/admin/reports.html:27
+#: templates/web/base/admin/reports/index.html:27
#: templates/web/base/around/lookup_by_ref.html:18
msgid "Searching found no reports."
msgstr "查無此申報"
-#: templates/web/base/admin/users/index.html:42
+#: templates/web/base/admin/users/index.html:89
msgid "Searching found no users."
msgstr "查無此用戶"
-#: templates/web/base/auth/generate_token.html:1
#: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:39
-#: templates/web/base/my/my.html:71
+#: templates/web/base/auth/generate_token.html:45
+#: templates/web/base/my/my.html:75
msgid "Security"
msgstr ""
#: templates/web/base/report/form/private_details.html:14
-#: templates/web/base/report/new/councils_text_private.html:7
+#: templates/web/base/report/new/councils_text_private.html:8
msgid "See our privacy policy"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:721
+#: perllib/FixMyStreet/Cobrand/Default.pm:768
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:202
msgid "See user detail for reports created as the council"
msgstr ""
@@ -3661,12 +3925,12 @@ msgid "Select a body"
msgstr "選擇單位"
#: templates/web/base/admin/bodies/form.html:78
-#: templates/web/base/admin/users/form.html:84
-#: templates/web/zurich/admin/bodies/form.html:25
+#: templates/web/base/admin/users/form.html:87
+#: templates/web/zurich/admin/bodies/form.html:37
msgid "Select an area"
msgstr "選擇區域"
-#: templates/web/base/admin/responsepriorities/edit.html:33
+#: templates/web/base/admin/responsepriorities/edit.html:19
msgid "Select if this is the default priority"
msgstr ""
@@ -3678,19 +3942,24 @@ msgstr ""
msgid "Select multiple wards?"
msgstr ""
-#: templates/web/base/admin/category-checkboxes.html:6
+#: templates/web/base/admin/category-checkboxes.html:4
msgid "Select:"
msgstr ""
-#: templates/web/base/contact/index.html:116
+#: templates/web/base/contact/enquiry/index.html:75
+#: templates/web/base/contact/index.html:120
msgid "Send"
msgstr ""
+#: templates/web/base/admin/reports/edit.html:91
+msgid "Send Fail Count:"
+msgstr ""
+
#: templates/web/base/admin/bodies/open311-form-fields.html:121
msgid "Send extended Open311 statuses with service request updates"
msgstr ""
-#: templates/web/base/admin/users/form.html:22
+#: templates/web/base/admin/users/form.html:25
msgid "Send login email"
msgstr ""
@@ -3699,41 +3968,41 @@ msgstr ""
msgid "Sending a confirmation text failed: \"%s\""
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:872
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:904
msgid "Sent report back"
msgstr "送回申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:781
+#: perllib/FixMyStreet/DB/Result/Problem.pm:819
msgid "Sent to %s %s later"
msgstr "%s 稍後送給%s"
-#: templates/web/base/admin/report_edit.html:80
+#: templates/web/base/admin/reports/edit.html:80
msgid "Sent:"
msgstr "送出"
-#: templates/web/base/admin/extra-metadata-form.html:17
-msgid "Server Set"
-msgstr ""
-
-#: templates/web/base/admin/report_edit.html:92
+#: templates/web/base/admin/reports/edit.html:97
#: templates/web/zurich/admin/stats/index.html:66
msgid "Service:"
msgstr "服務"
-#: templates/web/base/auth/change_password.html:1
+#: templates/web/base/auth/change_password.html:2
#: templates/web/base/auth/change_password.html:4
-#: templates/web/base/my/my.html:67
+#: templates/web/base/my/my.html:70
msgid "Set password"
msgstr ""
-#: templates/web/base/report/_inspect.html:56
+#: templates/web/base/report/inspect/information.html:44
msgid "Set to my current location"
msgstr ""
-#: templates/web/base/report/display_tools.html:17
+#: templates/web/base/report/display_tools.html:18
msgid "Share"
msgstr "分享"
+#: templates/web/base/admin/manifesttheme/index.html:8
+msgid "Short Name"
+msgstr ""
+
#: templates/web/base/main_nav_items.html:18
#: templates/web/base/report/_main.html:149
#: templates/web/base/report/_main.html:27
@@ -3741,14 +4010,14 @@ msgstr "分享"
msgid "Shortlist"
msgstr ""
-#: templates/web/base/reports/body.html:32
+#: templates/web/base/reports/body.html:39
msgid "Shortlist all visible"
msgstr ""
#: templates/web/base/report/_main.html:147
#: templates/web/base/report/_main.html:26
#: templates/web/base/report/_main.html:31
-#: templates/web/base/reports/_list-filters.html:24
+#: templates/web/base/reports/_list-filter-status.html:24
msgid "Shortlisted"
msgstr ""
@@ -3761,7 +4030,7 @@ msgstr ""
msgid "Show Photo?"
msgstr ""
-#: templates/web/base/questionnaire/index.html:54
+#: templates/web/base/questionnaire/index.html:56
msgid "Show all updates"
msgstr ""
@@ -3777,7 +4046,8 @@ msgstr ""
msgid "Show older"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:90
+#: templates/web/base/admin/triage/_list-filters.html:43
+#: templates/web/base/reports/_list-filters.html:47
msgid "Show older reports"
msgstr ""
@@ -3785,9 +4055,10 @@ msgstr ""
msgid "Show photo"
msgstr ""
-#: templates/web/base/around/display_location.html:59
-#: templates/web/base/around/display_location.html:67
-#: templates/web/base/js/translation_strings.html:71
+#. ("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
msgid "Show pins"
msgstr "顯示地圖標示"
@@ -3799,20 +4070,20 @@ msgstr ""
msgid "Show reports in your area"
msgstr ""
-#: templates/web/base/auth/create.html:57
+#: templates/web/base/auth/create.html:72
#: templates/web/base/auth/general.html:4
-#: templates/web/base/auth/general.html:87
+#: templates/web/base/auth/general.html:94
#: templates/web/base/main_nav_items.html:14
#: templates/web/zurich/auth/general.html:23
#: templates/web/zurich/auth/general.html:8
msgid "Sign in"
msgstr "登入"
-#: templates/web/base/auth/create.html:22
+#: templates/web/base/auth/create.html:26
msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
msgstr ""
-#: templates/web/base/auth/create.html:20
+#: templates/web/base/auth/create.html:24
msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
msgstr ""
@@ -3821,16 +4092,17 @@ msgstr ""
msgid "Sign in or create an account"
msgstr "登入或新建帳戶"
-#: templates/web/base/auth/general.html:80
+#: templates/web/base/auth/general.html:87
msgid "Sign in with a password"
msgstr ""
-#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73
+#: templates/web/base/auth/create.html:31
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:77
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "登出"
-#: templates/web/base/report/new/fill_in_details_text.html:1
+#: templates/web/base/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "某些類別要求其它資訊"
@@ -3844,12 +4116,12 @@ msgstr ""
"被送出至地方政府\n"
"."
-#: templates/web/base/alert/index.html:44
+#: templates/web/base/alert/index.html:22
msgid "Some photos of recent reports"
msgstr "最近申報之照片"
#. ('Optional comment for translator')
-#: perllib/FixMyStreet/Template.pm:53
+#: perllib/FixMyStreet/Template.pm:62
msgid "Some text to localize"
msgstr "有些文字需在地化"
@@ -3857,11 +4129,13 @@ msgstr "有些文字需在地化"
msgid "Someone has moderated this report since you started."
msgstr ""
-#: templates/web/base/js/translation_strings.html:74
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:76
msgid "Sorry! You’ve hit the limit of images that can be attached to one report."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:80
+#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:95
+#: perllib/FixMyStreet/Cobrand/UK.pm:85
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr "抱歉,該郵區號碼我們尚未支援"
@@ -3869,7 +4143,8 @@ msgstr "抱歉,該郵區號碼我們尚未支援"
msgid "Sorry, that wasn&rsquo;t a valid link"
msgstr "抱歉這個wasn&rsquo;t 為有效的網址連結"
-#: templates/web/base/auth/2faform.html:5
+#: templates/web/base/auth/2fa/form-add.html:7
+#: templates/web/base/auth/2fa/form.html:5
#: templates/web/base/auth/smsform.html:16
msgid "Sorry, that wasn&rsquo;t the correct code"
msgstr ""
@@ -3878,9 +4153,9 @@ msgstr ""
msgid "Sorry, there has been an error confirming your problem."
msgstr "抱歉無法確認你的問題"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:243
-#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40
-#: perllib/FixMyStreet/Geocode/OSM.pm:52
+#: 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/Geocode/URL.pm:19
msgid "Sorry, we could not find that location."
msgstr "抱歉,我們無法找到此位置"
@@ -3890,174 +4165,193 @@ msgstr "抱歉,我們無法找到此位置"
msgid "Sorry, we could not log you in. Please fill in the form below."
msgstr ""
-#: perllib/FixMyStreet/Geocode/Bing.pm:37
-#: perllib/FixMyStreet/Geocode/Google.pm:55
-#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+#: perllib/FixMyStreet/Geocode/Bing.pm:44
+#: 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/Model/PhotoSet.pm:137
-msgid "Sorry, we couldn't save your image(s), please try again."
+#: perllib/FixMyStreet/App/Controller/Contact/Enquiry.pm:108
+#: perllib/FixMyStreet/App/Form/ManifestTheme.pm:54
+#: perllib/FixMyStreet/PhotoStorage.pm:63
+#, fuzzy
+msgid "Sorry, we couldn't save your file(s), please try again."
msgstr "抱歉,我們無法儲存你的照片,請重試一次"
-#: templates/web/base/offline/appcache.html:6
-msgid ""
-"Sorry, we don’t have a good enough connection to fetch that page, or the\n"
-"page wasn’t found or there was a server error. Please try again later."
+#: templates/web/base/offline/fallback.html:6
+msgid "Sorry, we don’t have a good enough connection to fetch that page."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Root.pm:125
+#: perllib/FixMyStreet/App/Controller/Root.pm:129
msgid "Sorry, you don't have permission to do that."
msgstr ""
-#: templates/web/base/reports/_list-filters.html:75
+#: perllib/FixMyStreet/App/Controller/Report.pm:176
+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/reports/_list-filters-sort.html:2
msgid "Sort by"
msgstr ""
-#: templates/web/base/admin/users/form.html:62
+#: templates/web/base/admin/bodies/contact-form.html:45
+msgid "Staff only"
+msgstr ""
+
+#: templates/web/base/admin/users/form.html:65
msgid "Staff users have permission to log in to the admin."
msgstr ""
-#: templates/web/base/admin/users/form.html:66
+#: templates/web/base/admin/users/form.html:69
msgid "Staff:"
msgstr ""
-#: templates/web/base/dashboard/index.html:74
+#: templates/web/base/debug_header.html:3
+msgid "Staging site"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:75
msgid "Start Date"
msgstr ""
#: templates/web/base/admin/bodies/body.html:74
#: templates/web/base/admin/bodies/category.html:30
-#: templates/web/base/admin/bodies/contact-form.html:53
+#: templates/web/base/admin/bodies/contact-form.html:22
#: templates/web/base/admin/flagged.html:18
-#: templates/web/base/admin/index.html:64
+#: templates/web/base/admin/index.html:70
#: templates/web/base/admin/list_updates.html:11
-#: templates/web/base/admin/reports.html:16
-#: templates/web/base/admin/template_edit.html:53
-#: templates/web/base/admin/templates.html:8
+#: templates/web/base/admin/reports/index.html:16
+#: templates/web/base/admin/templates/edit.html:50
+#: templates/web/base/admin/templates/view.html:8
#: templates/web/base/admin/users/alerts.html:11
-#: templates/web/base/dashboard/index.html:101
-#: templates/web/base/report/_inspect.html:106
-#: templates/web/base/report/_item.html:68
+#: 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/zurich/admin/bodies/contact-form.html:33
+#: templates/web/zurich/admin/bodies/contact-form.html:37
msgid "State"
msgstr "陳述"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:791
-#: perllib/FixMyStreet/App/Controller/Admin.pm:792
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:107
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:108
msgid "State and external status code cannot be used simultaneously."
msgstr ""
-#: perllib/FixMyStreet/Script/Alerts.pm:102
+#: perllib/FixMyStreet/Script/Alerts.pm:106
#: templates/web/base/report/_update_state.html:7
-#: templates/web/base/report/updates.html:18
+#: templates/web/base/report/updates.html:21
msgid "State changed to:"
msgstr ""
-#: templates/web/base/admin/report_edit.html:123
+#: templates/web/base/admin/reports/edit.html:128
#: templates/web/base/admin/update_edit.html:28
-#: templates/web/zurich/admin/report_edit-sdm.html:75
-#: templates/web/zurich/admin/report_edit.html:103
-#: templates/web/zurich/admin/report_edit.html:151
+#: templates/web/zurich/admin/report_edit-sdm.html:63
+#: templates/web/zurich/admin/reports/edit.html:139
+#: templates/web/zurich/admin/reports/edit.html:91
#: templates/web/zurich/admin/update_edit.html:17
msgid "State:"
msgstr "陳述:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:641
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:686
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:320
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:431
#: templates/web/base/admin/states/index.html:1
msgid "States"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:635
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:403
-#: templates/web/base/admin/index.html:71
+#: perllib/FixMyStreet/Cobrand/Default.pm:680
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:413
+#: templates/web/base/admin/index.html:77
#: 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:58
+#: templates/web/zurich/header.html:61
msgid "Stats"
msgstr "統計"
-#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:25
#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/reports/index.html:13
msgid "Status"
msgstr "狀態"
#: templates/web/base/report/_update_state.html:22
-#: templates/web/base/report/updates.html:22
+#: templates/web/base/report/updates.html:25
msgid "Still open, via questionnaire"
msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:27
-#: templates/web/zurich/admin/report_edit.html:28
+#: templates/web/zurich/admin/reports/edit.html:28
msgid "Street View"
msgstr "街景圖"
-#: templates/web/base/admin/extra-metadata-form.html:56
-msgid "String"
-msgstr ""
-
-#: templates/web/base/report/new/category.html:46
+#: templates/web/base/report/new/category.html:35
msgid "Subcategory"
msgstr ""
-#: templates/web/zurich/admin/index-dm.html:27
+#: templates/web/zurich/admin/index-dm.html:29
msgid "Subdivision/Body"
msgstr "下屬單位/機關"
-#: templates/web/base/contact/index.html:99
+#: templates/web/base/contact/enquiry/index.html:30
+#: templates/web/base/contact/index.html:103
msgid "Subject"
msgstr "主旨"
-#: templates/web/base/admin/report_edit.html:117
+#: templates/web/base/admin/reports/edit.html:122
#: templates/web/base/report/update/moderation_diff.html:2
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/reports/edit.html:41
msgid "Subject:"
msgstr "主旨:"
-#: templates/web/base/auth/2faform.html:20
+#: templates/web/base/auth/2fa/form-add.html:14
+#: 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:69
-#: templates/web/base/report/form/user_loggedout_password.html:33
+#: templates/web/base/report/form/user_loggedout_by_email.html:65
+#: 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:71
+#: templates/web/base/report/new/login_success_form.html:17
+#: templates/web/base/report/new/oauth_email_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:73
msgid "Submit"
msgstr "送出"
-#: templates/web/base/admin/report_edit.html:180
-#: templates/web/base/admin/report_edit.html:25
+#: templates/web/base/admin/reports/edit.html:185
+#: templates/web/base/admin/reports/edit.html:25
#: templates/web/base/admin/update_edit.html:82
-#: templates/web/base/admin/users/form.html:197
-#: templates/web/zurich/admin/report_edit-sdm.html:124
-#: templates/web/zurich/admin/report_edit.html:265
+#: templates/web/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/zurich/admin/update_edit.html:38
msgid "Submit changes"
msgstr "送出更新"
-#: templates/web/base/questionnaire/index.html:110
+#: templates/web/base/questionnaire/index.html:112
msgid "Submit questionnaire"
msgstr "送出問卷"
-#: templates/web/zurich/admin/index-dm.html:23
-#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-dm.html:25
+#: templates/web/zurich/admin/index-dm.html:8
#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/reports/index.html:13
msgid "Submitted"
msgstr "已送出"
-#: templates/web/base/alert/_list.html:77
-#: templates/web/base/alert/_list.html:80
-#: templates/web/base/alert/updates.html:23
-#: templates/web/base/report/display_tools.html:47
-#: templates/web/base/report/display_tools.html:52
+#: 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
msgid "Subscribe"
msgstr "訂閱"
-#: templates/web/base/alert/_list.html:72
+#: templates/web/base/alert/_list.html:67
msgid "Subscribe by email"
msgstr ""
@@ -4065,11 +4359,18 @@ msgstr ""
msgid "Subscribed:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101
+#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:34
+#, fuzzy
+msgid "Summaries are limited to %d characters in length. Please shorten your summary"
+msgstr "更新內容有 %s 字數限制,請簡化您的更新。"
+
+#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:138
+#: perllib/FixMyStreet/Cobrand/Rutland.pm:16
msgid "Summaries are limited to %s characters in length. Please shorten your summary"
msgstr ""
-#: templates/web/base/js/translation_strings.html:9
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:10
msgid "Summaries are limited to {0} characters in length. Please shorten your summary"
msgstr ""
@@ -4077,19 +4378,20 @@ msgstr ""
msgid "Summarise the problem"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:148
+#: templates/web/base/admin/bodies/contact-form.html:116
msgid "Summarise your changes"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:633
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:399
+#: perllib/FixMyStreet/Cobrand/Default.pm:678
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:314
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:409
#: 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:42
+#: templates/web/zurich/header.html:45
msgid "Summary"
msgstr "摘要"
@@ -4103,11 +4405,11 @@ msgstr "申報摘要"
msgid "Summary statistics"
msgstr ""
-#: templates/web/base/admin/users/form.html:157
+#: templates/web/base/admin/users/form.html:130
msgid "Superuser:"
msgstr ""
-#: templates/web/base/admin/users/form.html:153
+#: templates/web/base/admin/users/form.html:126
msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
msgstr ""
@@ -4121,29 +4423,33 @@ msgstr "調查結果"
msgid "Tell us about you"
msgstr ""
-#: templates/web/zurich/admin/template_edit.html:7
+#: templates/web/zurich/admin/templates/edit.html:7
msgid "Template &laquo;%s&raquo;"
msgstr "模版 &laquo;%s&raquo;"
-#: perllib/FixMyStreet/Cobrand/Default.pm:658
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:410
+#: perllib/FixMyStreet/Cobrand/Default.pm:704
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:420
#: templates/web/base/develop/email_list.html:3
-#: templates/web/zurich/header.html:62
+#: templates/web/zurich/header.html:65
msgid "Templates"
msgstr "模版"
-#: templates/web/zurich/admin/templates.html:9
+#: templates/web/zurich/admin/templates/view.html:9
msgid "Text"
msgstr "內文"
+#: templates/web/base/admin/extra-metadata-item.html:69
+msgid "Text field"
+msgstr ""
+
#: templates/web/base/admin/bodies/body.html:33
msgid "Text only version"
msgstr "文字版"
-#: templates/web/base/admin/template_edit.html:33
+#: templates/web/base/admin/templates/edit.html:35
#: templates/web/base/admin/update_edit.html:20
#: templates/web/base/admin/update_edit.html:94
-#: templates/web/zurich/admin/template_edit.html:24
+#: templates/web/zurich/admin/templates/edit.html:27
#: templates/web/zurich/admin/update_edit.html:12
msgid "Text:"
msgstr "內文:"
@@ -4168,7 +4474,7 @@ msgstr ""
msgid "Thank you for your feedback"
msgstr "感謝您的回饋"
-#: templates/web/base/around/_error_multiple.html:23
+#: templates/web/base/around/_error_multiple.html:26
msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
msgstr "感謝上傳照片,現在需要知道問題的地點位置,請在上方方格內輸入附近街名或郵編 "
@@ -4176,7 +4482,12 @@ msgstr "感謝上傳照片,現在需要知道問題的地點位置,請在上
msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
msgstr "謝謝,很高興知道此問題己修復了。請問您過去是否曾申報過問題? "
-#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161
+#: templates/web/base/auth/2fa/intro.html:11
+#: templates/web/base/auth/generate_token.html:30
+msgid "Thanks, you have successfully enabled two-factor authentication on your account."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Model/PhotoSet.pm:145
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 "
@@ -4184,55 +4495,49 @@ 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:141
+#: perllib/FixMyStreet/App/Controller/Location.pm:161
msgid "That location does not appear to be in the UK; please try again."
msgstr "這地點似乎不在台灣; 請再試 一次。"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104
-#: perllib/FixMyStreet/Cobrand/UK.pm:73
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:157
+#: perllib/FixMyStreet/Cobrand/TransportFocus.pm:88
+#: perllib/FixMyStreet/Cobrand/UK.pm:78
msgid "That postcode was not recognised, sorry."
msgstr "抱歉此郵遞區號無法辨識"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:495
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:270
msgid "That problem has been marked as sent."
msgstr "問題被標註為送出"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:488
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:263
msgid "That problem will now be resent."
msgstr "此問題將重新送出"
-#: perllib/FixMyStreet/App/Controller/Report.pm:161
-msgid "That report cannot be viewed on %s."
-msgstr "此申報無法在 %s上檢視 "
-
-#: perllib/FixMyStreet/App/Controller/Report.pm:151
+#: perllib/FixMyStreet/App/Controller/Report.pm:156
msgid "That report has been removed from FixMyStreet."
msgstr "該申報已遭FixMyStreet 移除 "
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:581
msgid "That user has been logged out."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:588
msgid "That user has been made anonymous on all reports and updates."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:637
msgid "That user’s personal details have been removed."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:602
msgid "That user’s reports and updates have been hidden."
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:27
-msgid ""
-"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
-" Other categories for this body may have the same email address."
+#: templates/web/base/admin/manifesttheme/form.html:20
+msgid "The <strong>background colour</strong> defines a placeholder background colour for the application splash screen before it has loaded. Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
msgstr ""
-"此 <strong>電子郵件</strong> 為此類別申報所將送出的對象\n"
-"該主責單位負責的其它類別可能也會使用同一電子郵件"
#: templates/web/base/admin/bodies/open311-form-fields.html:14
#: templates/web/base/admin/bodies/open311-form-fields.html:15
@@ -4243,11 +4548,8 @@ msgstr ""
"此<strong>端點</strong> FixMyStreet 服務連結,\n"
"當申報送出給該機關時,就會連結到此。"
-#: templates/web/base/admin/bodies/contact-form.html:126
-#: templates/web/base/admin/bodies/contact-form.html:127
-msgid ""
-"The <strong>group</strong> is used for the top-level category field when\n"
-" subcategory grouping is enabled."
+#: templates/web/base/admin/manifesttheme/form.html:49
+msgid "The <strong>icons</strong> are used when the application is installed to the user's home screen. Icons must be <strong>square</strong>, with <strong>512x512</strong>px and <strong>192x192</strong>px being the most common sizes."
msgstr ""
#: templates/web/base/admin/bodies/open311-form-fields.html:27
@@ -4259,8 +4561,12 @@ msgstr ""
"此<strong>管轄區</strong> 功能只有在終端不只一個\n"
"時才會用到。如果機關自行營運用終端,此處功能可以不選留白 "
-#: templates/web/base/admin/bodies/contact-form.html:104
-#: templates/web/base/admin/bodies/contact-form.html:105
+#: templates/web/base/admin/manifesttheme/form.html:5
+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:69
+#: templates/web/base/admin/bodies/contact-form.html:70
#: templates/web/base/admin/bodies/form.html:101
#: templates/web/base/admin/bodies/form.html:102
msgid ""
@@ -4270,6 +4576,14 @@ msgstr ""
"<strong>送出方式</strong> 決定了問題申報如何送給相關單位\n"
"如果此處未作選擇<strong>系統預設的送出方式為電子郵件</strong>."
+#: templates/web/base/admin/manifesttheme/form.html:10
+msgid "The <strong>short name</strong> is a string that represents the name of the web application displayed to the user if there is not enough space to display name (e.g., as a label for an icon on the phone home screen)."
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/form.html:15
+msgid "The <strong>theme colour</strong> defines the default theme colour for the application. This sometimes affects how the OS displays the site (e.g., on Android's task switcher, the theme colour surrounds the site). Colours should be specified with CSS syntax, e.g. <strong><code>#ff00ff</code></strong> or <strong><code>rgb(255, 0, 255)</code></strong> or a named colour like <strong><code>fuchsia</code></strong>."
+msgstr ""
+
#: templates/web/base/open311/index.html:82
msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
msgstr " Open311 v2 的權責單位適用於對接收問題申報機關,但不受限於Open311 v2 規範定義。"
@@ -4283,11 +4597,16 @@ msgstr ""
"有關單位<strong>名稱</strong> 可辨認出該機構(例如, <em>高雄市工務局公園處 </em>)\n"
"此名稱會公開顯示。"
-#: templates/web/base/admin/extra-metadata-form.html:22
-msgid "The code used to store this field value in the database. e.g. <code>address</code> would be available as <code>problem.extra.address</code> in the templates."
+#: templates/web/base/admin/extra-metadata-item.html:30
+msgid "The code used to store this field value in the database."
msgstr ""
-#: templates/web/base/report/new/fill_in_details_text.html:1
+#: templates/web/base/admin/bodies/contact-form.html:31
+#, fuzzy
+msgid "The contact has been confirmed as correct."
+msgstr "問題被標註為送出"
+
+#: templates/web/base/report/new/fill_in_details_text.html:2
#: templates/web/base/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr "地方政府可能無法協助,除非您留下問題的詳細細節。請仔細描述問題的明確地點(例如哪裏的牆面),什樣樣的問題以及多久了,具體情況描述(如果有照片更佳)等等"
@@ -4302,15 +4621,11 @@ msgstr "這個勤奮表單顯示用戶的活動(誰做了做多的修改編輯
msgid "The error was: %s"
msgstr "顯示錯誤為: %s"
-#: templates/web/base/admin/extra-metadata-form.html:40
-msgid "The field name as shown to the user on the report form."
-msgstr ""
-
#: templates/web/base/open311/index.html:78
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "下列 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:150
+#: perllib/FixMyStreet/Geocode/OSM.pm:153
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上無登記路名資料。"
@@ -4347,10 +4662,6 @@ msgstr "這連結可能失效了或者你並未正確地複制貼上它"
msgid "The list of available areas is being provided by the MapIt service at %s."
msgstr "%s 區域中,MapIt服務涵蓋的範圍清單"
-#: templates/web/base/admin/extra-metadata-form.html:6
-msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value."
-msgstr ""
-
#: templates/web/base/auth/change_password.html:26
#: templates/web/base/auth/change_password.html:30
msgid "The passwords do not match"
@@ -4360,24 +4671,24 @@ msgstr "密碼不符"
msgid "The requested URL '%s' was not found on this server"
msgstr "找不到您所要求的網頁連結。"
-#: templates/web/base/admin/extra-metadata-form.html:52
-msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection."
+#: templates/web/base/admin/roles/form.html:5
+msgid "The role's <strong>name</strong> is used to refer to this group of permissions elsewhere in the admin."
msgstr ""
#: templates/web/base/admin/users/import.html:68
-msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):"
+msgid "The uploaded CSV file must contain a header row, and records can have the following fields:"
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:98
+#: perllib/FixMyStreet/Script/Reports.pm:101
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "用戶無法在地點上標示問題,但可以看到他們輸入的地點"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:627
msgid "The user has been sent a login email"
msgstr ""
-#: templates/web/base/admin/users/form.html:10
-#: templates/web/base/admin/users/form.html:11
+#: templates/web/base/admin/users/form.html:13
+#: templates/web/base/admin/users/form.html:14
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."
@@ -4385,7 +4696,20 @@ msgstr ""
"用戶的<strong>名字</strong> 會公開出現在未標記<em>匿名</em>的申報上\n"
"名字不需要獨特可重覆 "
+#: templates/web/base/admin/manifesttheme/form.html:1
+msgid "Theme"
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/index.html:10
+msgid "Theme Colour"
+msgstr ""
+
+#: templates/web/base/admin/manifesttheme/index.html:1
+msgid "Themes"
+msgstr ""
+
#: templates/web/base/around/_on_map_empty.html:1
+#: templates/web/base/dashboard/heatmap-list.html:21
#: templates/web/base/my/_problem-list.html:8
#: templates/web/base/reports/_problem-list.html:13
msgid "There are no reports to show."
@@ -4395,7 +4719,11 @@ msgstr "沒有申報可顯示"
msgid "There are similar problems nearby that we’re already aware of, is one of them yours?"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:819
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:98
+msgid "There is already a template with that title."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin/Templates.pm:135
msgid "There is already an auto-response template for this category/state."
msgstr ""
@@ -4403,30 +4731,26 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "本頁現在無法願現所要求的申報資料,請稍候再試。"
-#: perllib/FixMyStreet/App/Controller/Contact.pm:156
+#: perllib/FixMyStreet/App/Controller/Contact.pm:170
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44
msgid "There was a problem showing this page. Please try again later."
msgstr "本頁出現錯誤,請再試一次"
-#: perllib/FixMyStreet/App/Controller/Alert.pm:364
-msgid "There was a problem with your email/password combination. Please try again."
-msgstr "您的電子郵件/密碼不符,請重試一次"
-
#: templates/web/base/auth/_username_error.html:0
#: templates/web/base/auth/_username_error.html:14
msgid "There was a problem with your login information."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:857
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146
-msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form."
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:911
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:147
+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:354
msgid "There was a problem with your update. Please try again."
msgstr "您的申報有問題,請重試一次"
-#: perllib/FixMyStreet/App/Controller/Contact.pm:160
+#: perllib/FixMyStreet/App/Controller/Contact.pm:174
msgid "There were problems with your report. Please see below."
msgstr "您的申報有問題,請見下方說明"
@@ -4434,12 +4758,16 @@ msgstr "您的申報有問題,請見下方說明"
msgid "There were problems with your update. Please see below."
msgstr "您的更新有問題,請見下方說明"
+#: templates/web/base/admin/category-checkboxes.html:33
+msgid "These categories appear in more than one group:"
+msgstr ""
+
#: templates/web/base/report/form/private_details.html:13
-#: templates/web/base/report/new/councils_text_private.html:5
+#: templates/web/base/report/new/councils_text_private.html:6
msgid "These details will be sent to the council, but will never be shown online without your permission."
msgstr ""
-#: templates/web/base/report/new/councils_text_private.html:3
+#: templates/web/base/report/new/councils_text_private.html:4
msgid "These details will never be shown online without your permission."
msgstr ""
@@ -4461,16 +4789,21 @@ msgstr ""
msgid "These users weren't updated."
msgstr ""
-#: templates/web/base/report/new/councils_text.html:3
#: templates/web/base/report/new/councils_text.html:4
+#: templates/web/base/report/new/councils_text.html:5
msgid "These will be published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
msgstr ""
-#: templates/web/base/report/new/councils_text_all.html:5
-#: templates/web/base/report/new/councils_text_all.html:7
+#: templates/web/base/report/new/councils_text_all.html:6
+#: templates/web/base/report/new/councils_text_all.html:9
msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>."
msgstr ""
+#: templates/web/base/report/new/councils_text_all.html:16
+#: templates/web/base/report/new/councils_text_all.html:6
+msgid "These will be sent to <strong>%s</strong> but not published online."
+msgstr ""
+
#: templates/web/base/open311/index.html:69
msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
msgstr "此API執行正在安裝中尚未完全,未來將作無預警的更動"
@@ -4499,34 +4832,31 @@ msgstr ""
"此單位只涵蓋 <strong>負責區域</strong>的申報問題處理。 \n"
"除非其涵蓋至少一個區域,否則政府單位不會接收到問題申報 "
-#: perllib/FixMyStreet/Script/Reports.pm:200
+#: perllib/FixMyStreet/Script/Reports.pm:176
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "當用戶沒有選擇類別時,電子郵件將送到負責該區域的各地方政府。如果您不是該問題的受理機關,請略過,或讓我們知道該問題的類別以在系統作修正。"
-#: perllib/FixMyStreet/Script/Reports.pm:203
+#: perllib/FixMyStreet/Script/Reports.pm:179
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "電子郵件將送到負責該區域的多個地方政府,因選擇的類別提供這些對象。如果您不是負責受理機關,請略過。"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127
-#: perllib/FixMyStreet/Cobrand/UK.pm:45
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1087
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1159
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1206
+#: perllib/FixMyStreet/Cobrand/UK.pm:50
msgid "This information is required"
msgstr "本項資訊必填"
-#: templates/web/base/admin/template_edit.html:19
+#: templates/web/base/admin/templates/edit.html:21
msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
msgstr ""
-#: templates/web/base/debug_header.html:3
-msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
-msgstr "本站為開發試用,可能隨時故障,資料庫也會定期刪除。"
-
-#: templates/web/base/admin/template_edit.html:29
+#: templates/web/base/admin/templates/edit.html:31
msgid "This is the <strong>public</strong> text that will be shown on the site."
msgstr ""
-#: templates/web/base/js/translation_strings.html:48
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:50
msgid "This is the problem"
msgstr ""
@@ -4546,7 +4876,8 @@ msgstr "問題尚未解決"
msgid "This problem is still ongoing"
msgstr ""
-#: templates/web/base/js/translation_strings.html:47
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:49
msgid "This report"
msgstr ""
@@ -4554,41 +4885,45 @@ msgstr ""
msgid "This report is a duplicate. Please leave updates on the original report:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:142
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "此問題尚待審核"
-#: perllib/FixMyStreet/Script/Alerts.pm:119
+#: perllib/FixMyStreet/Script/Alerts.pm:123
msgid "This report is currently marked as closed."
msgstr "該申報目前注記為結案狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:117
+#: perllib/FixMyStreet/Script/Alerts.pm:121
msgid "This report is currently marked as fixed."
msgstr "該申報目前注記為解決狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:121
+#: perllib/FixMyStreet/Script/Alerts.pm:125
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
msgid "This report is now closed to updates."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:89
+#: perllib/FixMyStreet/Script/Reports.pm:92
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "本頁包括由用戶提供反應問題的照片 "
-#: templates/web/zurich/admin/report_edit-sdm.html:119
-#: templates/web/zurich/admin/report_edit-sdm.html:78
-#: templates/web/zurich/admin/report_edit.html:106
-#: templates/web/zurich/admin/report_edit.html:144
+#: templates/web/zurich/admin/report_edit-sdm.html:106
+#: templates/web/zurich/admin/report_edit-sdm.html:66
+#: templates/web/zurich/admin/reports/edit.html:132
+#: templates/web/zurich/admin/reports/edit.html:94
msgid "Time spent (in minutes):"
msgstr "花費時間(以分鐘計):"
-#: perllib/FixMyStreet/Cobrand/Default.pm:634
+#: perllib/FixMyStreet/Cobrand/Default.pm:679
+#: perllib/FixMyStreet/Cobrand/KiitC.pm:315
#: templates/web/base/admin/timeline.html:1
+#: templates/web/base/admin/users/index.html:68
+#: templates/web/base/admin/users/log.html:1
msgid "Timeline"
msgstr "時間軸"
@@ -4597,23 +4932,23 @@ msgid "Tips for perfect photos"
msgstr ""
#: templates/web/base/admin/flagged.html:15
-#: templates/web/base/admin/index.html:61
-#: templates/web/base/admin/reports.html:13
-#: templates/web/base/admin/templates.html:6
-#: templates/web/zurich/admin/templates.html:8
+#: templates/web/base/admin/index.html:67
+#: templates/web/base/admin/reports/index.html:13
+#: templates/web/base/admin/templates/view.html:6
+#: templates/web/zurich/admin/templates/view.html:8
msgid "Title"
msgstr "標題"
-#: templates/web/base/admin/template_edit.html:23
-#: templates/web/zurich/admin/template_edit.html:20
+#: templates/web/base/admin/templates/edit.html:25
+#: templates/web/zurich/admin/templates/edit.html:23
msgid "Title:"
msgstr "標題"
-#: templates/web/base/alert/index.html:26
+#: 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 "找出適合您的在地通知,請輸入您的郵編或街名區域"
-#: templates/web/base/alert/index.html:28
+#: templates/web/base/alert/_index_text.html:23
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "找出適合您的在地通知,請輸入您的郵編或街名區域"
@@ -4625,12 +4960,17 @@ msgstr ""
msgid "To limit this collection of fields to a single language, select it here."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:97
+#: templates/web/base/report/update-form-wrapper.html:4
+msgid "To provide an update, please <a href=\"%s\">sign in</a>."
+msgstr ""
+
+#: perllib/FixMyStreet/Script/Reports.pm:100
msgid "To view a map of the precise location of this issue"
msgstr "檢視地圖上問題之確切位置"
#: templates/web/base/auth/generate_token.html:11
-msgid "Token:"
+#: templates/web/base/auth/generate_token.html:66
+msgid "Token"
msgstr ""
#: templates/web/base/reports/index.html:126
@@ -4647,15 +4987,15 @@ msgstr ""
#: templates/web/base/admin/stats/fix_rate.html:4
#: templates/web/base/admin/stats/questionnaire.html:24
-#: templates/web/base/dashboard/index.html:119
-#: templates/web/base/dashboard/index.html:124
-#: templates/web/base/dashboard/index.html:148
+#: templates/web/base/dashboard/index.html:120
+#: templates/web/base/dashboard/index.html:125
+#: templates/web/base/dashboard/index.html:149
#: templates/web/zurich/admin/stats/index.html:51
msgid "Total"
msgstr "總數"
-#: templates/web/base/report/_inspect.html:158
-#: templates/web/base/report/_item.html:76
+#: templates/web/base/report/_item.html:86
+#: templates/web/base/report/inspect/extra_details.html:13
msgid "Traffic management required?"
msgstr ""
@@ -4667,21 +5007,11 @@ msgstr ""
msgid "Translations"
msgstr ""
-#: templates/web/base/admin/users/form.html:134
-msgid "Trusted by bodies:"
-msgstr ""
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:727
-msgid "Trusted to make reports that don't need to be inspected"
-msgstr ""
-
-#: templates/web/base/admin/users/form.html:142
-msgid "Trusted:"
-msgstr ""
-
-#: templates/web/base/auth/2faform.html:6
+#. ("JS")
+#: templates/web/base/auth/2fa/form-add.html:8
+#: templates/web/base/auth/2fa/form.html:6
#: templates/web/base/auth/smsform.html:17
-#: templates/web/base/js/translation_strings.html:41
+#: templates/web/base/js/translation_strings.html:43
msgid "Try again"
msgstr "再試一次"
@@ -4689,30 +5019,36 @@ msgstr "再試一次"
msgid "Try emailing us directly:"
msgstr "何不直接發信給我們:"
-#: templates/web/base/auth/generate_token.html:21
+#: 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
+msgid "Two-factor authentication"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:29
msgid "Two-factor authentication has been activated"
msgstr ""
-#: templates/web/base/auth/generate_token.html:32
+#: templates/web/base/auth/generate_token.html:21
msgid "Two-factor authentication has been deactivated"
msgstr ""
-#: templates/web/base/admin/extra-metadata-form.html:54
#: templates/web/base/admin/states/index.html:10
#: templates/web/base/admin/states/index.html:100
#: templates/web/base/admin/users/alerts.html:9
msgid "Type"
msgstr ""
-#: templates/web/base/admin/users/form.html:34
+#: templates/web/base/admin/users/form.html:37
msgid "Unban"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:63
-#: templates/web/base/admin/bodies/contact-form.html:55
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
+#: templates/web/base/admin/bodies/contact-form.html:25
#: templates/web/base/admin/update_edit.html:30
-#: templates/web/zurich/admin/report_edit-sdm.html:66
-#: templates/web/zurich/admin/report_edit.html:94
+#: templates/web/zurich/admin/report_edit-sdm.html:54
+#: templates/web/zurich/admin/reports/edit.html:82
#: templates/web/zurich/admin/update_edit.html:18
msgid "Unconfirmed"
msgstr "未確認的"
@@ -4725,26 +5061,27 @@ msgstr "未知的"
msgid "Unknown alert type"
msgstr "未知的通知類別"
-#: perllib/FixMyStreet/App/Controller/Photo.pm:119
-#: perllib/FixMyStreet/App/Controller/Root.pm:142
-#: templates/web/base/js/translation_strings.html:55
+#. ("JS")
+#: perllib/FixMyStreet/App/Controller/Photo.pm:136
+#: perllib/FixMyStreet/App/Controller/Root.pm:147
+#: templates/web/base/js/translation_strings.html:57
msgid "Unknown error"
msgstr "未知的錯誤"
-#: perllib/FixMyStreet/App/Controller/Develop.pm:159
-#: perllib/FixMyStreet/App/Controller/Develop.pm:178
-#: perllib/FixMyStreet/App/Controller/My.pm:200
-#: perllib/FixMyStreet/App/Controller/Report.pm:136
-#: perllib/FixMyStreet/App/Controller/Report.pm:142
-#: perllib/FixMyStreet/App/Controller/Report.pm:145
+#: 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
msgid "Unknown problem ID"
msgstr "未知的問題編號  "
-#: perllib/FixMyStreet/App/Controller/Contact.pm:99
+#: perllib/FixMyStreet/App/Controller/Contact.pm:106
msgid "Unknown update ID"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:25
+#: templates/web/base/reports/_list-filter-status.html:25
msgid "Unshortlisted"
msgstr ""
@@ -4758,20 +5095,25 @@ msgstr ""
msgid "Update"
msgstr "更新"
+#: templates/web/base/admin/users/log.html:51
+#, fuzzy
+msgid "Update %s created for problem %d"
+msgstr "由%s 更新%s 申報之問題%s  "
+
#: templates/web/base/admin/timeline.html:33
msgid "Update %s created for problem %d; by %s"
msgstr "由%s 更新%s 申報之問題%s  "
-#: templates/web/base/contact/index.html:33
+#: templates/web/base/contact/index.html:37
msgid "Update below added anonymously at %s"
msgstr "下方更新 為匿名提供%s"
-#: templates/web/base/contact/index.html:35
+#: templates/web/base/contact/index.html:39
msgid "Update below added by %s at %s"
msgstr "由%d 在 %s 所提供的更新"
#: templates/web/base/admin/bodies/form.html:139
-#: templates/web/zurich/admin/bodies/form.html:51
+#: templates/web/zurich/admin/bodies/form.html:63
msgid "Update body"
msgstr "更新內文"
@@ -4796,43 +5138,44 @@ msgstr "本問題已解決之更新標註"
msgid "Update reopened problem"
msgstr "更新重申報之問題 "
-#: templates/web/base/admin/bodies/body.html:111
+#: templates/web/base/admin/bodies/body.html:130
msgid "Update statuses"
msgstr "更新之狀態"
-#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:25
#: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/reports/index.html:13
msgid "Updated"
msgstr "已更新"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:252
+#: perllib/FixMyStreet/DB/Result/Comment.pm:251
msgid "Updated by <strong>%s</strong> (%s) at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:254
+#: perllib/FixMyStreet/DB/Result/Comment.pm:253
msgid "Updated by <strong>%s</strong> at %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:575
-#: perllib/FixMyStreet/App/Controller/Admin.pm:915
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:805
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:830
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:903
+#: perllib/FixMyStreet/App/Controller/Admin.pm:271
+#: perllib/FixMyStreet/App/Controller/Admin/Reports.pm:364
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:176
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:382
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:45
+#: 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
msgid "Updated!"
msgstr "已更新!"
#: templates/web/base/admin/list_updates.html:2
-#: templates/web/base/dashboard/index.html:108
+#: templates/web/base/dashboard/index.html:109
#: templates/web/base/report/update.html:4
#: templates/web/zurich/report/updates.html:2
msgid "Updates"
msgstr "更新"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:155
+#: perllib/FixMyStreet/DB/Result/Comment.pm:149
msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr "更新內容有 %s 字數限制,請簡化您的更新。"
@@ -4850,17 +5193,6 @@ msgstr "更新問題, %s"
msgid "Usage notes"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:43
-#: templates/web/base/admin/bodies/contact-form.html:44
-msgid ""
-"Use <strong>confirmed</strong> to indicate that this contact has been\n"
-"confirmed as correct. If you are not sure of the origin or validity of the\n"
-"contact, use <strong>unconfirmed</strong>. <strong>inactive</strong> will\n"
-"remove the category from use when reporting problems, but keep it available in\n"
-"map filters, and <strong>deleted</strong> will remove the category from there\n"
-"as well."
-msgstr ""
-
#: templates/web/base/admin/bodies/open311-form-fields.html:137
msgid "Use Open311 problem fetching"
msgstr ""
@@ -4869,15 +5201,10 @@ msgstr ""
msgid "Use Open311 update-sending extension"
msgstr ""
-#: templates/web/base/admin/bodies/contact-form.html:143
-msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body."
+#: templates/web/base/admin/bodies/contact-form.html:53
+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/zurich/admin/report_edit-sdm.html:50
-#: templates/web/zurich/admin/report_edit.html:69
-msgid "Used map"
-msgstr "已用過之地圖"
-
#: templates/web/base/admin/bodies/open311-form-fields.html:90
msgid "User ID to attribute fetched comments to"
msgstr ""
@@ -4886,36 +5213,36 @@ msgstr ""
msgid "User Import"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:665
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:676
msgid "User added to abuse list"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:153
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:282
msgid "User already exists"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:661
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:672
msgid "User already in abuse list"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:758
msgid "User flag removed"
msgstr "移除用戶的標記警告"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:728
msgid "User flagged"
msgstr "給用戶標記警告"
#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users/form.html:34
-#: templates/web/base/admin/users/index.html:32
+#: templates/web/base/admin/users/form.html:37
+#: templates/web/base/admin/users/index.html:65
msgid "User in abuse table"
msgstr ""
-#: templates/web/base/admin/users/index.html:5
+#: templates/web/base/admin/users/index.html:20
msgid "User search finds matches in users' names and email addresses."
msgstr "用戶找到相符的名稱與電子郵件"
@@ -4923,24 +5250,36 @@ msgstr "用戶找到相符的名稱與電子郵件"
msgid "User's alerts"
msgstr ""
-#: templates/web/base/admin/report_edit.html:137
+#: templates/web/base/admin/reports/edit.html:142
#: templates/web/base/admin/update_edit.html:36
msgid "User:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:667
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:415
-#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54
+#: 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
+#: templates/web/base/admin/flagged.html:29
+#: templates/web/base/admin/roles/index.html:25
+#: templates/web/zurich/header.html:57
msgid "Users"
msgstr "使用者"
-#: templates/web/base/admin/users/form.html:167
+#: templates/web/base/admin/users/form.html:140
+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
msgid "Users can perform the following actions within their assigned body or area."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291
-#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327
+#: templates/web/base/admin/roles/form.html:14
+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:311
#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354
msgid "Values updated"
msgstr "數值更新"
@@ -4949,25 +5288,25 @@ msgstr "數值更新"
msgid "Verify"
msgstr ""
-#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:2
#: templates/web/base/auth/change_email.html:5
msgid "Verify email address"
msgstr ""
-#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:2
#: templates/web/base/auth/change_phone.html:5
msgid "Verify phone number"
msgstr ""
-#: templates/web/base/admin/report_edit.html:36
+#: templates/web/base/admin/reports/edit.html:36
#: templates/web/base/admin/update_edit.html:18
#: templates/web/zurich/admin/report_edit-sdm.html:23
-#: templates/web/zurich/admin/report_edit.html:24
+#: templates/web/zurich/admin/reports/edit.html:24
#: templates/web/zurich/admin/update_edit.html:10
msgid "View report on site"
msgstr "檢視本站之申報 "
-#: templates/web/base/reports/body.html:14
+#: templates/web/base/reports/body.html:21
msgid "View reports by ward"
msgstr "檢視里/區之申報 "
@@ -4975,7 +5314,7 @@ msgstr "檢視里/區之申報 "
msgid "View wards"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:759
msgid "View/Mark private reports"
msgstr ""
@@ -4985,6 +5324,7 @@ msgid "Viewing a location"
msgstr "檢視地區"
#: templates/web/base/report/display.html:0
+#: templates/web/base/report/display.html:6
msgid "Viewing a problem"
msgstr "檢視問題 "
@@ -4992,7 +5332,7 @@ msgstr "檢視問題 "
msgid "Ward:"
msgstr ""
-#: templates/web/base/reports/body.html:16
+#: templates/web/base/reports/body.html:23
msgid "Wards of this council"
msgstr "地方政府轄下的里/區"
@@ -5015,7 +5355,7 @@ msgstr ""
msgid "We need your email address, please give it below."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:209
+#: perllib/FixMyStreet/Script/Reports.pm:185
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "我們理解此問題可能是%s之責任,然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊,請告訴我們。"
@@ -5024,7 +5364,7 @@ msgid "We send it to the council on your behalf"
msgstr "我們將代表您將此呈報給地方政府"
#: templates/web/base/alert/choose.html:13
-#: templates/web/base/around/_error_multiple.html:17
+#: templates/web/base/around/_error_multiple.html:20
msgid "We show up to ten matches, please try a different search if yours is not here."
msgstr ""
@@ -5037,7 +5377,7 @@ msgstr ""
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr "很遺憾該問題仍未修復。何不試試聯絡當地議員民代反應此狀況?"
-#: templates/web/base/dashboard/index.html:122
+#: templates/web/base/dashboard/index.html:123
msgid "Website"
msgstr ""
@@ -5058,19 +5398,11 @@ msgstr "何時編輯 "
msgid "When sent"
msgstr "何時送出"
-#: templates/web/base/admin/extra-metadata-form.html:12
-msgid "Whether the field is displayed to the user, included as a hidden field and automatically populated, or set by the server upon Open311 submission. This field is usually set automatically."
-msgstr ""
-
-#: templates/web/base/admin/extra-metadata-form.html:28
-msgid "Whether the user is required to provide a value for this field."
-msgstr ""
-
#: templates/web/base/alert/_list.html:9
msgid "Which problems do you want alerts about?"
msgstr ""
-#: templates/web/base/report/_inspect.html:123
+#: templates/web/base/report/_inspect.html:40
msgid "Which report is it a duplicate of?"
msgstr ""
@@ -5082,7 +5414,7 @@ msgstr "為何在此卡住?免費<a href=\"/alert\">設定更多訊息通知</
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "搜尋要求,也可能限制單一機構中搜尋相關權責單位。其搜尋字眼為 <a href=\"%s\">MaPit</a>提供的主管ID."
-#: templates/web/base/dashboard/index.html:163
+#: templates/web/base/dashboard/index.html:164
msgid "Within the specified timeframe:"
msgstr ""
@@ -5090,7 +5422,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:101
+#: templates/web/base/questionnaire/index.html:103
msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
msgstr "您是否願意4週後再收到另一份問卷?以提醒您確認最新的狀況"
@@ -5102,9 +5434,9 @@ 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:1200
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116
-#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117
+#: 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
#: templates/web/base/admin/bodies/index.html:70
#: templates/web/base/admin/flagged.html:47
@@ -5112,22 +5444,26 @@ msgstr "請注意留言內容,勿用注音文並應加上標點符號以利閱
#: templates/web/base/admin/list_updates.html:35
#: templates/web/base/admin/list_updates.html:36
#: templates/web/base/admin/problem_row.html:20
-#: templates/web/base/admin/report_edit.html:132
-#: templates/web/base/admin/report_edit.html:96
+#: templates/web/base/admin/reports/edit.html:101
+#: templates/web/base/admin/reports/edit.html:137
#: templates/web/base/admin/update_edit.html:25
#: templates/web/base/admin/users/alerts.html:21
-#: templates/web/base/admin/users/index.html:32
-#: templates/web/base/questionnaire/index.html:104
-#: templates/web/base/questionnaire/index.html:37
-#: templates/web/base/report/_inspect.html:114
+#: templates/web/base/admin/users/index.html:65
+#: templates/web/base/questionnaire/index.html:106
+#: templates/web/base/questionnaire/index.html:39
msgid "Yes"
msgstr "是"
-#: templates/web/base/contact/index.html:50
+#: templates/web/base/contact/index.html:54
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr "你申訴此問題遭不必要之和諧 "
-#: templates/web/base/js/translation_strings.html:100
+#: templates/web/base/admin/bodies/contact-form.html:26
+msgid "You are not sure of the origin or validity of the contact."
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:103
msgid "You are offline"
msgstr ""
@@ -5135,20 +5471,21 @@ msgstr ""
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "您檢舉下列問題的申報遭到濫用,包含個人資料或相關問題 "
-#: templates/web/base/contact/index.html:27
+#: templates/web/base/contact/index.html:31
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "您檢舉下列問題之更為濫用,包括個人資料或相似"
+#: templates/web/base/report/_updates_disallowed_message.html:2
#: templates/web/base/report/display.html:59
msgid "You can <a href=\"%s\">make a new report in the same location</a>."
msgstr ""
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
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:116
+#: templates/web/base/admin/users/form.html:112
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr "您可以新增某位用戶到濫用者名單,它會自動隱藏(不會送出)該名用戶所提交的申報 "
@@ -5156,7 +5493,7 @@ msgstr "您可以新增某位用戶到濫用者名單,它會自動隱藏(不
msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination."
msgstr ""
-#: templates/web/base/contact/index.html:127
+#: templates/web/base/contact/index.html:131
msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
msgstr "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。"
@@ -5170,10 +5507,10 @@ msgstr ""
"如果某一用戶過往有不當使用記錄,您想特別留意它的活動\n"
"這會很有用。"
-#: templates/web/base/report/new/top_message_none.html:12
+#: templates/web/base/report/new/top_message_none.html:13
#: templates/web/base/report/new/top_message_none.html:14
+#: templates/web/base/report/new/top_message_some.html:10
#: templates/web/base/report/new/top_message_some.html:11
-#: templates/web/base/report/new/top_message_some.html:9
msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件,把此資訊提供給我們<a href='mailto:%s'>%s</a>."
@@ -5181,11 +5518,17 @@ msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件,把
msgid "You can mark a body as deleted if you do not want it to be active on the site."
msgstr "您可以刪除某一單位如果不想讓它在本站激活"
-#: templates/web/base/js/translation_strings.html:52
+#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:242
+msgid "You cannot rename a category to an existing category"
+msgstr ""
+
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:54
msgid "You declined; please fill in the box above"
msgstr "您受到拒絕,請填寫上方表格。"
-#: templates/web/base/js/translation_strings.html:102
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:105
msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
msgstr ""
@@ -5193,12 +5536,17 @@ 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/report/new/form_report.html:38
+#: templates/web/base/contact/enquiry/index.html:58
+#, 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張照片,如果你還想上傳更多張,原先的照片會被移除)"
+
+#: templates/web/base/report/new/form_report.html:50
#: templates/web/zurich/report/new/fill_in_details_form.html:30
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:87
+#: templates/web/base/questionnaire/index.html:89
#: templates/web/base/report/update/form_update.html:16
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 ""
@@ -5212,12 +5560,11 @@ msgstr "您己登出"
msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
msgstr "您在地圖上用綠色標註問題之地點。如果此不是正確地點,請再次點擊原地圖。"
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:142
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:143
msgid "You have successfully added your phone number."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:158
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:159
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "您已成功地確認電子郵件"
@@ -5226,7 +5573,7 @@ msgstr "您已成功地確認電子郵件"
msgid "You have successfully confirmed your phone number."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:129
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:130
msgid "You have successfully removed your phone number."
msgstr ""
@@ -5235,11 +5582,11 @@ msgstr ""
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "您已成功登入,請檢查您的個人資訊是否正確:"
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:164
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:165
msgid "You have successfully verified your phone number."
msgstr ""
-#: templates/web/base/my/my.html:79
+#: templates/web/base/my/my.html:83
msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
msgstr "您當未創建任何申報,<a href=\"%s\">立即提供申報</a>"
@@ -5265,21 +5612,27 @@ msgstr ""
msgid "Your Reports"
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:26
-#: templates/web/base/auth/generate_token.html:34
+#: templates/web/base/auth/generate_token.html:23
+#: templates/web/base/auth/generate_token.html:31
#: templates/web/base/main_nav_items.html:12 templates/web/base/my/my.html:18
msgid "Your account"
msgstr ""
-#: templates/web/base/alert/updates.html:19
-#: templates/web/base/auth/create.html:37
-#: templates/web/base/auth/general.html:49
-#: templates/web/base/contact/index.html:87
-#: templates/web/base/report/display_tools.html:49
+#: templates/web/base/auth/2fa/intro.html:18
+msgid "Your account requires two-factor authentication to be set up."
+msgstr ""
+
+#: templates/web/base/alert/updates.html:30
+#: 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/new/duplicate_suggestions.html:34
+#: templates/web/base/report/new/duplicate_suggestions.html:42
#: templates/web/zurich/report/new/fill_in_details_form.html:53
msgid "Your email"
msgstr "您的電子郵件"
@@ -5288,8 +5641,8 @@ msgstr "您的電子郵件"
msgid "Your email address"
msgstr "您的電子郵件"
-#: templates/web/base/auth/create.html:35
-#: templates/web/base/auth/general.html:47
+#: templates/web/base/auth/create.html:48
+#: templates/web/base/auth/general.html:54
#: templates/web/base/report/form/user_loggedout_email.html:3
msgid "Your email or mobile"
msgstr ""
@@ -5298,7 +5651,8 @@ msgstr ""
msgid "Your information will only be used in accordance with our <a href=\"%s\">privacy policy</a>"
msgstr ""
-#: templates/web/base/contact/index.html:81
+#: templates/web/base/contact/enquiry/index.html:12
+#: templates/web/base/contact/index.html:85
msgid "Your name"
msgstr "姓名"
@@ -5306,46 +5660,52 @@ 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:272
+#: perllib/FixMyStreet/App/Controller/My.pm:301
msgid "Your name has been hidden from all your reports and updates."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:268
+#: perllib/FixMyStreet/App/Controller/My.pm:297
msgid "Your name has been hidden."
msgstr ""
-#: templates/web/base/js/translation_strings.html:92
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:95
msgid "Your offline reports"
msgstr ""
-#: templates/web/base/auth/create.html:49
-#: templates/web/base/auth/general.html:83
-#: templates/web/base/report/form/user_loggedout_password.html:17
+#: templates/web/base/auth/create.html:64
+#: templates/web/base/auth/general.html:90
+#: templates/web/base/report/form/user_loggedout_password.html:13
msgid "Your password"
msgstr "密碼"
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:170
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:171
#: templates/web/base/auth/change_password.html:12
msgid "Your password has been changed"
msgstr "密碼已更新"
-#: templates/web/base/auth/create.html:52
-#: templates/web/base/report/form/user_loggedout_by_email.html:61
-#: templates/web/base/report/form/user_loggedout_by_email.html:63
+#: templates/web/base/auth/create.html:34
+msgid "Your password has expired, please create a new one below. When you click the link in your email, your password will be updated."
+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/zurich/auth/general.html:56
msgid "Your password should include %d or more characters."
msgstr ""
#: templates/web/base/auth/change_phone.html:19
-#: templates/web/base/contact/index.html:94
+#: templates/web/base/contact/enquiry/index.html:25
+#: templates/web/base/contact/index.html:98
msgid "Your phone number"
msgstr "電話號碼"
-#: templates/web/base/questionnaire/index.html:44
+#: templates/web/base/questionnaire/index.html:46
msgid "Your report"
msgstr ""
-#: templates/web/base/my/my.html:76
+#: templates/web/base/my/my.html:80
msgid "Your reports"
msgstr "你作的申報"
@@ -5362,11 +5722,12 @@ msgstr ""
msgid "Your update"
msgstr ""
-#: templates/web/base/js/translation_strings.html:93
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:96
msgid "Your update has been saved offline for submission when back online."
msgstr ""
-#: templates/web/base/my/my.html:99
+#: templates/web/base/my/my.html:103
msgid "Your updates"
msgstr "更新"
@@ -5383,24 +5744,29 @@ msgstr ""
msgid "a colon-separated list of permissions to grant that user, e.g. <code>contribute_as_body:moderate:user_edit</code>."
msgstr ""
-#: templates/web/base/report/_inspect.html:23
+#: templates/web/base/admin/users/import.html:73
+msgid "a colon-separated list of roles to assign to that user."
+msgstr ""
+
+#: templates/web/base/report/inspect/information.html:10
msgid "admin"
msgstr ""
-#: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/users/form.html:177
+#: 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
msgid "all"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:226
-#: perllib/FixMyStreet/DB/Result/User.pm:297
+#: perllib/FixMyStreet/DB/Result/Comment.pm:220
+#: perllib/FixMyStreet/DB/Result/User.pm:344
#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160
#: templates/web/base/admin/update_edit.html:92
#: templates/web/base/report/update/moderation_meta.html:2
msgid "an administrator"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:262
+#: perllib/FixMyStreet/DB/Result/Comment.pm:261
msgid "and a defect raised"
msgstr ""
@@ -5408,17 +5774,17 @@ msgstr ""
msgid "by %s"
msgstr "由 %s"
-#: templates/web/base/reports/body.html:6
-#: templates/web/base/reports/body.html:7
+#: templates/web/base/reports/body.html:13
+#: templates/web/base/reports/body.html:14
msgid "council"
msgstr "地方政府"
-#: templates/web/base/admin/report_edit.html:53
+#: templates/web/base/admin/reports/edit.html:53
msgid "didn't use map"
msgstr "不使用地圖"
-#: templates/web/base/alert/index.html:34
-#: templates/web/base/around/postcode_form.html:13
+#: templates/web/base/alert/index.html:12
+#: templates/web/base/around/_postcode_form_examples.html:1
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "例如 ‘%s’ 或 ‘%s’"
@@ -5426,7 +5792,7 @@ msgstr "例如 ‘%s’ 或 ‘%s’"
msgid "e.g. ‘10 inch pothole on Example St, near post box’"
msgstr ""
-#: templates/web/base/report/new/form_report.html:58
+#: templates/web/base/report/new/form_report.html:70
msgid "e.g. ‘This pothole has been here for two months and…’"
msgstr ""
@@ -5449,54 +5815,64 @@ msgstr "%s上回更新:"
msgid "less than a minute"
msgstr "少於一分鐘"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:123
+#: perllib/FixMyStreet/App/Controller/Admin.pm:114
#: templates/web/base/admin/stats/questionnaire.html:15
#: templates/web/base/admin/stats/questionnaire.html:16
msgid "n/a"
msgstr "不適用"
-#: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/users/form.html:178
+#: 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
msgid "none"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:77
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:80
msgid "not the council's responsibility"
msgstr ""
+#: templates/web/base/contact/enquiry/index.html:26
+#: templates/web/base/contact/index.html:99
+#, fuzzy
+msgid "optional"
+msgstr "(任選)"
+
+#: templates/web/base/report/form/user.html:31
+#: templates/web/base/report/form/user.html:41
+#, fuzzy
+msgid "or"
+msgstr "或"
+
#: templates/web/base/auth/general.html:6
msgid "or <a href=\"%s\">create an account</a>"
msgstr ""
-#: templates/web/base/auth/create.html:13
+#: templates/web/base/auth/create.html:16
msgid "or <a href=\"%s\">sign in</a>"
msgstr ""
-#: templates/web/base/alert/index.html:40
-#: templates/web/base/around/postcode_form.html:27
-msgid "or locate me automatically"
-msgstr "自動辨識我所在位置 "
+#: templates/web/base/alert/index.html:18
+#: templates/web/base/around/postcode_form.html:36
+#, fuzzy
+msgid "or use my location"
+msgstr "檢視地區"
-#: templates/web/base/admin/report_edit.html:49
-#: templates/web/base/admin/report_edit.html:51
-#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/base/admin/reports/edit.html:50
+#: templates/web/base/admin/reports/edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:33
#: templates/web/zurich/admin/report_edit-sdm.html:34
-#: templates/web/zurich/admin/report_edit-sdm.html:55
-#: templates/web/zurich/admin/report_edit-sdm.html:57
-#: templates/web/zurich/admin/report_edit.html:34
-#: templates/web/zurich/admin/report_edit.html:36
-#: templates/web/zurich/admin/report_edit.html:50
-#: templates/web/zurich/admin/report_edit.html:52
-#: templates/web/zurich/admin/report_edit.html:74
-#: templates/web/zurich/admin/report_edit.html:76
+#: templates/web/zurich/admin/reports/edit.html:35
+#: templates/web/zurich/admin/reports/edit.html:36
+#: templates/web/zurich/admin/reports/edit.html:51
+#: templates/web/zurich/admin/reports/edit.html:52
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr "原始輸入者"
-#: templates/web/base/admin/report_edit.html:69
+#: templates/web/base/admin/reports/edit.html:69
msgid "other areas:"
msgstr "其它地區:"
-#: templates/web/zurich/admin/bodies/contact-form.html:24
+#: templates/web/zurich/admin/bodies/contact-form.html:29
msgid "show"
msgstr ""
@@ -5508,7 +5884,7 @@ msgstr "登出"
msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire."
msgstr ""
-#: templates/web/base/report/new/form_report.html:16
+#: templates/web/base/report/new/form_public_councils_text.html:6
msgid "the local council"
msgstr "當地地府"
@@ -5521,7 +5897,7 @@ msgstr "地圖上無標記,用戶未使用地圖"
msgid "this location"
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:193
+#: perllib/FixMyStreet/Script/Reports.pm:169
msgid "this type of local problem"
msgstr "此類在地問題"
@@ -5529,15 +5905,17 @@ msgstr "此類在地問題"
msgid "today"
msgstr "今天"
-#: templates/web/base/js/translation_strings.html:103
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:106
msgid "update"
msgstr ""
-#: templates/web/base/js/translation_strings.html:104
+#. ("JS")
+#: templates/web/base/js/translation_strings.html:107
msgid "updates"
msgstr ""
-#: templates/web/base/admin/report_edit.html:53
+#: templates/web/base/admin/reports/edit.html:53
msgid "used map"
msgstr "已用過之地圖"
@@ -5549,16 +5927,16 @@ msgstr "用戶來同一問題的地方政府- %d"
msgid "user is problem owner"
msgstr "%d 天數"
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:700
msgid "user not in abuse list"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599
+#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:698
msgid "user removed from abuse list"
msgstr ""
#: templates/web/base/reports/body.html:0
-#: templates/web/base/reports/body.html:3
+#: templates/web/base/reports/body.html:10
msgid "ward"
msgstr "路檔"
@@ -5610,7 +5988,7 @@ msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: templates/web/base/reports/index.html:120
+#: templates/web/fixmystreet.com/reports/summary.html:153
#, perl-format
msgid "%s day"
msgid_plural "%s days"
@@ -5628,7 +6006,7 @@ msgid "%s problem reported"
msgid_plural "%s problems reported"
msgstr[0] ""
-#: templates/web/base/reports/index.html:136
+#: templates/web/fixmystreet.com/reports/summary.html:168
#, perl-format
msgid "%s report"
msgid_plural "%s reports"
@@ -5646,19 +6024,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/base/front/stats.html:8
+#: templates/web/westminster/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/base/front/stats.html:13
+#: templates/web/westminster/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/base/front/stats.html:25
+#: templates/web/westminster/front/stats.html:19
#, perl-format
msgid "<big>%s</big> update on reports"
msgid_plural "<big>%s</big> updates on reports"
@@ -5688,14 +6066,64 @@ msgid "last updated %d day ago"
msgid_plural "last updated %d days ago"
msgstr[0] ""
-#: templates/email/default/inactive-account.html:18
+#: templates/email/fixamingata/inactive-account.txt:8
#, perl-format
msgid "month"
msgid_plural "months"
msgstr[0] ""
-#: templates/email/bathnes/archive.html:25
+#: templates/email/westminster/archive.txt:9
#, perl-format
msgid "report"
msgid_plural "reports"
msgstr[0] ""
+
+#~ msgid ""
+#~ "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
+#~ " <br>\n"
+#~ " Normally, categories are not private.\n"
+#~ " <br>\n"
+#~ " This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
+#~ " interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
+#~ " at a specific address."
+#~ msgstr ""
+#~ "檢查 <strong>私人類別</strong> 如果申報在此類別下 <strong>將不會公開在網頁上</strong>\n"
+#~ "<br>\n"
+#~ "一般而言類別不會設為私人\n"
+#~ "<br>\n"
+#~ "這類問題適合於用戶申報給有關機關,但公開申報資料並無公益性\n"
+#~ "例如在英國想在某特定地點要求多安置垃圾筒"
+
+#~ msgid "Coordinates:"
+#~ msgstr "協同單位:"
+
+#~ msgid "Didn't use map"
+#~ msgstr "不使用地圖"
+
+#~ msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
+#~ msgstr "如果您使用 <strong>非電子郵件送出申訴方式</strong>, 請在此輸入此服務代號 (Open311) 或同等的代號。"
+
+#~ msgid "OK"
+#~ msgstr "好了"
+
+#~ msgid "That report cannot be viewed on %s."
+#~ msgstr "此申報無法在 %s上檢視 "
+
+#~ msgid ""
+#~ "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
+#~ " Other categories for this body may have the same email address."
+#~ msgstr ""
+#~ "此 <strong>電子郵件</strong> 為此類別申報所將送出的對象\n"
+#~ "該主責單位負責的其它類別可能也會使用同一電子郵件"
+
+#~ msgid "There was a problem with your email/password combination. Please try again."
+#~ msgstr "您的電子郵件/密碼不符,請重試一次"
+
+#~ msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
+#~ msgstr "本站為開發試用,可能隨時故障,資料庫也會定期刪除。"
+
+#~ msgid "Used map"
+#~ msgstr "已用過之地圖"
+
+#~ msgid "or locate me automatically"
+#~ msgstr "自動辨識我所在位置 "