aboutsummaryrefslogtreecommitdiffstats
path: root/locale/zh.UTF-8
diff options
context:
space:
mode:
Diffstat (limited to 'locale/zh.UTF-8')
-rw-r--r--locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po1629
1 files changed, 950 insertions, 679 deletions
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2674f8960..db66db0ce 100644
--- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 1.0\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2017-09-13 15:40+0100\n"
+"POT-Creation-Date: 2017-12-15 17:48+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: mySociety <transifex@mysociety.org>, 2017\n"
"Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:632
-#: perllib/FixMyStreet/Script/Reports.pm:197
+#: perllib/FixMyStreet/DB/Result/Problem.pm:650
+#: perllib/FixMyStreet/Script/Reports.pm:196
msgid " and "
msgstr "與"
@@ -32,6 +32,10 @@ msgstr "與"
msgid " or "
msgstr "或"
+#: templates/web/base/report/_inspect.html:152
+msgid "%d characters maximum"
+msgstr ""
+
#: templates/web/base/admin/edit-league.html:12
msgid "%d edits by %s"
msgstr " 由 %d 編輯 %d"
@@ -64,7 +68,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:7
+#: templates/web/base/alert/index.html:8
msgid ""
"%s has a variety of RSS feeds and email alerts for local\n"
"problems, including alerts for all problems within a particular ward, or all\n"
@@ -75,7 +79,7 @@ msgstr ""
"或是某一範圍內各類問題的通知"
#. ("%s is the site name")
-#: templates/web/base/alert/index.html:11
+#: templates/web/base/alert/index.html:12
msgid ""
"%s has a variety of RSS feeds and email alerts for local problems, including\n"
"alerts for all problems within a particular ward or council, or all problems\n"
@@ -89,6 +93,11 @@ msgstr ""
msgid "%s live updates"
msgstr "%s 現場更新"
+#: templates/web/base/dashboard/index.html:159
+#: templates/web/base/dashboard/index.html:163
+msgid "%s opened, %s closed, %s fixed"
+msgstr ""
+
#: templates/web/base/status/stats.html:25
msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
msgstr "%s 問卷送出 &ndash; % 回覆(%s%%)"
@@ -97,7 +106,7 @@ msgstr "%s 問卷送出 &ndash; % 回覆(%s%%)"
msgid "%s ref:&nbsp;%s"
msgstr "%s 流水號:&nbsp;%s "
-#: perllib/FixMyStreet/Map/OSM.pm:38
+#: perllib/FixMyStreet/Map/OSM.pm:44
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者"
@@ -105,11 +114,6 @@ msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap
msgid "(Defect &amp; location of defect)"
msgstr "(缺陷 &amp; 缺陷地點)"
-#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/users.html:32
-msgid "(Email in abuse table)"
-msgstr "電郵為濫發信件"
-
#: templates/web/zurich/admin/report_edit-sdm.html:62
#: templates/web/zurich/admin/report_edit.html:90
msgid "(No name)"
@@ -145,7 +149,7 @@ msgstr ""
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )"
-#: templates/web/base/reports/index.html:69
+#: templates/web/base/reports/index.html:82
msgid "(no longer exists)"
msgstr ""
@@ -167,8 +171,8 @@ msgstr "兩個都送出"
msgid "(we also have RSS feeds for problems within %s)"
msgstr "在 %s 內之問題RSS 訂閱"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:245
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:674
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:252
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:688
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
msgid "-- Pick a category --"
msgstr "選擇分類"
@@ -181,14 +185,6 @@ msgstr ""
msgid "10 inch pothole on Example St, near post box"
msgstr ""
-#: templates/web/base/dashboard/index.html:153
-msgid "14-30 days old"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:152
-msgid "7-14 days old"
-msgstr ""
-
#: templates/web/base/admin/body-form.html:50
#: templates/web/base/admin/body-form.html:51
msgid ""
@@ -202,17 +198,17 @@ msgstr ""
"\n"
"可以在你的設定檔加入一些 <code>地圖連結別</code> "
-#: templates/web/base/dashboard/index.html:15
+#: templates/web/base/dashboard/index.html:18
msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
msgstr ""
#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
-#: templates/web/base/reports/_list-filters.html:48
+#: templates/web/base/reports/_list-filters.html:56
#, fuzzy
msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s"
msgstr "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s"
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:78
msgid "<span>%s</span> saved."
msgstr ""
@@ -221,33 +217,52 @@ msgstr ""
msgid "<strong>%s</strong> live problems"
msgstr "<strong>%s</strong> 現場問題"
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:2
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:5
msgid "<strong>No</strong> Let me confirm my report by email"
msgstr "<strong>不</strong> 我要利用電子郵件確認我的申報 "
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:2
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:3
+#, fuzzy
+msgid "<strong>No</strong> Let me confirm my report by email/text"
+msgstr "<strong>不</strong> 我要利用電子郵件確認我的申報 "
+
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:5
msgid "<strong>No</strong> Let me confirm my update by email"
msgstr "<strong>不</strong> 我要用電子郵件收到更新通知"
-#: templates/web/base/auth/general.html:106
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:3
+#, fuzzy
+msgid "<strong>No</strong> Let me confirm my update by email/text"
+msgstr "<strong>不</strong> 我要用電子郵件收到更新通知"
+
+#: templates/web/base/auth/general.html:110
#: templates/web/zurich/auth/general.html:51
msgid "<strong>No</strong> let me sign in by email"
msgstr "<strong>不</strong> 我要用電子郵件登入"
-#: templates/web/base/report/_inspect.html:170
+#: templates/web/base/auth/general.html:108
+#, fuzzy
+msgid "<strong>No</strong> let me sign in by email or text"
+msgstr "<strong>不</strong> 我要用電子郵件登入"
+
+#: templates/web/base/report/_inspect.html:177
msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on."
msgstr ""
-#: templates/web/base/report/_inspect.html:172
+#: templates/web/base/report/_inspect.html:179
msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on."
msgstr ""
-#: templates/web/base/auth/general.html:82
+#: templates/web/base/auth/general.html:79
#: templates/web/base/report/new/form_user_loggedout_password.html:3
#: templates/web/base/report/update/form_user_loggedout_password.html:2
msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>是</strong> 我有密碼"
+#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50
+msgid "Add"
+msgstr ""
+
#: templates/web/base/admin/body-form.html:3
#: templates/web/base/admin/body-form.html:4
msgid ""
@@ -265,11 +280,17 @@ msgid "Add a contact using the form below."
msgstr "增加聯絡人請使用下方表單"
#: templates/web/base/admin/bodies.html:78
-#: templates/web/base/admin/body-form.html:140
-#: templates/web/zurich/admin/body-form.html:52
+#: templates/web/base/admin/body-form.html:139
+#: templates/web/zurich/admin/body-form.html:51
msgid "Add body"
msgstr "新增有關單位"
+#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:7
+#, fuzzy
+msgid "Add email address"
+msgstr "禁止之電子郵件"
+
#: templates/web/base/admin/reportextrafields/index.html:24
msgid "Add extra fields"
msgstr ""
@@ -292,11 +313,17 @@ msgstr "新增種類"
msgid "Add option"
msgstr "(任選)"
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:7
+#, fuzzy
+msgid "Add phone number"
+msgstr "(沒有電話號碼)"
+
#: templates/web/base/report/_item.html:10
#: templates/web/base/report/_item.html:16
-#: templates/web/base/report/_main.html:140
-#: templates/web/base/report/_main.html:19
-#: templates/web/base/report/_main.html:30
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:15
+#: templates/web/base/report/_main.html:26
msgid "Add to shortlist"
msgstr ""
@@ -306,23 +333,23 @@ msgstr ""
msgid "Add user"
msgstr "新增使用者"
-#: perllib/FixMyStreet/Cobrand/Default.pm:735
+#: perllib/FixMyStreet/Cobrand/Default.pm:718
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:737
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:736
+#: perllib/FixMyStreet/Cobrand/Default.pm:719
msgid "Add/edit response templates"
msgstr ""
-#: templates/web/base/my/my.html:67
+#: templates/web/base/my/my.html:109
msgid "Added %s"
msgstr "新增 %s"
-#: templates/web/base/report/_main.html:149
+#: templates/web/base/report/_main.html:141
msgid "Adding this report to your shortlist will remove it from %s’s shortlist."
msgstr ""
@@ -346,9 +373,10 @@ msgstr "%d 關閉通知 "
msgid "Alert me to future updates"
msgstr "通知我此事後續"
-#: templates/web/base/dashboard/index.html:138
-#: templates/web/base/dashboard/index.html:21
#: templates/web/base/dashboard/index.html:30
+#: templates/web/base/dashboard/index.html:40
+#: templates/web/base/dashboard/index.html:51
+#: templates/web/base/dashboard/index.html:63
#: templates/web/base/reports/_list-filters.html:3
msgid "All"
msgstr ""
@@ -357,12 +385,13 @@ msgstr ""
msgid "All Reports"
msgstr "所有事件申報"
-#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/admin/stats/index.html:5
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
msgid "All categories"
msgstr ""
@@ -378,17 +407,17 @@ msgstr ""
#: templates/web/base/main_nav_items.html:0
#: templates/web/base/main_nav_items.html:27
#: templates/web/zurich/admin/index-dm.html:12
-#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20
+#: templates/web/zurich/admin/stats/index.html:13
+#: templates/web/zurich/footer.html:20
#: templates/web/zurich/nav_over_content.html:6
msgid "All reports"
msgstr "所有事件申報"
-#: templates/web/base/admin/stats.html:5
-#: templates/web/zurich/admin/stats.html:8
+#: templates/web/zurich/admin/stats/index.html:8
msgid "All reports between %s and %s"
msgstr "%s 與 %s 之間申報"
-#: templates/web/base/reports/index.html:23
+#: templates/web/base/reports/index.html:25
msgid "All time"
msgstr ""
@@ -426,7 +455,8 @@ msgid "Are you sure you want to cancel this upload?"
msgstr ""
#: templates/web/base/admin/report_edit.html:84
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/admin/template_edit.html:75
+#: templates/web/base/js/translation_strings.html:73
#: templates/web/base/report/display_tools.html:6
msgid "Are you sure?"
msgstr ""
@@ -437,7 +467,7 @@ msgstr ""
msgid "Area covered"
msgstr "涵蓋區域"
-#: templates/web/base/admin/user-form.html:64
+#: templates/web/base/admin/user-form.html:82
msgid "Area:"
msgstr ""
@@ -451,7 +481,7 @@ msgid "Assign to competent body:"
msgstr "分派給適任的機關 "
#: templates/web/zurich/admin/report_edit.html:169
-#: templates/web/zurich/admin/stats.html:36
+#: templates/web/zurich/admin/stats/index.html:36
msgid "Assign to different category:"
msgstr "歸至其它種類"
@@ -463,7 +493,7 @@ msgstr "分派給外部機:"
msgid "Assign to subdivision:"
msgstr "交派給下級單位:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:732
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
msgid "Assign users to areas"
msgstr ""
@@ -479,12 +509,17 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求,依
msgid "At the moment only searching for and looking at reports work."
msgstr "目前僅提供部份查詢與查閱"
-#: templates/web/base/admin/user-form.html:78
-#: templates/web/base/admin/user-form.html:79
+#: templates/web/base/admin/user-form.html:96
+#: templates/web/base/admin/user-form.html:97
msgid "Authorised staff users can be associated with the categories in which they operate."
msgstr ""
-#: templates/web/base/admin/template_edit.html:22
+#: templates/web/base/admin/templates.html:9
+#, fuzzy
+msgid "Auto Response"
+msgstr "無責任歸屬"
+
+#: templates/web/base/admin/template_edit.html:64
msgid "Auto-response:"
msgstr ""
@@ -492,18 +527,10 @@ msgstr ""
msgid "Available categories"
msgstr ""
-#: templates/web/base/reports/index.html:84
+#: templates/web/base/reports/index.html:112
msgid "Average time between a problem being reported and being fixed, last 100 reports."
msgstr ""
-#: templates/web/base/dashboard/index.html:109
-msgid "Average time to council marking fixed (days)"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:117
-msgid "Average time to first council state change (days)"
-msgstr ""
-
#: templates/web/base/report/new/after_photo.html:6
msgid "Avoid personal information and vehicle number plates"
msgstr ""
@@ -517,20 +544,21 @@ msgstr "待核可"
msgid "Back"
msgstr "回上層"
-#: templates/web/base/report/_main.html:6
+#: templates/web/base/report/_main.html:2
msgid "Back to all reports"
msgstr ""
#: templates/web/base/admin/report_blocks.html:18
-msgid "Ban email address"
-msgstr "禁止之電子郵件"
+#, fuzzy
+msgid "Ban user"
+msgstr "標記警告用戶"
-#: perllib/FixMyStreet/Cobrand/Default.pm:650
-#: perllib/FixMyStreet/Cobrand/Default.pm:734
+#: perllib/FixMyStreet/Cobrand/Default.pm:633
+#: perllib/FixMyStreet/Cobrand/Default.pm:717
#: perllib/FixMyStreet/Cobrand/Zurich.pm:396
#: templates/web/base/admin/bodies.html:1
#: templates/web/base/admin/report_edit.html:55
-#: templates/web/zurich/header.html:56
+#: templates/web/zurich/header.html:50
msgid "Bodies"
msgstr "有關單位"
@@ -541,14 +569,10 @@ msgstr "有關單位"
msgid "Body"
msgstr "有關單位"
-#: templates/web/base/admin/user-form.html:36
+#: templates/web/base/admin/user-form.html:54
msgid "Body:"
msgstr "有關單位:"
-#: templates/web/base/admin/stats.html:87
-msgid "By Date"
-msgstr "日期"
-
#: templates/web/base/admin/extra-metadata-form.html:36
msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (<code>meta.datatype_description</code>), you must add it in <code>category_extras_fields.html</code>"
msgstr ""
@@ -561,8 +585,9 @@ msgstr "你的信箱中找不到我們的來信嗎?先檢查看看垃圾回收
msgid "Can't see the map? <em>Skip this step</em>"
msgstr "無法顯示地圖? <em>略過本步驟</em>"
-#: perllib/FixMyStreet/Cobrand/Default.pm:650
+#: perllib/FixMyStreet/Cobrand/Default.pm:633
#: templates/web/base/admin/responsepriorities/list.html:8
+#: templates/web/base/admin/templates.html:7
msgid "Categories"
msgstr ""
@@ -573,30 +598,36 @@ msgstr ""
#: templates/web/base/admin/body.html:72
#: templates/web/base/admin/contact-form.html:19
-#: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/base/report/_inspect.html:48
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:99
+#: templates/web/base/report/_inspect.html:54
#: templates/web/base/report/_item.html:92
-#: templates/web/base/report/new/category.html:6
+#: templates/web/base/report/new/category.html:12
#: templates/web/base/report/new/category_wrapper.html:3
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
#: templates/web/zurich/admin/reports.html:13
-#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/admin/stats/index.html:50
msgid "Category"
msgstr "類別"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:956
+#: templates/web/base/dashboard/index.html:102
+#, fuzzy
+msgid "Category and State"
+msgstr "類別"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:975
msgid "Category changed from ‘%s’ to ‘%s’"
msgstr ""
-#: templates/web/base/admin/stats.html:58
-#: templates/web/base/admin/stats_fix_rate.html:1
+#: templates/web/base/admin/stats/fix_rate.html:1
+#: templates/web/base/admin/stats/index.html:6
msgid "Category fix rate for problems > 4 weeks old"
msgstr "4週前己修復問題之類別"
#: templates/web/base/admin/report_edit.html:119
-#: templates/web/base/dashboard/index.html:29
+#: templates/web/base/dashboard/index.html:39
#: templates/web/zurich/admin/body.html:43
#: templates/web/zurich/admin/contact-form.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:72
@@ -604,17 +635,17 @@ msgstr "4週前己修復問題之類別"
msgid "Category:"
msgstr "類別:"
-#: perllib/FixMyStreet/Script/Reports.pm:188
+#: perllib/FixMyStreet/Script/Reports.pm:187
msgid "Category: %s"
msgstr "類別: %s"
-#: templates/web/base/my/my.html:24
-msgid "Change email"
+#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44
+#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57
+msgid "Change"
msgstr ""
#: templates/web/base/auth/change_email.html:1
#: templates/web/base/auth/change_email.html:3
-#: templates/web/base/auth/change_email.html:30
msgid "Change email address"
msgstr ""
@@ -622,10 +653,16 @@ msgstr ""
#: templates/web/base/auth/change_password.html:16
#: templates/web/base/auth/change_password.html:4
#: templates/web/base/auth/change_password.html:43
-#: templates/web/base/my/my.html:23
+#: templates/web/base/my/my.html:63
msgid "Change password"
msgstr "更換密碼"
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:3
+#, fuzzy
+msgid "Change phone number"
+msgstr "(沒有電話號碼)"
+
#: templates/web/base/admin/contact-form.html:80
msgid "Check <strong>inspection required</strong> if reports in this category <strong>must be inspected</strong> before being sent."
msgstr ""
@@ -653,19 +690,14 @@ msgid ""
" to the body too. These will appear in the drop-down menu on the report-a-problem page."
msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。"
-#: templates/web/base/report/_inspect.html:103
+#: templates/web/base/report/_inspect.html:109
msgid "Choose another"
msgstr ""
-#: templates/web/base/js/translation_strings.html:68
+#: templates/web/base/js/translation_strings.html:72
msgid "Clear offline data"
msgstr ""
-#: templates/web/base/admin/stats.html:72
-#: templates/web/base/admin/stats.html:78
-msgid "Click here or enter as dd/mm/yyyy"
-msgstr "點選此處或輸入日期/月份/年份"
-
#: templates/web/base/around/_report_banner.html:2
msgid "Click map to report a problem"
msgstr "點擊地圖以申報問題 "
@@ -694,18 +726,19 @@ msgstr "選擇確認電子郵件上的連結以作登入"
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134
#: perllib/FixMyStreet/Cobrand/Zurich.pm:194
#: perllib/FixMyStreet/Cobrand/Zurich.pm:965
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:11
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
#: templates/web/base/admin/states/index.html:103
#: templates/web/base/admin/states/index.html:27
#: templates/web/base/admin/states/index.html:33
+#: templates/web/base/dashboard/index.html:112
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:16
-#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/admin/stats/index.html:31
msgid "Closed"
msgstr "關閉"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:826
+#: perllib/FixMyStreet/DB/Result/Problem.pm:844
msgid "Closed by council"
msgstr "由地方政府關閉"
@@ -720,16 +753,17 @@ msgid "Cobrand"
msgstr "聯合品牌"
#: templates/web/base/admin/report_edit.html:92
-#: templates/web/base/admin/update_edit.html:52
+#: templates/web/base/admin/update_edit.html:54
msgid "Cobrand data:"
msgstr "聯合品牌資料:"
#: templates/web/base/admin/report_edit.html:91
-#: templates/web/base/admin/update_edit.html:51
+#: templates/web/base/admin/update_edit.html:53
msgid "Cobrand:"
msgstr "聯合品牌:"
#: templates/web/base/admin/extra-metadata-form.html:14
+#: templates/web/base/auth/smsform.html:24
msgid "Code"
msgstr ""
@@ -737,7 +771,7 @@ msgstr ""
msgid "Collapse map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:646
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr "設定"
@@ -746,7 +780,7 @@ msgstr "設定"
msgid "Confirm"
msgstr "確認"
-#: templates/web/base/auth/token.html:1
+#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
msgid "Confirm account"
msgstr "確認帳戶"
@@ -765,14 +799,10 @@ msgstr "確認"
#: templates/web/base/admin/contact-form.html:56
#: templates/web/zurich/admin/contact-form.html:12
-#: templates/web/zurich/admin/stats.html:40
+#: templates/web/zurich/admin/stats/index.html:40
msgid "Confirmed"
msgstr "已確認"
-#: templates/web/base/admin/stats.html:5
-msgid "Confirmed reports between %s and %s"
-msgstr "%s 與 %s 之間已確認的申報"
-
#: templates/web/base/admin/list_updates.html:39
#: templates/web/base/admin/problem_row.html:36
#: templates/web/base/admin/report_edit.html:78
@@ -799,8 +829,8 @@ msgstr "連結本團隊"
msgid "Coordinates:"
msgstr "協同單位:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1773
#: perllib/FixMyStreet/App/Controller/Admin.pm:1801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1830
msgid "Could not find user"
msgstr "找不到該戶用"
@@ -818,43 +848,16 @@ msgstr "地方政府"
msgid "Council contacts for %s"
msgstr "聯繋地方政府 %s"
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:83
-msgid "Council has marked as closed"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:57
-msgid "Council has marked as fixed"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:80
-msgid "Council has marked as in progress"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:82
-msgid "Council has marked as investigating"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:78
-#: templates/web/base/dashboard/index.html:81
-msgid "Council has marked as planned"
-msgstr ""
-
#: templates/web/base/report/_council_sent_info.html:6
msgid "Council ref:&nbsp;%s"
msgstr "地方政府流水號 ref:&nbsp;%s"
-#: templates/web/base/admin/stats.html:92
+#: templates/web/base/dashboard/index.html:50
msgid "Council:"
msgstr "地方政府"
-#: templates/web/base/admin/stats.html:12
-#: templates/web/base/admin/stats.html:32
-#: templates/web/zurich/admin/stats.html:45
-#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/admin/stats/index.html:45
+#: templates/web/zurich/admin/stats/index.html:50
msgid "Count"
msgstr "數量"
@@ -876,39 +879,44 @@ msgstr "創建類別"
msgid "Create priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/Default.pm:701
msgid "Create reports/updates as anonymous user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:719
+#: perllib/FixMyStreet/Cobrand/Default.pm:702
msgid "Create reports/updates as the council"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:717
+#: perllib/FixMyStreet/Cobrand/Default.pm:700
msgid "Create reports/updates on a user's behalf"
msgstr ""
-#: templates/web/base/admin/template_edit.html:46
+#: templates/web/base/admin/template_edit.html:71
#: templates/web/zurich/admin/template_edit.html:29
msgid "Create template"
msgstr "創建模版"
#: templates/web/base/admin/problem_row.html:34
-#: templates/web/base/admin/templates.html:12
+#: templates/web/zurich/admin/templates.html:10
msgid "Created"
msgstr "建立"
#: templates/web/base/admin/list_updates.html:38
#: templates/web/base/admin/report_edit.html:77
-#: templates/web/base/admin/update_edit.html:53
+#: templates/web/base/admin/update_edit.html:55
#: templates/web/zurich/admin/update_edit.html:29
msgid "Created:"
msgstr "建立:"
-#: templates/web/base/admin/stats.html:31
-msgid "Current state"
+#: templates/web/base/auth/generate_token.html:27
+#, fuzzy
+msgid "Current token:"
msgstr "目前狀況"
+#: templates/web/base/dashboard/index.html:91
+msgid "Currently grouped by %s"
+msgstr ""
+
#: templates/web/base/admin/bodies.html:9
#: templates/web/base/admin/index.html:17
msgid "Currently no bodies have been created."
@@ -919,14 +927,14 @@ msgstr "目前未創建內文"
msgid "Customer not contactable"
msgstr "無法聨絡上的客戶"
-#: templates/web/base/dashboard/index.html:5
#: templates/web/base/dashboard/index.html:7
+#: templates/web/base/dashboard/index.html:9
#: templates/web/base/reports/index.html:15
#: templates/web/base/reports/index.html:18
msgid "Dashboard"
msgstr "控制台"
-#: templates/web/zurich/admin/stats.html:35
+#: templates/web/zurich/admin/stats/index.html:35
msgid "Dealt with by subdivision within 5 working days"
msgstr "下屬單位5個工作天內處理。"
@@ -938,12 +946,12 @@ msgstr ""
msgid "Default priority"
msgstr ""
-#: templates/web/base/report/_inspect.html:72
+#: templates/web/base/report/_inspect.html:78
msgid "Defect type"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1078
-#: templates/web/base/admin/template_edit.html:50
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1104
+#: templates/web/base/admin/template_edit.html:75
#: templates/web/zurich/admin/template_edit.html:33
msgid "Delete template"
msgstr "刪除模版"
@@ -954,8 +962,8 @@ msgstr "刪除模版"
msgid "Deleted"
msgstr "刪除"
-#: templates/web/base/report/_main.html:114
-#: templates/web/base/report/update.html:68
+#: templates/web/base/report/_main.html:110
+#: templates/web/base/report/update.html:71
msgid "Describe why you are moderating this"
msgstr ""
@@ -971,6 +979,10 @@ msgstr "描述"
msgid "Description:"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Report.pm:350
+msgid "Detailed information is limited to %d characters."
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:33
#: templates/web/zurich/report/new/fill_in_details_form.html:45
msgid "Details"
@@ -983,6 +995,10 @@ msgstr "細節"
msgid "Details:"
msgstr "細節:"
+#: templates/web/base/dashboard/index.html:103
+msgid "Device and Site"
+msgstr ""
+
#: templates/web/base/admin/body.html:92
msgid "Devolved"
msgstr "下放"
@@ -996,8 +1012,8 @@ msgstr "不使用地圖"
msgid "Diligency prize league table"
msgstr "勤奮表現名單"
-#: templates/web/base/report/_main.html:118
-#: templates/web/base/report/update.html:70
+#: templates/web/base/report/_main.html:114
+#: templates/web/base/report/update.html:73
msgid "Discard changes"
msgstr ""
@@ -1006,7 +1022,7 @@ msgid "Do not send email alerts on fetched comments to problem creator"
msgstr ""
#. ("%s is the site name")
-#: templates/web/base/auth/general.html:60
+#: templates/web/base/auth/general.html:57
#: templates/web/base/report/new/form_user_loggedout.html:25
#: templates/web/base/report/new/oauth_email_form.html:18
#: templates/web/base/report/update-form.html:30
@@ -1014,7 +1030,7 @@ msgstr ""
msgid "Do you have a %s password?"
msgstr "您是否有 %s密碼? "
-#: templates/web/base/report/_inspect.html:87
+#: templates/web/base/report/_inspect.html:93
msgid "Do you want to automatically raise a defect?"
msgstr ""
@@ -1034,11 +1050,11 @@ msgstr ""
msgid "Drag and drop photos here or <u>click to upload</u>"
msgstr ""
-#: templates/web/base/report/_inspect.html:98
+#: templates/web/base/report/_inspect.html:104
msgid "Duplicate of"
msgstr ""
-#: templates/web/base/report/_inspect.html:108
+#: templates/web/base/report/_inspect.html:114
msgid "Duplicates"
msgstr ""
@@ -1061,9 +1077,10 @@ msgstr ""
#: templates/web/base/admin/list_updates.html:42
#: templates/web/base/admin/problem_row.html:41
#: templates/web/base/admin/responsepriorities/list.html:28
-#: templates/web/base/admin/templates.html:22
+#: templates/web/base/admin/templates.html:28
#: templates/web/base/admin/users.html:34
#: templates/web/zurich/admin/problem_row.html:48
+#: templates/web/zurich/admin/templates.html:20
msgid "Edit"
msgstr "編輯"
@@ -1073,33 +1090,33 @@ msgstr "編輯"
msgid "Edit body details"
msgstr "編輯有關單位細節"
-#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
msgid "Edit other users' details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:730
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
msgid "Edit other users' permissions"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/Default.pm:695
msgid "Edit report category"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/Default.pm:696
msgid "Edit report priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
+#: perllib/FixMyStreet/Cobrand/Default.pm:694
msgid "Edit reports"
msgstr ""
#: templates/web/base/admin/report_edit.html:0
#: templates/web/base/admin/report_edit.html:14
-#: templates/web/base/admin/report_edit.html:4
+#: templates/web/base/admin/report_edit.html:5
#: templates/web/zurich/admin/report_edit-sdm.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:5
+#: templates/web/zurich/admin/report_edit-sdm.html:6
#: templates/web/zurich/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit.html:5
+#: templates/web/zurich/admin/report_edit.html:6
msgid "Editing problem %d"
msgstr "編輯問題 %d"
@@ -1120,7 +1137,6 @@ msgstr "編輯器"
#: templates/web/base/admin/category_edit.html:28
#: templates/web/base/admin/flagged.html:38
#: templates/web/base/admin/users.html:17
-#: templates/web/base/auth/general.html:51
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:15
#: templates/web/zurich/auth/general.html:24
@@ -1128,17 +1144,20 @@ msgstr "編輯器"
msgid "Email"
msgstr "電子郵件"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1749
-msgid "Email added to abuse list"
-msgstr "電子郵件列入濫發名單"
-
#: templates/web/base/admin/contact-form.html:38
#: templates/web/base/alert/_list.html:74
-#: templates/web/base/report/new/form_user_loggedin.html:32
+#: templates/web/base/auth/change_email.html:37
+#: templates/web/base/report/new/form_user_loggedin.html:38
#: templates/web/base/report/update/form_name.html:23
msgid "Email address"
msgstr ""
+#: templates/web/base/report/new/form_user_loggedin.html:71
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:34
+#, fuzzy
+msgid "Email address (optional)"
+msgstr "密碼(任選):"
+
#: templates/web/base/tokens/confirm_alert.html:6
msgid "Email alert created"
msgstr "建立電郵通知"
@@ -1147,19 +1166,18 @@ msgstr "建立電郵通知"
msgid "Email alert deleted"
msgstr "取消電郵通知"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1746
-msgid "Email already in abuse list"
-msgstr "電子郵件己在濫發名單"
+#: templates/web/base/admin/user-form.html:22
+msgid "Email verified:"
+msgstr ""
-#: templates/web/base/admin/report_edit.html:129
-#: templates/web/base/admin/update_edit.html:35
-#: templates/web/base/admin/user-form.html:19
+#: templates/web/base/admin/report_edit.html:138
+#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36
#: templates/web/zurich/admin/body.html:48
#: templates/web/zurich/admin/contact-form.html:6
msgid "Email:"
msgstr "電子郵件:"
-#: perllib/FixMyStreet/Script/Reports.pm:112
+#: perllib/FixMyStreet/Script/Reports.pm:111
msgid "Email: %s"
msgstr "電子郵件: %s"
@@ -1175,8 +1193,8 @@ msgstr ""
"如果您不確定是否要開啟,請保留空白\n"
"更多資訊說明<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>請見本文(英文)</a>."
+#: templates/web/base/admin/body-form.html:121
#: templates/web/base/admin/body-form.html:122
-#: templates/web/base/admin/body-form.html:123
msgid ""
"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
" different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
@@ -1185,8 +1203,9 @@ msgstr ""
"開啟<strong>此設定將造成權限混亂</strong>因相關單位可能有多位承辦人員使用不同\n"
"端點(與送出方式)。例如,如果某些類別的問題申報必須由電子郵件送出,而其它類別則透過Open311送出。"
-#: templates/web/base/admin/stats.html:77
-msgid "End Date:"
+#: templates/web/base/dashboard/index.html:77
+#, fuzzy
+msgid "End Date"
msgstr "結束日期:"
#: templates/web/base/admin/open311-form-fields.html:21
@@ -1207,14 +1226,14 @@ msgid "Enter a nearby postcode, or street name and area"
msgstr "輸入本區的郵編,街名或區域。"
#: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14
-#: templates/web/base/around/postcode_form.html:5
-#: templates/web/base/around/postcode_form.html:6
+#: templates/web/base/around/postcode_form.html:7
+#: templates/web/base/around/postcode_form.html:8
msgid "Enter a nearby street name and area"
msgstr "輸入最近的街名或地區"
-#: templates/web/base/auth/general.html:118
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:35
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
+#: templates/web/base/auth/general.html:123
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:45
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:17
#: templates/web/zurich/auth/general.html:65
msgid "Enter a password"
msgstr "請輸入密碼"
@@ -1232,8 +1251,8 @@ msgstr "請在此填寫問題的細節"
msgid "Error"
msgstr "錯誤"
-#: templates/web/base/reports/_list-filters.html:31
#: templates/web/base/reports/_list-filters.html:39
+#: templates/web/base/reports/_list-filters.html:47
msgid "Everything"
msgstr "一切"
@@ -1258,7 +1277,7 @@ msgstr ""
msgid "Explain what’s wrong"
msgstr ""
-#: templates/web/base/dashboard/index.html:147
+#: templates/web/base/dashboard/index.html:104
msgid "Export as CSV"
msgstr ""
@@ -1274,7 +1293,7 @@ msgstr "外圍"
msgid "External ID"
msgstr ""
-#: templates/web/base/admin/body-form.html:89
+#: templates/web/base/admin/body-form.html:88
msgid "External URL"
msgstr "外部網址"
@@ -1286,7 +1305,7 @@ msgstr ""
msgid "External team"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:673
+#: perllib/FixMyStreet/Cobrand/Default.pm:656
#: templates/web/base/admin/reportextrafields/edit.html:1
#: templates/web/base/admin/reportextrafields/index.html:1
#, fuzzy
@@ -1298,7 +1317,7 @@ msgstr "其它資料:"
msgid "Extra data:"
msgstr "其它資料:"
-#: templates/web/base/report/_inspect.html:144
+#: templates/web/base/report/_inspect.html:150
#: templates/web/base/report/_item.html:108
msgid "Extra details"
msgstr ""
@@ -1328,21 +1347,22 @@ msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表
#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133
#: templates/web/base/admin/states/index.html:29
-#: templates/web/base/admin/stats_fix_rate.html:4
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/dashboard/index.html:113
msgid "Fixed"
msgstr "已處理"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:62
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:66
msgid "Fixed - Council"
msgstr "已處理-地方政府"
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:63
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:67
msgid "Fixed - User"
msgstr "已處理-用戶"
-#: templates/web/base/admin/body-form.html:97
+#: templates/web/base/admin/body-form.html:96
#: templates/web/base/admin/responsepriorities/edit.html:53
-#: templates/web/zurich/admin/body-form.html:36
+#: templates/web/zurich/admin/body-form.html:35
msgid "Flag as deleted"
msgstr "標記警告為刪除 "
@@ -1350,7 +1370,7 @@ msgstr "標記警告為刪除 "
msgid "Flag user"
msgstr "標記警告用戶"
-#: perllib/FixMyStreet/Cobrand/Default.pm:644
+#: perllib/FixMyStreet/Cobrand/Default.pm:627
#: templates/web/base/admin/users.html:20
msgid "Flagged"
msgstr "標記警告"
@@ -1359,7 +1379,7 @@ msgstr "標記警告"
msgid "Flagged reports and users"
msgstr "標記警告申報與用戶"
-#: templates/web/base/admin/user-form.html:94
+#: templates/web/base/admin/user-form.html:112
msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>"
@@ -1367,8 +1387,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:135
-#: templates/web/base/admin/user-form.html:100
+#: templates/web/base/admin/report_edit.html:140
+#: templates/web/base/admin/user-form.html:118
msgid "Flagged:"
msgstr "警告:"
@@ -1388,7 +1408,7 @@ msgstr ""
msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
msgstr "更多資訊,請詳見<a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>(英文)"
-#: templates/web/base/auth/general.html:97
+#: templates/web/base/auth/general.html:94
#: templates/web/base/report/new/form_user_loggedout_password.html:20
#: templates/web/base/report/update/form_user_loggedout_password.html:19
msgid "Forgotten your password?"
@@ -1408,8 +1428,12 @@ msgstr "轉寄願望給外部機構"
msgid "Frequently Asked Questions"
msgstr "常見問題回覆 "
-#: templates/web/base/admin/stats.html:102
-msgid "Get Count"
+#: templates/web/base/auth/generate_token.html:1
+#: templates/web/base/auth/generate_token.html:2
+#: templates/web/base/auth/generate_token.html:20
+#: templates/web/base/auth/generate_token.html:33
+#: templates/web/base/my/my.html:65
+msgid "Generate token"
msgstr ""
#: templates/web/base/around/_updates.html:3
@@ -1442,12 +1466,12 @@ msgstr "很高興聽到問題已處理了。"
#: templates/web/base/admin/index.html:28
#: templates/web/base/admin/index.html:34
#: templates/web/base/admin/index.html:49
-#: templates/web/base/alert/index.html:34
-#: templates/web/base/around/postcode_form.html:13
-#: templates/web/base/reports/_list-filters.html:49
-#: templates/web/base/reports/_list-filters.html:64
-#: templates/web/base/reports/index.html:75
-#: templates/web/zurich/admin/stats.html:26
+#: templates/web/base/alert/index.html:35
+#: templates/web/base/around/postcode_form.html:15
+#: templates/web/base/reports/_list-filters.html:57
+#: templates/web/base/reports/_list-filters.html:72
+#: templates/web/base/reports/index.html:89
+#: templates/web/zurich/admin/stats/index.html:26
msgid "Go"
msgstr "走"
@@ -1455,7 +1479,7 @@ msgstr "走"
msgid "Going to send questionnaire?"
msgstr "即將送出問卷?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:731
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
msgid "Grant access to the admin"
msgstr ""
@@ -1463,6 +1487,15 @@ msgstr ""
msgid "Graph of problem creation by status over time"
msgstr "隨時間産生的問題圖片"
+#: templates/web/base/dashboard/index.html:93
+#, fuzzy
+msgid "Group by %s"
+msgstr "由 %s"
+
+#: templates/web/base/dashboard/index.html:98
+msgid "Group by:"
+msgstr ""
+
#: templates/web/base/questionnaire/index.html:48
msgid "Has this problem been fixed?"
msgstr "問題已處理了嗎?"
@@ -1483,21 +1516,26 @@ msgstr "協助"
msgid "Help <strong>%s</strong> resolve your problem quicker, by providing some extra detail. This extra information will not be published online."
msgstr ""
+#: templates/web/base/around/on_map_list_items.html:8
+#, fuzzy
+msgid "Here are some other nearby reports:"
+msgstr "最近申報之照片"
+
#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "您好 %s"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:911
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:60
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
-#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/stats/index.html:32
#: templates/web/zurich/admin/update_edit.html:18
msgid "Hidden"
msgstr "隱藏"
-#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/_main.html:105
msgid "Hide entire report"
msgstr ""
@@ -1518,21 +1556,18 @@ msgstr ""
msgid "Hide my name on this report"
msgstr ""
-#: templates/web/base/around/display_location.html:67
-msgid "Hide old"
-msgstr "隱藏舊文"
-
-#: templates/web/base/around/display_location.html:62
+#: templates/web/base/around/display_location.html:60
+#: templates/web/base/around/display_location.html:68
#: templates/web/base/js/translation_strings.html:55
msgid "Hide pins"
msgstr "隱藏地圖標示"
-#: templates/web/base/report/update.html:15
+#: templates/web/base/report/update.html:13
msgid "Hide update completely?"
msgstr ""
#: templates/web/base/report/_report_meta_info.html:3
-#: templates/web/base/report/update.html:55
+#: templates/web/base/report/update.html:58
msgid "Hide your name?"
msgstr ""
@@ -1544,7 +1579,7 @@ msgstr ""
msgid "History"
msgstr "歷程 "
-#: templates/web/base/around/display_location.html:75
+#: templates/web/base/around/display_location.html:73
msgid "Home"
msgstr "首頁"
@@ -1603,6 +1638,10 @@ msgstr ""
msgid "If ticked the user won’t see an input field, just the ‘Description’ text."
msgstr ""
+#: templates/web/base/admin/template_edit.html:59
+msgid "If ticked, this template will be used for Open311 updates that put problems in this state."
+msgstr ""
+
#: templates/web/base/admin/contact-form.html:14
msgid ""
"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
@@ -1612,6 +1651,10 @@ msgstr ""
"\n"
"如果你想這樣,請確保你在有關單位中使用同一類別。"
+#: templates/web/base/auth/generate_token.html:39
+msgid "If you generate a new token the existing token will no longer work."
+msgstr ""
+
#: templates/web/base/questionnaire/completed.html:8
msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
msgstr "如果你對申報之問題有進一步狀況,歡迎回到本站留言更新"
@@ -1620,7 +1663,7 @@ msgstr "如果你對申報之問題有進一步狀況,歡迎回到本站留言
msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories."
msgstr ""
-#: templates/web/base/admin/template_edit.html:29
+#: templates/web/base/admin/template_edit.html:39
msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories."
msgstr ""
@@ -1629,7 +1672,7 @@ msgstr ""
msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council."
msgstr ""
-#: templates/web/base/admin/template_edit.html:36
+#: templates/web/base/admin/template_edit.html:46
msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
msgstr ""
@@ -1714,11 +1757,7 @@ msgstr "信箱已閱畢!"
msgid "Include reporter personal details"
msgstr "包括申報人的個人細節"
-#: templates/web/base/admin/stats.html:83
-msgid "Include unconfirmed reports"
-msgstr "包括未確認的申報 "
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:351
+#: perllib/FixMyStreet/App/Controller/Open311.pm:352
msgid "Incorrect has_photo value \"%s\""
msgstr "不正確的照片值數 \"%s\""
@@ -1730,7 +1769,7 @@ msgstr ""
msgid "Inspection required"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/Default.pm:698
msgid "Instruct contractors to fix problems"
msgstr ""
@@ -1742,26 +1781,18 @@ msgstr "內部筆記"
msgid "Internet glitch"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:336
+#: perllib/FixMyStreet/App/Controller/Open311.pm:337
msgid "Invalid agency_responsible value %s"
msgstr "無效的權責單位數值 %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1607
-msgid "Invalid end date"
-msgstr "無效的結束日期"
-
-#: perllib/FixMyStreet/App/Controller/Open311.pm:429
+#: perllib/FixMyStreet/App/Controller/Open311.pm:430
msgid "Invalid format %s specified."
msgstr "無效的%s 特定格式"
-#: perllib/FixMyStreet/App/Controller/Report.pm:409
+#: perllib/FixMyStreet/App/Controller/Report.pm:423
msgid "Invalid location. New location must be covered by the same council."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1603
-msgid "Invalid start date"
-msgstr "無效的開始日期"
-
#: templates/web/base/contact/blurb.html:2
msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
msgstr "最快方式是 <a href=\"%s\">先查看問答集</a> ,看看答案是否在此"
@@ -1780,7 +1811,7 @@ msgstr "未知的管轄機關"
msgid "Jurisdiction unknown"
msgstr "未知的管轄機關"
-#: templates/web/base/auth/general.html:93
+#: templates/web/base/auth/general.html:90
#: templates/web/base/report/new/form_user_loggedout_password.html:16
#: templates/web/base/report/update/form_user_loggedout_password.html:15
#: templates/web/zurich/auth/general.html:40
@@ -1805,12 +1836,7 @@ msgstr ""
msgid "Languages"
msgstr ""
-#: templates/web/base/dashboard/index.html:50
-msgid "Last 4 weeks"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:49
-#: templates/web/base/reports/index.html:38
+#: templates/web/base/reports/index.html:40
msgid "Last 7 days"
msgstr ""
@@ -1836,18 +1862,14 @@ msgstr "上一次更新:"
msgid "Latitude/Longitude:"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:61
+#: templates/web/base/reports/_list-filters.html:69
msgid "Least recently updated"
msgstr ""
-#: templates/web/base/admin/body-form.html:129
+#: templates/web/base/admin/body-form.html:128
msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\"),此處請保留空白 "
-#: templates/web/base/dashboard/index.html:151
-msgid "Less than 7 days old"
-msgstr ""
-
#: templates/web/base/admin/extra-metadata-form.html:47
msgid "List"
msgstr ""
@@ -1856,13 +1878,13 @@ msgstr ""
msgid "List all reported problems"
msgstr "列出所有申報的問題 "
-#: templates/web/base/report/new/category_wrapper.html:4
+#: templates/web/base/report/new/category_wrapper.html:8
msgid "Loading..."
msgstr "載入中...."
#: templates/web/base/alert/choose.html:1
-#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1
-#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1
+#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2
+#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1
#: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1
#: templates/web/base/tokens/confirm_alert.html:1
msgid "Local RSS feeds and email alerts"
@@ -1894,12 +1916,15 @@ msgstr ""
msgid "Log in with Twitter"
msgstr ""
-#: templates/web/base/js/translation_strings.html:62
+#: templates/web/base/js/translation_strings.html:65
msgid "Log in with email"
msgstr ""
-#: templates/web/base/dashboard/index.html:146
-#: templates/web/base/dashboard/index.html:38
+#: templates/web/base/js/translation_strings.html:63
+msgid "Log in with email/text"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:81
msgid "Look up"
msgstr ""
@@ -1907,11 +1932,11 @@ msgstr ""
msgid "MAP"
msgstr "地圖"
-#: perllib/FixMyStreet/Cobrand/Default.pm:716
+#: perllib/FixMyStreet/Cobrand/Default.pm:699
msgid "Manage shortlist"
msgstr ""
-#: templates/web/base/reports/_list-filters.html:56
+#: templates/web/base/reports/_list-filters.html:64
msgid "Manual order"
msgstr ""
@@ -1923,11 +1948,11 @@ msgstr "地圖"
msgid "Mark as sent"
msgstr "標註為關閉"
-#: templates/web/base/admin/user-form.html:92
+#: templates/web/base/admin/user-form.html:110
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>."
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/Default.pm:697
msgid "Markup problem details"
msgstr ""
@@ -1947,45 +1972,45 @@ msgstr "給外部機構的訊息"
msgid "Missing bodies:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Open311.pm:437
+#: perllib/FixMyStreet/App/Controller/Open311.pm:438
msgid "Missing jurisdiction_id"
msgstr "遺失 jurisdiction_id"
-#: templates/web/base/report/_main.html:134
+#: templates/web/base/report/_main.html:126
msgid "Moderate"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:710
+#: perllib/FixMyStreet/Cobrand/Default.pm:693
msgid "Moderate report details"
msgstr ""
-#: templates/web/base/report/_main.html:134
+#: templates/web/base/report/_main.html:126
msgid "Moderate this report"
msgstr ""
-#: templates/web/base/report/update.html:12
+#: templates/web/base/report/update.html:10
msgid "Moderate this update"
msgstr ""
-#: templates/web/base/report/_main.html:73
-#: templates/web/base/report/update.html:58
+#: templates/web/base/report/_main.html:69
+#: templates/web/base/report/update.html:61
msgid "Moderated by %s at %s"
msgstr ""
-#: templates/web/zurich/admin/stats.html:34
+#: templates/web/zurich/admin/stats/index.html:34
msgid "Moderated by division within one working day"
msgstr "一個工作天內協調出部門"
-#: templates/web/base/report/_main.html:113
-#: templates/web/base/report/update.html:66
+#: templates/web/base/report/_main.html:109
+#: templates/web/base/report/update.html:69
msgid "Moderation reason:"
msgstr ""
-#: templates/web/base/admin/stats.html:11
+#: templates/web/base/dashboard/index.html:101
msgid "Month"
msgstr "月份"
-#: templates/web/base/reports/_list-filters.html:62
+#: templates/web/base/reports/_list-filters.html:70
msgid "Most commented"
msgstr ""
@@ -2003,9 +2028,9 @@ msgstr ""
#: templates/web/base/admin/states/index.html:108
#: templates/web/base/admin/states/index.html:11
#: templates/web/base/admin/users.html:16
-#: templates/web/base/auth/general.html:108
-#: templates/web/base/report/new/form_user_loggedin.html:42
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:7
+#: templates/web/base/auth/general.html:113
+#: templates/web/base/report/new/form_user_loggedin.html:49
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:11
#: templates/web/base/report/update/form_name.html:27
#: templates/web/zurich/admin/body-form.html:4
#: templates/web/zurich/auth/general.html:60
@@ -2016,19 +2041,23 @@ msgstr "名字"
#: templates/web/base/admin/report_edit.html:127
#: templates/web/base/admin/responsepriorities/edit.html:13
#: templates/web/base/admin/update_edit.html:34
-#: templates/web/base/admin/user-form.html:16
-#: templates/web/zurich/admin/stats.html:41
+#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35
+#: templates/web/zurich/admin/stats/index.html:41
msgid "Name:"
msgstr "名字:"
-#: perllib/FixMyStreet/Script/Reports.pm:111
+#: perllib/FixMyStreet/Script/Reports.pm:110
msgid "Name: %s"
msgstr "名字: %s"
-#: templates/web/base/report/_inspect.html:38
+#: templates/web/base/report/_inspect.html:44
msgid "Navigate to this problem"
msgstr ""
+#: templates/web/base/report/_inspect.html:39
+msgid "Nearest calculated address:"
+msgstr ""
+
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160
#: perllib/FixMyStreet/Geocode/OSM.pm:145
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
@@ -2038,12 +2067,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:538
-#: perllib/FixMyStreet/Cobrand/Default.pm:566
+#: perllib/FixMyStreet/Cobrand/Default.pm:521
+#: perllib/FixMyStreet/Cobrand/Default.pm:549
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s"
-#: perllib/FixMyStreet/Script/Alerts.pm:316
+#: perllib/FixMyStreet/Script/Alerts.pm:341
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -2059,19 +2088,24 @@ msgstr ""
msgid "Nearly done! Now check your email&hellip;"
msgstr "差不多快完成了,現在檢查您的電子信箱"
+#: templates/web/base/auth/smsform.html:19
+#, fuzzy
+msgid "Nearly done! Now check your phone&hellip;"
+msgstr "差不多快完成了,現在檢查您的電子信箱"
+
#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131
msgid "New"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:262
+#: perllib/FixMyStreet/App/Controller/Admin.pm:230
msgid "New body added"
msgstr "新增內文"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:354
msgid "New category contact added"
msgstr "新增類別承辦 人"
-#: templates/web/base/auth/change_email.html:26
+#: templates/web/base/auth/change_email.html:39
msgid "New email address:"
msgstr ""
@@ -2092,6 +2126,11 @@ msgstr ""
msgid "New password:"
msgstr ""
+#: templates/web/base/auth/change_phone.html:38
+#, fuzzy
+msgid "New phone number:"
+msgstr "(沒有電話號碼)"
+
#: templates/web/base/admin/responsepriorities/edit.html:4
#: templates/web/base/admin/responsepriorities/list.html:34
msgid "New priority"
@@ -2121,18 +2160,19 @@ msgstr " FixMyStree{{Name}} 範圍 之新近問題 "
msgid "New reports"
msgstr "新的申報 "
-#: templates/web/base/admin/questionnaire.html:24
#: templates/web/base/admin/states/index.html:91
+#: templates/web/base/admin/stats/questionnaire.html:24
msgid "New state"
msgstr "新陳述"
#: templates/web/base/admin/template_edit.html:4
-#: templates/web/base/admin/templates.html:28
+#: templates/web/base/admin/templates.html:34
#: templates/web/zurich/admin/template_edit.html:9
+#: templates/web/zurich/admin/templates.html:26
msgid "New template"
msgstr "新模版"
-#: templates/web/base/reports/_list-filters.html:58
+#: templates/web/base/reports/_list-filters.html:66
msgid "Newest"
msgstr ""
@@ -2140,7 +2180,7 @@ msgstr ""
msgid "Next"
msgstr "下一步"
-#: perllib/FixMyStreet/Cobrand/Default.pm:1237
+#: perllib/FixMyStreet/Cobrand/Default.pm:1222
#: templates/web/base/admin/category_edit.html:4
#: templates/web/base/admin/list_updates.html:32
#: templates/web/base/admin/list_updates.html:34
@@ -2152,22 +2192,18 @@ msgstr "下一步"
#: templates/web/base/questionnaire/creator_fixed.html:16
#: templates/web/base/questionnaire/index.html:106
#: templates/web/base/questionnaire/index.html:55
-#: templates/web/base/report/_inspect.html:92
+#: templates/web/base/report/_inspect.html:98
msgid "No"
msgstr "無"
-#: templates/web/base/admin/user-form.html:66
+#: templates/web/base/admin/user-form.html:84
msgid "No area"
msgstr ""
-#: templates/web/base/admin/user-form.html:37
+#: templates/web/base/admin/user-form.html:55
msgid "No body"
msgstr "無有關單位"
-#: templates/web/base/admin/stats.html:93
-msgid "No council"
-msgstr "無地方政府"
-
#: perllib/FixMyStreet/DB/Result/Problem.pm:372
msgid "No council selected"
msgstr "未選擇地方政府"
@@ -2197,6 +2233,10 @@ msgstr ""
msgid "No inspections in the selected date range."
msgstr ""
+#: templates/web/base/around/on_map_list_items.html:13
+msgid "No reports to show on map, here are some nearby:"
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:37
msgid "No result returned"
msgstr "查無結果"
@@ -2221,15 +2261,15 @@ msgstr "無支援"
msgid "None"
msgstr "沒有"
-#: templates/web/base/admin/user-form.html:58
-#: templates/web/base/admin/user-form.html:59
+#: templates/web/base/admin/user-form.html:76
+#: templates/web/base/admin/user-form.html:77
msgid ""
"Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
" Authorised staff users can be associated with the area in which they operate."
msgstr ""
-#: templates/web/base/admin/user-form.html:28
-#: templates/web/base/admin/user-form.html:29
+#: templates/web/base/admin/user-form.html:46
+#: templates/web/base/admin/user-form.html:47
msgid ""
"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
" Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2252,7 +2292,7 @@ msgstr "無法聨絡"
msgid "Not for my subdivision"
msgstr "非下屬單位"
-#: templates/web/base/admin/questionnaire.html:6
+#: templates/web/base/admin/stats/questionnaire.html:6
msgid "Not reported before"
msgstr "之前未申報過"
@@ -2266,10 +2306,6 @@ msgstr "未呈報給地方政府"
msgid "Note"
msgstr "註記"
-#: templates/web/base/admin/stats.html:51
-msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
-msgstr "請注意這裏包括了本月份總結撰寫前,尚未確認的申報,所以數目可能稍有降低。"
-
#: templates/web/zurich/admin/body.html:55
#: templates/web/zurich/admin/contact-form.html:19
msgid "Note:"
@@ -2297,37 +2333,46 @@ msgstr "現在送出您的申報 &hellip;"
msgid "Now to submit your update&hellip;"
msgstr "現在送出您更新的申報 &hellip; 您是否有本站帳密?"
-#: templates/web/base/reports/index.html:98
+#: templates/web/base/reports/index.html:127
msgid "Number of problems reported in each category, in the last 7 days."
msgstr ""
+#: templates/web/base/reports/index.html:99
+msgid "Number of problems reported in each ward, in the last 7 days."
+msgstr ""
+
#: templates/web/base/js/translation_strings.html:43
msgid "OK"
msgstr "好了"
-#: templates/web/base/js/translation_strings.html:70
+#: templates/web/base/js/translation_strings.html:74
msgid "Offline data cleared"
msgstr ""
-#: templates/web/base/js/translation_strings.html:67
+#: templates/web/base/js/translation_strings.html:71
msgid "Offline update data saved"
msgstr ""
-#: templates/web/base/admin/questionnaire.html:24
+#: templates/web/base/admin/stats/questionnaire.html:24
msgid "Old state"
msgstr "舊陳述"
-#: templates/web/base/reports/_list-filters.html:59
+#: templates/web/base/reports/_list-filters.html:67
msgid "Oldest"
msgstr ""
+#: perllib/FixMyStreet/SendReport/Email.pm:89
+msgid "On behalf of %s"
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:174
#: perllib/FixMyStreet/Cobrand/Zurich.pm:905
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:10
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:70
#: templates/web/base/admin/states/index.html:102
#: templates/web/base/admin/states/index.html:25
#: templates/web/base/admin/states/index.html:32
#: templates/web/base/admin/update_edit.html:30
+#: templates/web/base/dashboard/index.html:111
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/update_edit.html:18
@@ -2366,23 +2411,30 @@ msgstr ""
msgid "Order"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:675
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:676
-#: perllib/FixMyStreet/DB/Result/Problem.pm:579
-#: perllib/FixMyStreet/DB/Result/Problem.pm:586
-#: perllib/FixMyStreet/DB/Result/Problem.pm:601
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:689
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:690
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:719
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:722
+#: perllib/FixMyStreet/DB/Result/Problem.pm:588
+#: perllib/FixMyStreet/DB/Result/Problem.pm:595
#: perllib/FixMyStreet/DB/Result/Problem.pm:610
-#: perllib/FixMyStreet/Script/Reports.pm:183
-#: perllib/FixMyStreet/Script/Reports.pm:198
+#: perllib/FixMyStreet/DB/Result/Problem.pm:619
+#: perllib/FixMyStreet/Script/Reports.pm:182
+#: perllib/FixMyStreet/Script/Reports.pm:197
msgid "Other"
msgstr "其它"
-#: templates/web/base/reports/index.html:107
+#: templates/web/base/reports/index.html:136
msgid "Other categories"
msgstr ""
-#: templates/web/base/reports/index.html:92
+#: templates/web/base/reports/index.html:107
+#, fuzzy
+msgid "Other wards"
+msgstr "其它地區:"
+
+#: templates/web/base/reports/index.html:120
msgid "Overall average"
msgstr ""
@@ -2400,19 +2452,19 @@ msgstr "找無此頁"
msgid "Parent"
msgstr "上級 "
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:61
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:65
msgid "Partial"
msgstr "部份"
-#: templates/web/base/auth/general.html:111
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:28
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:6
+#: templates/web/base/auth/general.html:116
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:38
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:10
#: templates/web/zurich/auth/general.html:32
#: templates/web/zurich/auth/general.html:63
msgid "Password (optional)"
msgstr "密碼(任選):"
-#: templates/web/base/auth/general.html:84
+#: templates/web/base/auth/general.html:81
msgid "Password:"
msgstr "密碼:"
@@ -2420,7 +2472,7 @@ msgstr "密碼:"
msgid "Permalink"
msgstr "永久連結"
-#: templates/web/base/admin/user-form.html:144
+#: templates/web/base/admin/user-form.html:162
msgid "Permissions:"
msgstr ""
@@ -2429,19 +2481,25 @@ msgstr ""
msgid "Phone Reporter:"
msgstr "已申報 %s"
+#: templates/web/base/auth/change_phone.html:36
+#: templates/web/base/report/new/form_user_loggedin.html:33
#: templates/web/zurich/report/new/fill_in_details_form.html:65
msgid "Phone number"
msgstr "電話號碼"
-#: templates/web/base/report/new/form_user_loggedin.html:59
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:25
+#: templates/web/base/report/new/form_user_loggedin.html:67
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:30
msgid "Phone number (optional)"
msgstr "電話號碼(非必填)"
-#: perllib/FixMyStreet/Script/Reports.pm:87
-#: templates/web/base/admin/report_edit.html:134
-#: templates/web/base/admin/user-form.html:21
-#: templates/web/zurich/admin/stats.html:39
+#: templates/web/base/admin/user-form.html:30
+#, fuzzy
+msgid "Phone verified:"
+msgstr "已申報 %s"
+
+#: templates/web/base/admin/report_edit.html:135
+#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47
+#: templates/web/zurich/admin/stats/index.html:39
msgid "Phone:"
msgstr "電話"
@@ -2457,7 +2515,7 @@ msgstr "電話"
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
-#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/admin/stats/index.html:37
#: templates/web/zurich/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:36
#: templates/web/zurich/report/new/fill_in_details_form.html:38
@@ -2483,12 +2541,17 @@ msgstr ""
msgid "Photos of recent nearby reports"
msgstr "最近申報之照片"
-#: templates/web/base/reports/index.html:63
-#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:76
+#: templates/web/base/reports/index.html:79
msgid "Pick your council"
msgstr ""
-#: templates/web/base/around/display_location.html:76
+#: templates/web/base/reports/index.html:66
+#: templates/web/base/reports/index.html:69
+msgid "Pick your ward"
+msgstr ""
+
+#: templates/web/base/around/display_location.html:74
#: templates/web/base/js/translation_strings.html:30
msgid "Place pin on map"
msgstr "在地圖上作標記"
@@ -2510,25 +2573,34 @@ msgstr "用語請遵守禮節,明確解釋問題 "
msgid "Please check the passwords and try again"
msgstr "請再次確認您的密碼"
-#: templates/web/base/auth/change_email.html:15
-#: templates/web/base/auth/change_email.html:18
-#: templates/web/base/auth/general.html:39
-#: templates/web/base/auth/general.html:45
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:9
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:27
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "請確認您電郵地址無誤"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:329
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:873
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:896
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1334
+#: perllib/FixMyStreet/DB/Result/User.pm:198
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:7
+#, fuzzy
+msgid "Please check your phone number is correct"
+msgstr "請確認您電郵地址無誤"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:297
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:905
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:928
#: perllib/FixMyStreet/DB/Result/Problem.pm:383
-#: templates/web/base/js/translation_strings.html:9
+#: templates/web/base/js/translation_strings.html:10
msgid "Please choose a category"
msgstr "請選擇類別"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:377
+#: perllib/FixMyStreet/App/Controller/Admin.pm:345
#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
+#: templates/web/base/admin/template_edit.html:13
msgid "Please correct the errors below"
msgstr "請更正下方之錯誤"
@@ -2546,39 +2618,47 @@ msgstr ""
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr "請勿濫用本服務,濫用將造成您的政府輕視其它使用者之意見 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:330
+#: perllib/FixMyStreet/App/Controller/Admin.pm:298
#: perllib/FixMyStreet/DB/Result/Comment.pm:128
-#: templates/web/base/js/translation_strings.html:2
+#: templates/web/base/js/translation_strings.html:3
msgid "Please enter a message"
msgstr "請寫下您的留言"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1305
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1469
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1332
+#: perllib/FixMyStreet/DB/Result/User.pm:200
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:4
+#, fuzzy
+msgid "Please enter a mobile number"
+msgstr "請輸入您的電話號碼"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1365
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1461
msgid "Please enter a name"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:497
+#: perllib/FixMyStreet/App/Controller/Admin.pm:465
msgid "Please enter a name for this body"
msgstr ""
#: templates/web/base/auth/change_password.html:22
#: templates/web/base/auth/change_password.html:25
-#: templates/web/base/js/translation_strings.html:19
+#: templates/web/base/js/translation_strings.html:20
msgid "Please enter a password"
msgstr "請輸入密碼"
#: perllib/FixMyStreet/App/Controller/Contact.pm:115
#: perllib/FixMyStreet/DB/Result/Problem.pm:366
-#: templates/web/base/js/translation_strings.html:3
+#: templates/web/base/js/translation_strings.html:4
msgid "Please enter a subject"
msgstr "請填下主旨"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1302
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1466
-#: perllib/FixMyStreet/App/Controller/Admin.pm:343
-#: perllib/FixMyStreet/DB/Result/User.pm:164
-#: templates/web/base/js/translation_strings.html:12
-#: templates/web/base/js/translation_strings.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1362
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1452
+#: perllib/FixMyStreet/App/Controller/Admin.pm:311
+#: perllib/FixMyStreet/DB/Result/User.pm:193
+#: templates/web/base/js/translation_strings.html:13
+#: templates/web/base/js/translation_strings.html:17
msgid "Please enter a valid email"
msgstr "請輸入有效電子郵件"
@@ -2587,55 +2667,62 @@ msgstr "請輸入有效電子郵件"
msgid "Please enter a valid email address"
msgstr "請輸入有效的電子郵件"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1446
+#, fuzzy
+msgid "Please enter a valid email or phone number"
+msgstr "請輸入您的電話號碼"
+
#: perllib/FixMyStreet/DB/Result/Problem.pm:369
-#: templates/web/base/js/translation_strings.html:4
+#: templates/web/base/js/translation_strings.html:5
msgid "Please enter some details"
msgstr "請填寫進一步細節"
#: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/User.pm:161
-#: templates/web/base/auth/change_email.html:15
-#: templates/web/base/auth/change_email.html:17
-#: templates/web/base/auth/general.html:39
-#: templates/web/base/auth/general.html:44
-#: templates/web/base/js/translation_strings.html:11
-#: templates/web/base/js/translation_strings.html:15
+#: perllib/FixMyStreet/DB/Result/User.pm:191
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:8
+#: templates/web/base/auth/change_email.html:24
+#: templates/web/base/auth/change_email.html:26
+#: templates/web/base/js/translation_strings.html:12
+#: templates/web/base/js/translation_strings.html:16
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "請輸入您的電子郵件"
-#: templates/web/base/report/new/form_user_loggedout_email.html:5
#: templates/web/zurich/report/new/fill_in_details_form.html:57
msgid "Please enter your email address"
msgstr "請輸入您的電子郵件"
-#: templates/web/base/js/translation_strings.html:25
+#: templates/web/base/js/translation_strings.html:26
msgid "Please enter your first name"
msgstr "請輸入您的大名"
#: perllib/FixMyStreet/Cobrand/UK.pm:326
-#: templates/web/base/js/translation_strings.html:7
+#: templates/web/base/js/translation_strings.html:8
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "請輸入您的全名,地方政府需要此資料 – 如果您不希望名字公開在網站上,請在下面方格中劃掉勾選。"
#: perllib/FixMyStreet/App/Controller/Contact.pm:113
#: perllib/FixMyStreet/DB/Result/Comment.pm:125
#: perllib/FixMyStreet/DB/Result/Problem.pm:377
-#: perllib/FixMyStreet/DB/Result/User.pm:157
-#: templates/web/base/js/translation_strings.html:6
+#: perllib/FixMyStreet/DB/Result/User.pm:186
+#: templates/web/base/js/translation_strings.html:7
msgid "Please enter your name"
msgstr "請輸入您的姓氐"
-#: templates/web/base/js/translation_strings.html:22
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:6
+#: templates/web/base/js/translation_strings.html:23
msgid "Please enter your phone number"
msgstr "請輸入您的電話號碼"
-#: templates/web/base/js/translation_strings.html:26
+#: templates/web/base/js/translation_strings.html:27
msgid "Please enter your second name"
msgstr "請輸入您的別名"
-#: templates/web/base/js/translation_strings.html:24
+#: templates/web/base/js/translation_strings.html:25
msgid "Please enter your title"
msgstr "請輸入您的稱呼"
@@ -2684,7 +2771,12 @@ msgstr ""
msgid "Please note:"
msgstr "請加註記"
-#: perllib/FixMyStreet/App/Controller/Report.pm:353
+#: perllib/FixMyStreet/App/Controller/Report.pm:385
+#, fuzzy
+msgid "Please provide a duplicate ID or public update for this report."
+msgstr "如果您是再次申報,請說明原因"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:367
msgid "Please provide a public update for this report."
msgstr ""
@@ -2724,6 +2816,11 @@ msgstr "請敍明該問題是否已解決"
msgid "Please upload an image only"
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1449
+msgid "Please verify at least one of email/phone"
+msgstr ""
+
#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Please write a message"
msgstr "諘寫下您的留言"
@@ -2733,7 +2830,7 @@ msgid "Please write your update here"
msgstr "請寫下您的更新"
#: templates/web/base/report/update-form.html:25
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:14
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:18
#: templates/web/base/report/update/form_user_loggedout_password.html:10
msgid "Post"
msgstr "張貼"
@@ -2742,15 +2839,15 @@ msgstr "張貼"
msgid "Posted anonymously at %s"
msgstr "匿名張貼 %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:255
+#: perllib/FixMyStreet/DB/Result/Comment.pm:266
msgid "Posted by %s at %s"
msgstr "由 %s 在 %s 張貼"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:243
+#: perllib/FixMyStreet/DB/Result/Comment.pm:254
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr "由<strong>%s</strong> (%s) 在%s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:245
+#: perllib/FixMyStreet/DB/Result/Comment.pm:256
msgid "Posted by <strong>%s</strong> at %s"
msgstr "由<strong>%s</strong> 在%s"
@@ -2762,11 +2859,11 @@ msgstr "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">F
msgid "Previous"
msgstr "之前"
-#: perllib/FixMyStreet/Cobrand/Default.pm:665
+#: perllib/FixMyStreet/Cobrand/Default.pm:648
msgid "Priorities"
msgstr ""
-#: templates/web/base/report/_inspect.html:123
+#: templates/web/base/report/_inspect.html:129
#: templates/web/base/report/_item.html:100
msgid "Priority"
msgstr ""
@@ -2783,7 +2880,7 @@ msgstr "隱私與cookies"
#: templates/web/base/admin/body.html:88
#: templates/web/base/admin/contact-form.html:75
-#: templates/web/base/admin/report_edit.html:137
+#: templates/web/base/admin/report_edit.html:142
msgid "Private"
msgstr "私人"
@@ -2807,21 +2904,21 @@ msgstr "%s 問題已被確認 "
msgid "Problem %s sent to council %s"
msgstr "%s 問題已送達到地方政府 %s "
-#: templates/web/base/admin/stats.html:57
-#: templates/web/base/admin/stats_by_state.html:12
+#: templates/web/base/admin/stats/index.html:5
+#: templates/web/base/admin/stats/state.html:12
#: templates/web/zurich/admin/index.html:9
msgid "Problem breakdown by state"
msgstr "本站出現故障問題 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1272
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1309
msgid "Problem marked as open."
msgstr "問題標註為開放"
-#: templates/web/base/admin/questionnaire.html:21
+#: templates/web/base/admin/stats/questionnaire.html:21
msgid "Problem state change based on survey results"
msgstr "依調查結果呈現的問題改善"
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/Default.pm:692
#: templates/web/base/admin/flagged.html:10
msgid "Problems"
msgstr "問題"
@@ -2848,7 +2945,7 @@ msgstr "FixMyStreet 最近回報的已修復問題 "
msgid "Problems within %.1fkm of %s"
msgstr "該地點 %.1f公里內的問題 "
-#: perllib/FixMyStreet/Cobrand/Default.pm:838
+#: perllib/FixMyStreet/Cobrand/Default.pm:821
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
#: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257
#: perllib/FixMyStreet/Cobrand/UK.pm:269
@@ -2874,7 +2971,8 @@ msgstr "在 %s, %s的問題 "
msgid "Property address:"
msgstr "公物地址:"
-#: templates/web/base/report/duplicate-no-updates.html:2
+#: templates/web/base/report/display.html:57
+#: templates/web/base/report/duplicate-no-updates.html:3
#: templates/web/base/report/update-form.html:6
msgid "Provide an update"
msgstr "提供更新資訊"
@@ -2883,12 +2981,12 @@ msgstr "提供更新資訊"
msgid "Provide update as"
msgstr ""
-#: templates/web/base/auth/general.html:114
+#: templates/web/base/auth/general.html:119
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。  "
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:31
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:9
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:41
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr "提供名稱與密碼非為必要,但其可以讓您更便於申報問題,提供更新與管理您的申報。"
@@ -2901,12 +2999,12 @@ msgstr ""
msgid "Public response:"
msgstr "公眾反應"
-#: templates/web/base/report/_inspect.html:162
+#: templates/web/base/report/_inspect.html:169
msgid "Public update:"
msgstr ""
#: templates/web/zurich/admin/report_edit.html:123
-#: templates/web/zurich/admin/stats.html:38
+#: templates/web/zurich/admin/stats/index.html:38
msgid "Publish photo"
msgstr "發出照片"
@@ -2961,7 +3059,7 @@ msgstr "%s, 在%s 里/區"
msgid "RSS feed of nearby problems"
msgstr " RSS訂閱 %s區域問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:839
+#: perllib/FixMyStreet/Cobrand/Default.pm:822
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "RSS feed of problems within %s"
@@ -2986,7 +3084,7 @@ msgstr "最近當地問題更新的RSS訂閱"
msgid "Receive email when updates are left on this problem."
msgstr "透過電子郵件收取該問題之更新消息"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:738
+#: perllib/FixMyStreet/DB/Result/Problem.pm:756
msgid "Received by %s moments later"
msgstr ""
@@ -3000,7 +3098,7 @@ msgstr "近期的當地問題%s "
msgid "Recently reported problems"
msgstr "近期申報之問題 "
-#: templates/web/base/reports/_list-filters.html:60
+#: templates/web/base/reports/_list-filters.html:68
msgid "Recently updated"
msgstr ""
@@ -3024,9 +3122,9 @@ msgstr "移除標記"
#: templates/web/base/report/_item.html:12
#: templates/web/base/report/_item.html:9
-#: templates/web/base/report/_main.html:138
-#: templates/web/base/report/_main.html:18
-#: templates/web/base/report/_main.html:26
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:14
+#: templates/web/base/report/_main.html:22
msgid "Remove from shortlist"
msgstr ""
@@ -3034,12 +3132,16 @@ msgstr ""
msgid "Remove from site"
msgstr ""
-#: templates/web/base/admin/report_edit.html:154
-#: templates/web/base/admin/update_edit.html:69
+#: templates/web/base/admin/report_edit.html:159
+#: templates/web/base/admin/update_edit.html:71
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "移陯照片(無法回復)"
+#: templates/web/base/auth/generate_token.html:33
+msgid "Replace token"
+msgstr ""
+
#: templates/web/zurich/admin/report_edit.html:239
msgid "Reply to user:"
msgstr "給用戶的回應"
@@ -3068,11 +3170,11 @@ msgstr "申報濫用"
msgid "Report as"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Rss.pm:298
+#: perllib/FixMyStreet/App/Controller/Rss.pm:302
msgid "Report on %s"
msgstr "在%s 申報 "
-#: templates/web/base/dashboard/index.html:137
+#: templates/web/base/dashboard/index.html:61
msgid "Report state:"
msgstr ""
@@ -3087,17 +3189,17 @@ msgstr "申報你的問題"
msgid "Report, view, or discuss local problems"
msgstr "申報,檢視,或討論在地問題"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:590
+#: perllib/FixMyStreet/DB/Result/Problem.pm:599
#: templates/web/base/contact/index.html:55
msgid "Reported anonymously at %s"
msgstr "在%s 匿名申報 "
-#: templates/web/base/admin/questionnaire.html:5
+#: templates/web/base/admin/stats/questionnaire.html:5
#: templates/web/base/questionnaire/index.html:64
msgid "Reported before"
msgstr "之前的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:614
+#: perllib/FixMyStreet/DB/Result/Problem.pm:623
#: templates/web/base/contact/index.html:57
msgid "Reported by %s at %s"
msgstr "由%s 的 %s 申報"
@@ -3111,27 +3213,27 @@ msgstr "由  申報"
msgid "Reported in the %s category"
msgstr "%s 種類之申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:587
+#: perllib/FixMyStreet/DB/Result/Problem.pm:596
msgid "Reported in the %s category anonymously at %s"
msgstr "%s 種類下的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:611
+#: perllib/FixMyStreet/DB/Result/Problem.pm:620
msgid "Reported in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: perllib/FixMyStreet/DB/Result/Problem.pm:593
msgid "Reported via %s anonymously at %s"
msgstr "在%s 匿名申報 "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:608
+#: perllib/FixMyStreet/DB/Result/Problem.pm:617
msgid "Reported via %s by %s at %s"
msgstr "%s 透過 %s 在 %s類別的申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:581
+#: perllib/FixMyStreet/DB/Result/Problem.pm:590
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "透過 %s 在 %s類別的匿名申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:603
+#: perllib/FixMyStreet/DB/Result/Problem.pm:612
msgid "Reported via %s in the %s category by %s at %s"
msgstr "%s 在 %s %s類別的申報 "
@@ -3140,8 +3242,8 @@ msgstr "%s 在 %s %s類別的申報 "
msgid "Reported:"
msgstr "已申報 %s"
-#: templates/web/base/around/index.html:2
-#: templates/web/base/around/lookup_by_ref.html:2
+#: templates/web/base/around/index.html:3
+#: templates/web/base/around/lookup_by_ref.html:3
#: templates/web/base/js/translation_strings.html:42
#: templates/web/base/report/new/fill_in_details.html:0
#: templates/web/base/report/new/fill_in_details.html:8
@@ -3149,10 +3251,9 @@ msgstr "已申報 %s"
msgid "Reporting a problem"
msgstr "申報問題"
-#: perllib/FixMyStreet/Cobrand/Default.pm:655
+#: perllib/FixMyStreet/Cobrand/Default.pm:638
#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
-#: templates/web/base/dashboard/index.html:134
-#: templates/web/zurich/header.html:52
+#: templates/web/zurich/header.html:46
msgid "Reports"
msgstr "申報"
@@ -3169,7 +3270,7 @@ msgstr "待核實之申報"
msgid "Reports by destination"
msgstr "由%s 的 %s 申報"
-#: templates/web/base/admin/user-form.html:107
+#: templates/web/base/admin/user-form.html:125
msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
msgstr ""
@@ -3181,7 +3282,7 @@ msgstr ""
msgid "Reports published"
msgstr "己公開之申報"
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:75
msgid "Reports saved offline."
msgstr ""
@@ -3237,21 +3338,22 @@ msgid "Response Templates"
msgstr ""
#: templates/web/base/admin/templates.html:1
-#: templates/web/base/admin/templates.html:4
#: templates/web/zurich/admin/template_edit.html:1
#: templates/web/zurich/admin/template_edit.html:4
+#: templates/web/zurich/admin/templates.html:1
+#: templates/web/zurich/admin/templates.html:3
msgid "Response Templates for %s"
msgstr "%s的回應模版"
-#: templates/web/base/report/update.html:40
+#: templates/web/base/report/update.html:38
msgid "Revert to original"
msgstr ""
-#: templates/web/base/report/_main.html:99
+#: templates/web/base/report/_main.html:95
msgid "Revert to original text"
msgstr ""
-#: templates/web/base/report/_main.html:50
+#: templates/web/base/report/_main.html:46
msgid "Revert to original title"
msgstr ""
@@ -3270,17 +3372,17 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s"
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1848
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1852
-#: templates/web/base/admin/report_edit.html:151
-#: templates/web/base/admin/update_edit.html:66
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1875
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1879
+#: templates/web/base/admin/report_edit.html:156
+#: templates/web/base/admin/update_edit.html:68
#: templates/web/zurich/admin/report_edit.html:118
msgid "Rotate Left"
msgstr "左轉 "
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1848
-#: templates/web/base/admin/report_edit.html:152
-#: templates/web/base/admin/update_edit.html:67
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1875
+#: templates/web/base/admin/report_edit.html:157
+#: templates/web/base/admin/update_edit.html:69
#: templates/web/zurich/admin/report_edit.html:119
msgid "Rotate Right"
msgstr "右轉 "
@@ -3290,21 +3392,21 @@ msgid "Rotating this photo will discard unsaved changes to the report."
msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失"
#: templates/web/base/js/translation_strings.html:47
-#: templates/web/base/maps/google-ol.html:16
+#: templates/web/base/maps/google-ol.html:2
msgid "Satellite"
msgstr "衛星"
-#: templates/web/base/report/_inspect.html:182
+#: templates/web/base/report/_inspect.html:189
msgid "Save + close as duplicate"
msgstr ""
#: templates/web/base/admin/contact-form.html:138
#: templates/web/base/admin/reportextrafields/edit.html:64
#: templates/web/base/admin/responsepriorities/edit.html:58
-#: templates/web/base/admin/template_edit.html:46
-#: templates/web/base/report/_inspect.html:182
-#: templates/web/base/report/_main.html:117
-#: templates/web/base/report/update.html:69
+#: templates/web/base/admin/template_edit.html:71
+#: templates/web/base/report/_inspect.html:189
+#: templates/web/base/report/_main.html:113
+#: templates/web/base/report/update.html:72
#: templates/web/zurich/admin/body.html:62
#: templates/web/zurich/admin/contact-form.html:22
#: templates/web/zurich/admin/template_edit.html:29
@@ -3315,12 +3417,12 @@ msgstr "儲存變動"
msgid "Save new fields"
msgstr ""
-#: templates/web/base/report/_inspect.html:158
+#: templates/web/base/report/_inspect.html:165
msgid "Save with a public update"
msgstr ""
#. ("This is followed by a progress count, e.g. 3/5")
-#: templates/web/base/js/translation_strings.html:72
+#: templates/web/base/js/translation_strings.html:76
msgid "Saving reports offline"
msgstr ""
@@ -3339,7 +3441,7 @@ msgstr "搜尋申報"
msgid "Search Users"
msgstr "搜尋使用者"
-#: templates/web/zurich/header.html:74
+#: templates/web/zurich/header.html:68
msgid "Search reports"
msgstr "搜尋申報"
@@ -3350,6 +3452,7 @@ msgid "Search:"
msgstr "搜尋"
#: templates/web/base/admin/reports.html:27
+#: templates/web/base/around/lookup_by_ref.html:18
msgid "Searching found no reports."
msgstr "查無此申報"
@@ -3362,7 +3465,7 @@ msgstr "查無此用戶"
msgid "See our privacy policy"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/Default.pm:703
msgid "See user detail for reports created as the council"
msgstr ""
@@ -3371,8 +3474,8 @@ msgstr ""
msgid "Select a body"
msgstr "選擇單位"
-#: templates/web/base/admin/body-form.html:79
-#: templates/web/zurich/admin/body-form.html:26
+#: templates/web/base/admin/body-form.html:78
+#: templates/web/zurich/admin/body-form.html:25
msgid "Select an area"
msgstr "選擇區域"
@@ -3392,11 +3495,16 @@ msgstr ""
msgid "Send extended Open311 statuses with service request updates"
msgstr ""
+#: templates/web/base/auth/_username_error.html:1
+#: templates/web/base/auth/_username_error.html:5
+msgid "Sending a confirmation text failed: \"%s\""
+msgstr ""
+
#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
msgid "Sent report back"
msgstr "送回申報"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:741
+#: perllib/FixMyStreet/DB/Result/Problem.pm:759
msgid "Sent to %s %s later"
msgstr "%s 稍後送給%s"
@@ -3405,11 +3513,11 @@ msgid "Sent:"
msgstr "送出"
#: templates/web/base/admin/report_edit.html:90
-#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats/index.html:45
msgid "Service:"
msgstr "服務"
-#: templates/web/base/report/_inspect.html:41
+#: templates/web/base/report/_inspect.html:47
msgid "Set to my current location"
msgstr ""
@@ -3418,9 +3526,9 @@ msgid "Share"
msgstr "分享"
#: templates/web/base/main_nav_items.html:10
-#: templates/web/base/report/_main.html:140
-#: templates/web/base/report/_main.html:21
-#: templates/web/base/report/_main.html:29
+#: templates/web/base/report/_main.html:132
+#: templates/web/base/report/_main.html:17
+#: templates/web/base/report/_main.html:25
msgid "Shortlist"
msgstr ""
@@ -3428,19 +3536,19 @@ msgstr ""
msgid "Shortlist all visible"
msgstr ""
-#: templates/web/base/report/_main.html:138
-#: templates/web/base/report/_main.html:20
-#: templates/web/base/report/_main.html:25
-#: templates/web/base/reports/_list-filters.html:9
+#: templates/web/base/report/_main.html:130
+#: templates/web/base/report/_main.html:16
+#: templates/web/base/report/_main.html:21
+#: templates/web/base/reports/_list-filters.html:17
msgid "Shortlisted"
msgstr ""
#: templates/web/base/report/_item.html:15
-#: templates/web/base/report/_main.html:148
+#: templates/web/base/report/_main.html:140
msgid "Shortlisted by %s"
msgstr ""
-#: templates/web/base/report/update.html:20
+#: templates/web/base/report/update.html:18
msgid "Show Photo?"
msgstr ""
@@ -3448,40 +3556,37 @@ msgstr ""
msgid "Show all updates"
msgstr ""
-#: templates/web/base/report/new/form_user_loggedin.html:56
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:22
+#: templates/web/base/report/new/form_user_loggedin.html:63
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
#: templates/web/base/report/update/form_name.html:37
msgid "Show my name publicly"
msgstr "公開我的姓名"
-#: templates/web/base/report/update.html:17
+#: templates/web/base/report/update.html:15
msgid "Show name publicly?"
msgstr ""
-#: templates/web/base/around/display_location.html:69
-msgid "Show old"
-msgstr "顯示舊文"
-
-#: templates/web/base/report/_main.html:83
+#: templates/web/base/report/_main.html:79
msgid "Show photo"
msgstr ""
-#: templates/web/base/around/display_location.html:60
+#: templates/web/base/around/display_location.html:58
+#: templates/web/base/around/display_location.html:66
#: templates/web/base/js/translation_strings.html:54
msgid "Show pins"
msgstr "顯示地圖標示"
-#: templates/web/base/report/_main.html:60
+#: templates/web/base/report/_main.html:56
msgid "Show reporter&rsquo;s name"
msgstr ""
-#: templates/web/base/reports/index.html:62
+#: templates/web/base/reports/index.html:64
msgid "Show reports in your area"
msgstr ""
-#: templates/web/base/auth/general.html:119
+#: templates/web/base/auth/general.html:124
#: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:88
+#: templates/web/base/auth/general.html:85
#: templates/web/base/main_nav_items.html:6
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
@@ -3492,12 +3597,16 @@ msgstr "登入"
msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated."
msgstr ""
+#: templates/web/base/auth/general.html:96
+msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated."
+msgstr ""
+
#: templates/web/base/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "登入或新建帳戶"
-#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25
+#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "登出"
@@ -3516,7 +3625,7 @@ msgstr ""
"被送出至地方政府\n"
"."
-#: templates/web/base/alert/index.html:40
+#: templates/web/base/alert/index.html:42
msgid "Some photos of recent reports"
msgstr "最近申報之照片"
@@ -3529,15 +3638,20 @@ msgstr "有些文字需在地化"
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr "抱歉,該郵區號碼我們尚未支援"
-#: templates/web/base/auth/token.html:8
+#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8
msgid "Sorry, that wasn&rsquo;t a valid link"
msgstr "抱歉這個wasn&rsquo;t 為有效的網址連結"
+#: templates/web/base/auth/smsform.html:16
+#, fuzzy
+msgid "Sorry, that wasn&rsquo;t the correct code"
+msgstr "抱歉這個wasn&rsquo;t 為有效的網址連結"
+
#: templates/web/base/tokens/abuse.html:5
msgid "Sorry, there has been an error confirming your problem."
msgstr "抱歉無法確認你的問題"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:235
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:242
#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38
#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56
#: perllib/FixMyStreet/Geocode/OSM.pm:48
@@ -3570,20 +3684,21 @@ msgstr ""
msgid "Sorry, you don't have permission to do that."
msgstr ""
-#: templates/web/base/reports/_list-filters.html:53
+#: templates/web/base/reports/_list-filters.html:61
msgid "Sort by"
msgstr ""
-#: templates/web/base/admin/user-form.html:47
+#: templates/web/base/admin/user-form.html:65
msgid "Staff users have permission to log in to the admin."
msgstr ""
-#: templates/web/base/admin/user-form.html:50
+#: templates/web/base/admin/user-form.html:68
msgid "Staff:"
msgstr ""
-#: templates/web/base/admin/stats.html:71
-msgid "Start Date:"
+#: templates/web/base/dashboard/index.html:73
+#, fuzzy
+msgid "Start Date"
msgstr "問始日:"
#: templates/web/base/admin/body.html:73
@@ -3593,15 +3708,18 @@ msgstr "問始日:"
#: templates/web/base/admin/index.html:64
#: templates/web/base/admin/list_updates.html:11
#: templates/web/base/admin/reports.html:16
-#: templates/web/base/admin/template_edit.html:40
-#: templates/web/base/report/_inspect.html:82
+#: templates/web/base/admin/template_edit.html:50
+#: templates/web/base/admin/templates.html:8
+#: templates/web/base/dashboard/index.html:100
+#: templates/web/base/report/_inspect.html:88
#: templates/web/base/report/_item.html:96
#: templates/web/base/report/update/form_update.html:39
#: templates/web/zurich/admin/contact-form.html:10
msgid "State"
msgstr "陳述"
-#: templates/web/base/report/update.html:48
+#: perllib/FixMyStreet/Script/Alerts.pm:102
+#: templates/web/base/report/update.html:49
#, fuzzy
msgid "State changed to:"
msgstr "儲存變動"
@@ -3615,17 +3733,19 @@ msgstr "儲存變動"
msgid "State:"
msgstr "陳述:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:645
+#: perllib/FixMyStreet/Cobrand/Default.pm:628
#: templates/web/base/admin/states/index.html:1
#, fuzzy
msgid "States"
msgstr "陳述"
-#: perllib/FixMyStreet/Cobrand/Default.pm:639
+#: perllib/FixMyStreet/Cobrand/Default.pm:622
#: perllib/FixMyStreet/Cobrand/Zurich.pm:391
-#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1
-#: templates/web/base/admin/stats_by_state.html:1
-#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65
+#: templates/web/base/admin/index.html:71
+#: templates/web/base/admin/stats/index.html:1
+#: templates/web/base/admin/stats/state.html:1
+#: templates/web/zurich/admin/stats/index.html:1
+#: templates/web/zurich/header.html:59
msgid "Stats"
msgstr "統計"
@@ -3635,7 +3755,7 @@ msgstr "統計"
msgid "Status"
msgstr "狀態"
-#: templates/web/base/report/updates.html:10
+#: templates/web/base/report/updates.html:16
msgid "Still open, via questionnaire, %s"
msgstr " %s問卷仍開放中"
@@ -3648,7 +3768,12 @@ msgstr "街景圖"
msgid "String"
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:192
+#: templates/web/base/report/new/category.html:35
+#, fuzzy
+msgid "Subcategory"
+msgstr "子類別:%s"
+
+#: perllib/FixMyStreet/Script/Reports.pm:191
msgid "Subcategory: %s"
msgstr "子類別:%s"
@@ -3665,18 +3790,19 @@ msgstr "主旨"
msgid "Subject:"
msgstr "主旨:"
+#: templates/web/base/auth/smsform.html:27
#: templates/web/base/questionnaire/creator_fixed.html:19
-#: templates/web/base/report/new/form_user_loggedin.html:63
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:36
+#: templates/web/base/report/new/form_user_loggedin.html:76
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:46
#: templates/web/base/report/new/form_user_loggedout_password.html:11
#: templates/web/zurich/report/new/fill_in_details_form.html:73
msgid "Submit"
msgstr "送出"
-#: templates/web/base/admin/report_edit.html:162
+#: templates/web/base/admin/report_edit.html:167
#: templates/web/base/admin/report_edit.html:24
-#: templates/web/base/admin/update_edit.html:77
-#: templates/web/base/admin/user-form.html:170
+#: templates/web/base/admin/update_edit.html:79
+#: templates/web/base/admin/user-form.html:188
#: templates/web/zurich/admin/report_edit-sdm.html:124
#: templates/web/zurich/admin/report_edit.html:264
#: templates/web/zurich/admin/update_edit.html:38
@@ -3718,7 +3844,7 @@ msgstr ""
msgid "Summarise your changes"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:637
+#: perllib/FixMyStreet/Cobrand/Default.pm:620
#: perllib/FixMyStreet/Cobrand/Zurich.pm:387
#: templates/web/base/admin/bodies.html:29
#: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1
@@ -3726,25 +3852,31 @@ msgstr ""
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
-#: templates/web/zurich/header.html:49
+#: templates/web/zurich/header.html:43
msgid "Summary"
msgstr "摘要"
#: templates/web/zurich/reports/index.html:0
-#: templates/web/zurich/reports/index.html:4
+#: templates/web/zurich/reports/index.html:5
msgid "Summary reports"
msgstr "申報摘要"
-#: templates/web/base/admin/user-form.html:133
+#: templates/web/base/admin/stats/index.html:7
+#: templates/web/base/dashboard/index.html:21
+#, fuzzy
+msgid "Summary statistics"
+msgstr "申報摘要"
+
+#: templates/web/base/admin/user-form.html:151
msgid "Superuser:"
msgstr ""
-#: templates/web/base/admin/user-form.html:130
+#: templates/web/base/admin/user-form.html:148
msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
msgstr ""
-#: templates/web/base/admin/questionnaire.html:1
-#: templates/web/base/admin/stats.html:56
+#: templates/web/base/admin/stats/index.html:4
+#: templates/web/base/admin/stats/questionnaire.html:1
msgid "Survey Results"
msgstr "調查結果"
@@ -3752,14 +3884,14 @@ msgstr "調查結果"
msgid "Template &laquo;%s&raquo;"
msgstr "模版 &laquo;%s&raquo;"
-#: perllib/FixMyStreet/Cobrand/Default.pm:661
+#: perllib/FixMyStreet/Cobrand/Default.pm:644
#: perllib/FixMyStreet/Cobrand/Zurich.pm:398
-#: templates/web/zurich/header.html:69
+#: templates/web/zurich/header.html:63
msgid "Templates"
msgstr "模版"
#: templates/web/base/admin/list_updates.html:12
-#: templates/web/base/admin/templates.html:11
+#: templates/web/zurich/admin/templates.html:9
msgid "Text"
msgstr "內文"
@@ -3767,7 +3899,7 @@ msgstr "內文"
msgid "Text only version"
msgstr "文字版"
-#: templates/web/base/admin/template_edit.html:17
+#: templates/web/base/admin/template_edit.html:33
#: templates/web/base/admin/update_edit.html:20
#: templates/web/zurich/admin/template_edit.html:24
#: templates/web/zurich/admin/update_edit.html:12
@@ -3794,7 +3926,7 @@ msgstr ""
msgid "Thank you for your feedback"
msgstr "感謝您的回饋"
-#: templates/web/base/around/_error_multiple.html:17
+#: templates/web/base/around/_error_multiple.html:18
msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
msgstr "感謝上傳照片,現在需要知道問題的地點位置,請在上方方格內輸入附近街名或郵編 "
@@ -3810,7 +3942,7 @@ 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:127
+#: perllib/FixMyStreet/App/Controller/Location.pm:141
msgid "That location does not appear to be in the UK; please try again."
msgstr "這地點似乎不在台灣; 請再試 一次。"
@@ -3820,11 +3952,11 @@ msgstr "這地點似乎不在台灣; 請再試 一次。"
msgid "That postcode was not recognised, sorry."
msgstr "抱歉此郵遞區號無法辨識"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:850
+#: perllib/FixMyStreet/App/Controller/Admin.pm:858
msgid "That problem has been marked as sent."
msgstr "問題被標註為送出"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:843
+#: perllib/FixMyStreet/App/Controller/Admin.pm:851
msgid "That problem will now be resent."
msgstr "此問題將重新送出"
@@ -3862,8 +3994,8 @@ msgstr ""
"此<strong>管轄區</strong> 功能只有在終端不只一個\n"
"時才會用到。如果機關自行營運用終端,此處功能可以不選留白 "
+#: templates/web/base/admin/body-form.html:101
#: templates/web/base/admin/body-form.html:102
-#: templates/web/base/admin/body-form.html:103
#: templates/web/base/admin/contact-form.html:104
#: templates/web/base/admin/contact-form.html:105
msgid ""
@@ -3900,8 +4032,8 @@ msgstr "地方政府可能無法協助,除非您留下問題的詳細細節。
msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
msgstr "這個勤奮表單顯示用戶的活動(誰做了做多的修改編輯活動)"
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63
-#: perllib/FixMyStreet/App/Controller/Reports.pm:103
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43
+#: perllib/FixMyStreet/App/Controller/Reports.pm:85
msgid "The error was: %s"
msgstr "顯示錯誤為: %s"
@@ -3943,7 +4075,7 @@ msgstr "用戶提供的本地最新已修復問題 "
msgid "The latest problems within {{NAME}}'s boundary reported by users"
msgstr "用戶申報{{NAME}}地區內地的最新問題"
-#: templates/web/base/auth/token.html:9
+#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9
msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
msgstr "這連結可能失效了或者你並未正確地複制貼上它"
@@ -3968,7 +4100,7 @@ msgstr "找不到您所要求的網頁連結。"
msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:96
+#: perllib/FixMyStreet/Script/Reports.pm:95
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "用戶無法在地點上標示問題,但可以看到他們輸入的地點"
@@ -3981,33 +4113,38 @@ msgstr ""
"用戶的<strong>名字</strong> 會公開出現在未標記<em>匿名</em>的申報上\n"
"名字不需要獨特可重覆 "
-#: templates/web/base/around/on_map_list_items.html:12
+#: templates/web/base/around/on_map_list_items.html:17
#: templates/web/base/my/_problem-list.html:8
#: templates/web/base/reports/_problem-list.html:13
msgid "There are no reports to show."
msgstr "沒有申報可顯示"
-#: perllib/FixMyStreet/App/Controller/Reports.pm:100
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1140
+msgid "There is already an auto-response template for this category/state."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:82
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "本頁現在無法願現所要求的申報資料,請稍候再試。"
#: perllib/FixMyStreet/App/Controller/Contact.pm:138
-#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42
msgid "There was a problem showing this page. Please try again later."
msgstr "本頁出現錯誤,請再試一次"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:785
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152
-#: templates/web/base/auth/general.html:55
-#: templates/web/zurich/auth/general.html:28
-msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
-msgstr "您的電子郵件與密碼不相符,如果您遺忘密碼或尚未註冊,請在申請表單上填入電子郵件"
-
#: perllib/FixMyStreet/App/Controller/Alert.pm:359
msgid "There was a problem with your email/password combination. Please try again."
msgstr "您的電子郵件/密碼不符,請重試一次"
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:806
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135
+#: templates/web/base/auth/general.html:51
+#: templates/web/zurich/auth/general.html:28
+#, fuzzy
+msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form."
+msgstr "您的電子郵件與密碼不相符,如果您遺忘密碼或尚未註冊,請在申請表單上填入電子郵件"
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338
msgid "There was a problem with your update. Please try again."
msgstr "您的申報有問題,請重試一次"
@@ -4015,7 +4152,7 @@ msgstr "您的申報有問題,請重試一次"
msgid "There were problems with your report. Please see below."
msgstr "您的申報有問題,請見下方說明"
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373
msgid "There were problems with your update. Please see below."
msgstr "您的更新有問題,請見下方說明"
@@ -4080,26 +4217,34 @@ msgstr ""
"此單位只涵蓋 <strong>負責區域</strong>的申報問題處理。 \n"
"除非其涵蓋至少一個區域,否則政府單位不會接收到問題申報 "
-#: perllib/FixMyStreet/Script/Reports.pm:199
+#: perllib/FixMyStreet/Script/Reports.pm:198
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "當用戶沒有選擇類別時,電子郵件將送到負責該區域的各地方政府。如果您不是該問題的受理機關,請略過,或讓我們知道該問題的類別以在系統作修正。"
-#: perllib/FixMyStreet/Script/Reports.pm:202
+#: perllib/FixMyStreet/Script/Reports.pm:201
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "電子郵件將送到負責該區域的多個地方政府,因選擇的類別提供這些對象。如果您不是負責受理機關,請略過。"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:910
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:954
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:971
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:942
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:986
#: perllib/FixMyStreet/Cobrand/UK.pm:45
msgid "This information is required"
msgstr "本項資訊必填"
+#: templates/web/base/admin/template_edit.html:19
+msgid "This is a <strong>private</strong> name for this template so you can identify it when updating reports or editing in the admin."
+msgstr ""
+
#: templates/web/base/debug_header.html:3
msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
msgstr "本站為開發試用,可能隨時故障,資料庫也會定期刪除。"
+#: templates/web/base/admin/template_edit.html:29
+msgid "This is the <strong>public</strong> text that will be shown on the site."
+msgstr ""
+
#: templates/web/base/report/new/form_report.html:58
msgid "This pothole has been here for two months and…"
msgstr ""
@@ -4116,7 +4261,7 @@ msgstr "問題尚未解決"
msgid "This problem is still ongoing"
msgstr ""
-#: templates/web/base/report/duplicate-no-updates.html:3
+#: templates/web/base/report/duplicate-no-updates.html:5
msgid "This report is a duplicate. Please leave updates on the original report:"
msgstr ""
@@ -4126,23 +4271,23 @@ msgstr ""
msgid "This report is awaiting moderation."
msgstr "此問題尚待審核"
-#: perllib/FixMyStreet/Script/Alerts.pm:98
+#: perllib/FixMyStreet/Script/Alerts.pm:119
msgid "This report is currently marked as closed."
msgstr "該申報目前注記為結案狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:96
+#: perllib/FixMyStreet/Script/Alerts.pm:117
msgid "This report is currently marked as fixed."
msgstr "該申報目前注記為解決狀態"
-#: perllib/FixMyStreet/Script/Alerts.pm:100
+#: perllib/FixMyStreet/Script/Alerts.pm:121
msgid "This report is currently marked as open."
msgstr "該申報目前注記為開放狀態"
-#: perllib/FixMyStreet/Script/Reports.pm:109
+#: perllib/FixMyStreet/Script/Reports.pm:108
msgid "This report was submitted anonymously"
msgstr "此為匿名申報"
-#: perllib/FixMyStreet/Script/Reports.pm:89
+#: perllib/FixMyStreet/Script/Reports.pm:88
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "本頁包括由用戶提供反應問題的照片 "
@@ -4153,7 +4298,7 @@ msgstr "本頁包括由用戶提供反應問題的照片 "
msgid "Time spent (in minutes):"
msgstr "花費時間(以分鐘計):"
-#: perllib/FixMyStreet/Cobrand/Default.pm:638
+#: perllib/FixMyStreet/Cobrand/Default.pm:621
#: templates/web/base/admin/timeline.html:1
msgid "Timeline"
msgstr "時間軸"
@@ -4165,20 +4310,21 @@ msgstr ""
#: templates/web/base/admin/flagged.html:15
#: templates/web/base/admin/index.html:61
#: templates/web/base/admin/reports.html:13
-#: templates/web/base/admin/templates.html:10
+#: templates/web/base/admin/templates.html:6
+#: templates/web/zurich/admin/templates.html:8
msgid "Title"
msgstr "標題"
-#: templates/web/base/admin/template_edit.html:13
+#: templates/web/base/admin/template_edit.html:23
#: templates/web/zurich/admin/template_edit.html:20
msgid "Title:"
msgstr "標題"
-#: templates/web/base/alert/index.html:25
+#: templates/web/base/alert/index.html:26
msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
msgstr "找出適合您的在地通知,請輸入您的郵編或街名區域"
-#: templates/web/base/alert/index.html:27
+#: templates/web/base/alert/index.html:28
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "找出適合您的在地通知,請輸入您的郵編或街名區域"
@@ -4190,44 +4336,36 @@ msgstr ""
msgid "To limit this collection of fields to a single language, select it here."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:95
+#: perllib/FixMyStreet/Script/Reports.pm:94
msgid "To view a map of the precise location of this issue"
msgstr "檢視地圖上問題之確切位置"
-#: templates/web/base/reports/index.html:97
-msgid "Top 5 most used categories"
-msgstr ""
-
-#: templates/web/base/reports/index.html:83
-msgid "Top 5 responsive councils"
+#: templates/web/base/auth/generate_token.html:11
+msgid "Token:"
msgstr ""
-#: templates/web/base/admin/questionnaire.html:24
-#: templates/web/base/admin/stats.html:24
-#: templates/web/base/admin/stats.html:43
-#: templates/web/base/admin/stats_fix_rate.html:4
-#: templates/web/zurich/admin/stats.html:30
-msgid "Total"
-msgstr "總數"
-
-#: templates/web/base/dashboard/index.html:97
-msgid "Total marked"
+#: templates/web/base/reports/index.html:126
+msgid "Top 5 most used categories"
msgstr ""
-#: templates/web/base/dashboard/index.html:71
-msgid "Total marked as fixed"
+#: templates/web/base/reports/index.html:111
+msgid "Top 5 responsive councils"
msgstr ""
-#: templates/web/base/dashboard/index.html:125
-msgid "Total not marked"
+#: templates/web/base/reports/index.html:98
+msgid "Top 5 wards"
msgstr ""
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:56
-msgid "Total reports received"
-msgstr ""
+#: templates/web/base/admin/stats/fix_rate.html:4
+#: templates/web/base/admin/stats/questionnaire.html:24
+#: templates/web/base/dashboard/index.html:114
+#: templates/web/base/dashboard/index.html:119
+#: templates/web/base/dashboard/index.html:143
+#: templates/web/zurich/admin/stats/index.html:30
+msgid "Total"
+msgstr "總數"
-#: templates/web/base/report/_inspect.html:134
+#: templates/web/base/report/_inspect.html:140
#: templates/web/base/report/_item.html:104
msgid "Traffic management required?"
msgstr ""
@@ -4240,18 +4378,19 @@ msgstr ""
msgid "Translations"
msgstr ""
-#: templates/web/base/admin/user-form.html:111
+#: templates/web/base/admin/user-form.html:129
msgid "Trusted by bodies:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:726
+#: perllib/FixMyStreet/Cobrand/Default.pm:709
msgid "Trusted to make reports that don't need to be inspected"
msgstr ""
-#: templates/web/base/admin/user-form.html:119
+#: templates/web/base/admin/user-form.html:137
msgid "Trusted:"
msgstr ""
+#: templates/web/base/auth/smsform.html:17
#: templates/web/base/js/translation_strings.html:29
msgid "Try again"
msgstr "再試一次"
@@ -4266,7 +4405,11 @@ msgstr "何不直接發信給我們:"
msgid "Type"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/State.pm:59
+#: templates/web/base/admin/user-form.html:38
+msgid "Unban"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:63
#: templates/web/base/admin/contact-form.html:55
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/report_edit-sdm.html:66
@@ -4275,15 +4418,11 @@ msgstr ""
msgid "Unconfirmed"
msgstr "未確認的"
-#: templates/web/base/reports/_list-filters.html:5
-msgid "Unfixed reports"
-msgstr "未處理之申報 "
-
#: templates/web/base/report/banner.html:9
msgid "Unknown"
msgstr "未知的"
-#: perllib/FixMyStreet/App/Controller/Rss.pm:174
+#: perllib/FixMyStreet/App/Controller/Rss.pm:178
msgid "Unknown alert type"
msgstr "未知的通知類別"
@@ -4293,13 +4432,14 @@ msgstr "未知的通知類別"
msgid "Unknown error"
msgstr "未知的錯誤"
+#: perllib/FixMyStreet/App/Controller/My.pm:200
#: perllib/FixMyStreet/App/Controller/Report.pm:112
#: perllib/FixMyStreet/App/Controller/Report.pm:118
#: perllib/FixMyStreet/App/Controller/Report.pm:121
msgid "Unknown problem ID"
msgstr "未知的問題編號  "
-#: templates/web/base/reports/_list-filters.html:10
+#: templates/web/base/reports/_list-filters.html:18
msgid "Unshortlisted"
msgstr ""
@@ -4324,12 +4464,12 @@ msgstr "下方更新 為匿名提供%s"
msgid "Update below added by %s at %s"
msgstr "由%d 在 %s 所提供的更新"
-#: templates/web/base/admin/body-form.html:140
-#: templates/web/zurich/admin/body-form.html:52
+#: templates/web/base/admin/body-form.html:139
+#: templates/web/zurich/admin/body-form.html:51
msgid "Update body"
msgstr "更新內文"
-#: templates/web/base/admin/stats_by_state.html:21
+#: templates/web/base/admin/stats/state.html:21
msgid "Update breakdown by state"
msgstr "陳述目前的故障 "
@@ -4337,16 +4477,16 @@ msgstr "陳述目前的故障 "
msgid "Update by {{name}}"
msgstr "由{{name}}更新"
-#: templates/web/base/admin/update_edit.html:44
+#: templates/web/base/admin/update_edit.html:46
#: templates/web/zurich/admin/update_edit.html:25
msgid "Update changed problem state to %s"
msgstr "更新改變問題之陳述到%s "
-#: templates/web/base/admin/update_edit.html:46
+#: templates/web/base/admin/update_edit.html:48
msgid "Update marked problem as fixed"
msgstr "本問題已解決之更新標註"
-#: templates/web/base/admin/update_edit.html:48
+#: templates/web/base/admin/update_edit.html:50
msgid "Update reopened problem"
msgstr "更新重申報之問題 "
@@ -4360,20 +4500,20 @@ msgstr "更新之狀態"
msgid "Updated"
msgstr "已更新"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:249
+#: perllib/FixMyStreet/DB/Result/Comment.pm:260
#, fuzzy
msgid "Updated by <strong>%s</strong> (%s) at %s"
msgstr "由<strong>%s</strong> (%s) 在%s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:251
+#: perllib/FixMyStreet/DB/Result/Comment.pm:262
#, fuzzy
msgid "Updated by <strong>%s</strong> at %s"
msgstr "由<strong>%s</strong> 在%s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1262
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1326
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1489
-#: perllib/FixMyStreet/App/Controller/Admin.pm:910
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1299
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1398
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1591
+#: perllib/FixMyStreet/App/Controller/Admin.pm:933
#: perllib/FixMyStreet/Cobrand/Zurich.pm:767
#: perllib/FixMyStreet/Cobrand/Zurich.pm:792
#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
@@ -4381,7 +4521,7 @@ msgid "Updated!"
msgstr "已更新!"
#: templates/web/base/admin/list_updates.html:2
-#: templates/web/base/report/update.html:5
+#: templates/web/base/report/update.html:3
#: templates/web/zurich/report/updates.html:2
msgid "Updates"
msgstr "更新"
@@ -4428,40 +4568,81 @@ msgstr "已用過之地圖"
msgid "User ID to attribute fetched comments to"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1745
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1755
+#, fuzzy
+msgid "User added to abuse list"
+msgstr "電子郵件列入濫發名單"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1473
+msgid "User already exists"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1742
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1752
+#, fuzzy
+msgid "User already in abuse list"
+msgstr "電子郵件己在濫發名單"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1834
msgid "User flag removed"
msgstr "移除用戶的標記警告"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1777
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
msgid "User flagged"
msgstr "給用戶標記警告"
-#: templates/web/base/dashboard/index.html:54
-#: templates/web/base/dashboard/index.html:58
-msgid "User has marked as fixed"
-msgstr ""
+#: templates/web/base/admin/report_blocks.html:18
+#: templates/web/base/admin/user-form.html:38
+#: templates/web/base/admin/users.html:32
+#, fuzzy
+msgid "User in abuse table"
+msgstr "濫用表格?"
#: templates/web/base/admin/users.html:5
msgid "User search finds matches in users' names and email addresses."
msgstr "用戶找到相符的名稱與電子郵件"
-#: perllib/FixMyStreet/Cobrand/Default.pm:669
-#: perllib/FixMyStreet/Cobrand/Default.pm:728
+#: templates/web/base/admin/report_edit.html:129
+#: templates/web/base/admin/update_edit.html:36
+#, fuzzy
+msgid "User:"
+msgstr "使用者"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:652
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
#: perllib/FixMyStreet/Cobrand/Zurich.pm:403
-#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61
+#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55
msgid "Users"
msgstr "使用者"
-#: templates/web/base/admin/user-form.html:141
+#: templates/web/base/admin/user-form.html:159
msgid "Users can perform the following actions within their assigned body or area."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:381
-#: perllib/FixMyStreet/App/Controller/Admin.pm:417
-#: perllib/FixMyStreet/App/Controller/Admin.pm:439
+#: perllib/FixMyStreet/App/Controller/Admin.pm:349
+#: perllib/FixMyStreet/App/Controller/Admin.pm:385
+#: perllib/FixMyStreet/App/Controller/Admin.pm:407
msgid "Values updated"
msgstr "數值更新"
+#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55
+msgid "Verify"
+msgstr ""
+
+#: templates/web/base/auth/change_email.html:1
+#: templates/web/base/auth/change_email.html:5
+#, fuzzy
+msgid "Verify email address"
+msgstr "您的電子郵件"
+
+#: templates/web/base/auth/change_phone.html:1
+#: templates/web/base/auth/change_phone.html:5
+#, fuzzy
+msgid "Verify phone number"
+msgstr "電話號碼"
+
#: templates/web/base/admin/report_edit.html:35
#: templates/web/base/admin/update_edit.html:18
#: templates/web/zurich/admin/report_edit-sdm.html:23
@@ -4483,12 +4664,7 @@ msgstr "檢視地區"
msgid "Viewing a problem"
msgstr "檢視問題 "
-#. ("Week to date")
-#: templates/web/base/dashboard/index.html:48
-msgid "WTD"
-msgstr ""
-
-#: templates/web/base/dashboard/index.html:20
+#: templates/web/base/dashboard/index.html:29
msgid "Ward:"
msgstr ""
@@ -4498,20 +4674,25 @@ msgstr "地方政府轄下的里/區"
#: templates/web/base/alert/choose.html:6
#: templates/web/base/around/_error_multiple.html:6
-msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
-msgstr "本區域我們找到更多符合的資料,我們最多顯示十筆資料。如果你無法在其中找到所要的資訊,請嘗試其它搜尋方式。"
+#, fuzzy
+msgid "We found more than one match for that location."
+msgstr "抱歉,我們無法找到此位置"
-#: templates/web/base/around/lookup_by_ref.html:5
+#: templates/web/base/around/lookup_by_ref.html:6
msgid "We found more than one match for that problem reference:"
msgstr ""
+#: templates/web/base/auth/smsform.html:20
+msgid "We have sent a confirmation code to your phone. Please enter it below:"
+msgstr ""
+
#: templates/web/base/auth/general.html:8
#: templates/web/base/report/display.html:35
#: templates/web/base/report/new/oauth_email_form.html:5
msgid "We need your email address, please give it below."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:208
+#: perllib/FixMyStreet/Script/Reports.pm:207
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "我們理解此問題可能是%s之責任,然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊,請告訴我們。"
@@ -4519,6 +4700,12 @@ msgstr "我們理解此問題可能是%s之責任,然而目前我們並無他
msgid "We send it to the council on your behalf"
msgstr "我們將代表您將此呈報給地方政府"
+#: templates/web/base/alert/choose.html:12
+#: templates/web/base/around/_error_multiple.html:12
+#, fuzzy
+msgid "We show up to ten matches, please try a different search if yours is not here."
+msgstr "本區域我們找到更多符合的資料,我們最多顯示十筆資料。如果你無法在其中找到所要的資訊,請嘗試其它搜尋方式。"
+
#: templates/web/base/report/new/notes.html:4
#: templates/web/zurich/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
@@ -4528,8 +4715,8 @@ msgstr "您的個人資料,將會依照<a href=\"/privacy\">本站隱私權政
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr "很遺憾該問題仍未修復。何不試試聯絡當地議員民代反應此狀況?"
-#: templates/web/base/dashboard/index.html:48
-msgid "Week To Date"
+#: templates/web/base/dashboard/index.html:117
+msgid "Website"
msgstr ""
#: templates/web/base/contact/submit.html:7
@@ -4557,7 +4744,7 @@ msgstr ""
msgid "Which problems do you want alerts about?"
msgstr ""
-#: templates/web/base/report/_inspect.html:99
+#: templates/web/base/report/_inspect.html:105
msgid "Which report is it a duplicate of?"
msgstr ""
@@ -4580,6 +4767,10 @@ msgstr "願望"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "搜尋要求,也可能限制單一機構中搜尋相關權責單位。其搜尋字眼為 <a href=\"%s\">MaPit</a>提供的主管ID."
+#: templates/web/base/dashboard/index.html:158
+msgid "Within the specified timeframe:"
+msgstr ""
+
#: templates/web/base/front/footer-marketing.html:3
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>."
msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼,可從 <a href=\"http://fixmystreet.org\">fixmystreet.org</a>官網進一步了解 "
@@ -4596,16 +4787,7 @@ msgstr "請注意留言內容,勿用注音文並應加上標點符號以利閱
msgid "Wrong location? Just click again on the map."
msgstr "錯誤的地? 請再次點擊此地圖"
-#. ("Year to date")
-#: templates/web/base/dashboard/index.html:51
-msgid "YTD"
-msgstr ""
-
-#: templates/web/base/admin/stats.html:10
-msgid "Year"
-msgstr "年份"
-
-#: perllib/FixMyStreet/Cobrand/Default.pm:1236
+#: perllib/FixMyStreet/Cobrand/Default.pm:1221
#: templates/web/base/admin/bodies.html:70
#: templates/web/base/admin/category_edit.html:5
#: templates/web/base/admin/flagged.html:47
@@ -4620,7 +4802,7 @@ msgstr "年份"
#: templates/web/base/questionnaire/creator_fixed.html:14
#: templates/web/base/questionnaire/index.html:104
#: templates/web/base/questionnaire/index.html:53
-#: templates/web/base/report/_inspect.html:90
+#: templates/web/base/report/_inspect.html:96
msgid "Yes"
msgstr "是"
@@ -4633,7 +4815,7 @@ msgstr "我有密碼"
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr "你申訴此問題遭不必要之和諧 "
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:77
msgid "You are offline"
msgstr ""
@@ -4650,7 +4832,7 @@ msgstr "您檢舉下列問題之更為濫用,包括個人資料或相似"
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>."
-#: templates/web/base/admin/user-form.html:96
+#: templates/web/base/admin/user-form.html:114
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr "您可以新增某位用戶到濫用者名單,它會自動隱藏(不會送出)該名用戶所提交的申報 "
@@ -4679,7 +4861,7 @@ msgstr ""
msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件,把此資訊提供給我們<a href='mailto:%s'>%s</a>."
-#: templates/web/base/admin/body-form.html:93
+#: templates/web/base/admin/body-form.html:92
msgid "You can mark a body as deleted if you do not want it to be active on the site."
msgstr "您可以刪除某一單位如果不想讓它在本站激活"
@@ -4687,7 +4869,7 @@ msgstr "您可以刪除某一單位如果不想讓它在本站激活"
msgid "You declined; please fill in the box above"
msgstr "您受到拒絕,請填寫上方表格。"
-#: templates/web/base/js/translation_strings.html:75
+#: templates/web/base/js/translation_strings.html:79
msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
msgstr ""
@@ -4714,18 +4896,38 @@ 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 "您在地圖上用綠色標註問題之地點。如果此不是正確地點,請再次點擊原地圖。"
-#: templates/web/base/auth/change_email.html:6
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125
+#, fuzzy
+msgid "You have successfully added your phone number."
+msgstr "您已成功地確認電子郵件"
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "您已成功地確認電子郵件"
+#: templates/web/base/auth/change_phone.html:15
+#, fuzzy
+msgid "You have successfully confirmed your phone number."
+msgstr "您已成功地確認電子郵件"
+
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112
+#, fuzzy
+msgid "You have successfully removed your phone number."
+msgstr "您已成功地確認電子郵件"
+
#: templates/web/base/report/display.html:25
#: templates/web/base/report/new/login_success_form.html:3
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "您已成功登入,請檢查您的個人資訊是否正確:"
-#: templates/web/base/my/my.html:31
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147
+#, fuzzy
+msgid "You have successfully verified your phone number."
+msgstr "您已成功地確認電子郵件"
+
+#: templates/web/base/my/my.html:73
msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
msgstr "您當未創建任何申報,<a href=\"%s\">立即提供申報</a>"
@@ -4752,36 +4954,43 @@ msgid "Your Reports"
msgstr "您的申報 "
#: templates/web/base/auth/change_password.html:11
+#: templates/web/base/auth/generate_token.html:15
#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
msgid "Your account"
msgstr ""
#: templates/web/base/alert/updates.html:19
#: templates/web/base/alert/updates.html:22
+#: templates/web/base/auth/general.html:44
#: templates/web/base/contact/index.html:80
#: templates/web/base/report/display_tools.html:46
#: templates/web/base/report/display_tools.html:49
-#: templates/web/base/report/new/form_user_loggedout_email.html:1
-#: templates/web/base/report/update/form_user_loggedout_email.html:1
+#: templates/web/base/report/new/form_user_loggedout_email.html:6
+#: templates/web/base/report/update/form_user_loggedout_email.html:6
#: templates/web/zurich/report/new/fill_in_details_form.html:53
msgid "Your email"
msgstr "您的電子郵件"
-#: templates/web/base/auth/change_email.html:9
-#: templates/web/base/auth/general.html:57
-#: templates/web/base/report/update/form_user_loggedout_email.html:5
+#: templates/web/base/auth/change_email.html:15
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
msgstr "您的電子郵件"
+#: templates/web/base/auth/general.html:42
+#: templates/web/base/report/new/form_user_loggedout_email.html:2
+#: templates/web/base/report/update/form_user_loggedout_email.html:2
+#, fuzzy
+msgid "Your email or mobile"
+msgstr "您的電子郵件"
+
#: templates/web/base/report/updates-sidebar-notes.html:3
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "您的個人資料,將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用"
-#: templates/web/base/auth/general.html:109
+#: templates/web/base/auth/general.html:114
#: templates/web/base/contact/index.html:74
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:17
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:21
#: templates/web/base/report/update/form_name.html:33
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:63
@@ -4792,19 +5001,19 @@ 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:264
+#: perllib/FixMyStreet/App/Controller/My.pm:272
msgid "Your name has been hidden from all your reports and updates."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/My.pm:260
+#: perllib/FixMyStreet/App/Controller/My.pm:268
msgid "Your name has been hidden."
msgstr ""
-#: templates/web/base/js/translation_strings.html:65
+#: templates/web/base/js/translation_strings.html:69
msgid "Your offline reports"
msgstr ""
-#: templates/web/base/auth/general.html:87
+#: templates/web/base/auth/general.html:84
#: templates/web/base/report/new/form_user_loggedout_password.html:10
#: templates/web/base/report/update/form_user_loggedout_password.html:9
#: templates/web/zurich/auth/general.html:34
@@ -4815,8 +5024,8 @@ msgstr "密碼"
msgid "Your password has been changed"
msgstr "密碼已更新"
+#: templates/web/base/auth/change_phone.html:19
#: templates/web/base/contact/index.html:87
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:26
#: templates/web/zurich/report/new/fill_in_details_form.html:69
msgid "Your phone number"
msgstr "電話號碼"
@@ -4825,7 +5034,7 @@ msgstr "電話號碼"
msgid "Your report"
msgstr ""
-#: templates/web/base/my/my.html:28
+#: templates/web/base/my/my.html:70
msgid "Your reports"
msgstr "你作的申報"
@@ -4834,25 +5043,40 @@ msgstr "你作的申報"
msgid "Your shortlist"
msgstr ""
-#: templates/web/base/js/translation_strings.html:66
+#: templates/web/base/auth/generate_token.html:8
+#, fuzzy
+msgid "Your token has been generated"
+msgstr "密碼已更新"
+
+#: templates/web/base/js/translation_strings.html:70
msgid "Your update has been saved offline for submission when back online."
msgstr ""
-#: templates/web/base/my/my.html:51
+#: templates/web/base/my/my.html:93
msgid "Your updates"
msgstr "更新"
+#: perllib/FixMyStreet/SMS.pm:46
+msgid "Your verification code is %s"
+msgstr ""
+
#: templates/web/base/report/new/form_user_loggedin.html:19
#: templates/web/base/report/update/form_name.html:12
msgid "Yourself"
msgstr ""
#: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:151
+#: templates/web/base/admin/user-form.html:169
msgid "all"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:259
+#: perllib/FixMyStreet/App/Controller/Admin.pm:909
+#: perllib/FixMyStreet/App/Controller/Moderate.pm:85
+#: perllib/FixMyStreet/DB/Result/Comment.pm:236
+msgid "an administrator"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:270
msgid "and a defect raised"
msgstr ""
@@ -4869,8 +5093,8 @@ msgstr "地方政府"
msgid "didn't use map"
msgstr "不使用地圖"
-#: templates/web/base/alert/index.html:33
-#: templates/web/base/around/postcode_form.html:12
+#: templates/web/base/alert/index.html:34
+#: templates/web/base/around/postcode_form.html:14
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "例如 ‘%s’ 或 ‘%s’"
@@ -4893,23 +5117,24 @@ msgstr "%s上回更新:"
msgid "less than a minute"
msgstr "少於一分鐘"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:119
-#: templates/web/base/admin/questionnaire.html:15
-#: templates/web/base/admin/questionnaire.html:16
+#: perllib/FixMyStreet/App/Controller/Admin.pm:120
+#: templates/web/base/admin/stats/questionnaire.html:15
+#: templates/web/base/admin/stats/questionnaire.html:16
msgid "n/a"
msgstr "不適用"
#: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:152
+#: templates/web/base/admin/user-form.html:170
msgid "none"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:278
+#: perllib/FixMyStreet/DB/ResultSet/State.pm:77
#, fuzzy
msgid "not the council's responsibility"
msgstr "標註為非本區政府職責範圍"
-#: templates/web/base/js/translation_strings.html:27
+#: templates/web/base/alert/index.html:38
+#: templates/web/base/around/postcode_form.html:26
msgid "or locate me automatically"
msgstr "自動辨識我所在位置 "
@@ -4950,7 +5175,7 @@ msgstr "地圖上無標記,用戶未使用地圖"
msgid "this location"
msgstr "檢視地區"
-#: perllib/FixMyStreet/Script/Reports.pm:184
+#: perllib/FixMyStreet/Script/Reports.pm:183
msgid "this type of local problem"
msgstr "此類在地問題"
@@ -4958,11 +5183,11 @@ msgstr "此類在地問題"
msgid "today"
msgstr "今天"
-#: templates/web/base/js/translation_strings.html:76
+#: templates/web/base/js/translation_strings.html:80
msgid "update"
msgstr ""
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:81
msgid "updates"
msgstr ""
@@ -4970,14 +5195,24 @@ msgstr ""
msgid "used map"
msgstr "已用過之地圖"
-#: templates/web/base/admin/update_edit.html:37
+#: templates/web/base/admin/update_edit.html:39
msgid "user is from same council as problem - %d"
msgstr "用戶來同一問題的地方政府- %d"
-#: templates/web/base/admin/update_edit.html:40
+#: templates/web/base/admin/update_edit.html:42
msgid "user is problem owner"
msgstr "%d 天數"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1778
+#, fuzzy
+msgid "user not in abuse list"
+msgstr "電子郵件己在濫發名單"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1776
+#, fuzzy
+msgid "user removed from abuse list"
+msgstr "電子郵件列入濫發名單"
+
#: templates/web/base/reports/body.html:0
#: templates/web/base/reports/body.html:3
msgid "ward"
@@ -5031,31 +5266,31 @@ msgid "%d year"
msgid_plural "%d years"
msgstr[0] ""
-#: templates/web/base/reports/index.html:92
+#: templates/web/fixmystreet.com/reports/summary.html:103
#, perl-format
msgid "%s day"
msgid_plural "%s days"
msgstr[0] ""
-#: templates/web/base/reports/index.html:55
+#: templates/web/base/reports/index.html:57
#, perl-format
msgid "%s problem marked as fixed"
msgid_plural "%s problems marked as fixed"
msgstr[0] ""
-#: templates/web/base/reports/index.html:43
+#: templates/web/base/reports/index.html:45
#, perl-format
msgid "%s problem reported"
msgid_plural "%s problems reported"
msgstr[0] ""
-#: templates/web/base/reports/index.html:107
+#: templates/web/fixmystreet.com/reports/summary.html:119
#, perl-format
msgid "%s report"
msgid_plural "%s reports"
msgstr[0] ""
-#: templates/web/base/reports/index.html:49
+#: templates/web/base/reports/index.html:51
#, perl-format
msgid "%s update on problems"
msgid_plural "%s updates on problems"
@@ -5115,6 +5350,45 @@ msgid "report"
msgid_plural "reports"
msgstr[0] ""
+#~ msgid "(Email in abuse table)"
+#~ msgstr "電郵為濫發信件"
+
+#~ msgid "By Date"
+#~ msgstr "日期"
+
+#~ msgid "Click here or enter as dd/mm/yyyy"
+#~ msgstr "點選此處或輸入日期/月份/年份"
+
+#~ msgid "Confirmed reports between %s and %s"
+#~ msgstr "%s 與 %s 之間已確認的申報"
+
+#~ msgid "Hide old"
+#~ msgstr "隱藏舊文"
+
+#~ msgid "Include unconfirmed reports"
+#~ msgstr "包括未確認的申報 "
+
+#~ msgid "Invalid end date"
+#~ msgstr "無效的結束日期"
+
+#~ msgid "Invalid start date"
+#~ msgstr "無效的開始日期"
+
+#~ msgid "No council"
+#~ msgstr "無地方政府"
+
+#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+#~ msgstr "請注意這裏包括了本月份總結撰寫前,尚未確認的申報,所以數目可能稍有降低。"
+
+#~ msgid "Show old"
+#~ msgstr "顯示舊文"
+
+#~ msgid "Unfixed reports"
+#~ msgstr "未處理之申報 "
+
+#~ msgid "Year"
+#~ msgstr "年份"
+
#~ msgid ""
#~ "%s sends different categories of problem\n"
#~ "to the appropriate council, so problems within the boundary of a particular council\n"
@@ -5171,9 +5445,6 @@ msgstr[0] ""
#~ msgid "No further action"
#~ msgstr "無法修復"
-#~ msgid "Not Responsible"
-#~ msgstr "無責任歸屬"
-
#~ msgid "Or problems reported to:"
#~ msgstr "或將此問題 申報給:"