diff options
Diffstat (limited to 'locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po')
| -rw-r--r-- | locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po | 1005 |
1 files changed, 551 insertions, 454 deletions
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 6d200d661..faf7fbaaf 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: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+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,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr "與" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -164,7 +164,7 @@ msgstr "" msgid "(not sent to council)" msgstr "不要向地方政府送出" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(任選)" @@ -184,9 +184,9 @@ msgstr "兩個都送出" msgid "(we also have RSS feeds for problems within %s)" msgstr "在 %s 內之問題RSS 訂閱" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "選擇分類" @@ -222,7 +222,7 @@ msgstr "" 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:92 +#: templates/web/base/js/translation_strings.html:95 msgid "<span>%s</span> saved." msgstr "" @@ -231,34 +231,24 @@ msgstr "" msgid "<strong>%s</strong> live problems" msgstr "<strong>%s</strong> 現場問題" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>不</strong> 我要利用電子郵件確認我的申報 " -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 #, 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 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>不</strong> 我要用電子郵件收到更新通知" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "<strong>不</strong> 我要用電子郵件收到更新通知" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "<strong>No</strong> let me sign in by email" -msgstr "<strong>不</strong> 我要用電子郵件登入" - -#: templates/web/base/auth/general.html:110 -#, fuzzy -msgid "<strong>No</strong> let me sign in by email or text" -msgstr "<strong>不</strong> 我要用電子郵件登入" - #: templates/web/base/report/_inspect.html:197 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -267,12 +257,15 @@ msgstr "" 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:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "申報問題" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -339,9 +332,9 @@ msgstr "(沒有電話號碼)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -351,16 +344,15 @@ msgstr "" msgid "Add user" msgstr "新增使用者" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -368,7 +360,7 @@ msgstr "" msgid "Added %s" msgstr "新增 %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -388,7 +380,8 @@ msgstr "%s創建之 %d通知, 種類 %s, 參數 %s / %s" msgid "Alert %d disabled (created %s)" msgstr "%d 關閉通知 " -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "通知我此事後續" @@ -456,34 +449,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "本問題已解決之更新標註" -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "匿名" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "匿名" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "匿名:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -520,7 +515,7 @@ msgstr "分派給外部機：" msgid "Assign to subdivision:" msgstr "交派給下級單位：" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -554,6 +549,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -566,12 +565,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "待核可" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "回上層" @@ -585,10 +584,8 @@ msgid "Ban user" msgstr "標記警告用戶" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -625,7 +622,6 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "無法顯示地圖？ <em>略過本步驟</em>" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -658,7 +654,7 @@ msgstr "類別" msgid "Category and State" msgstr "類別" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -668,6 +664,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -728,7 +725,7 @@ msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -757,6 +754,10 @@ msgstr "選擇確認電子郵件上的連結以作登入" msgid "Click the link in that email to sign in." msgstr "選擇確認電子郵件上的連結以作登入" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -769,7 +770,7 @@ msgstr "選擇確認電子郵件上的連結以作登入" msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "由地方政府關閉" @@ -799,18 +800,17 @@ msgid "Cobrand:" msgstr "聯合品牌:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "設定" @@ -824,8 +824,7 @@ msgstr "確認" msgid "Confirm account" msgstr "確認帳戶" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -844,7 +843,7 @@ msgstr "確認" msgid "Confirmed" msgstr "已確認" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -855,16 +854,20 @@ msgstr "已確認：" msgid "Contact %s" msgstr "聯絡 %s" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "連絡我們" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "連結本團隊" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -874,12 +877,12 @@ msgstr "" msgid "Coordinates:" msgstr "協同單位:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "找不到該戶用" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "找不到此地點" @@ -915,6 +918,11 @@ msgstr "建立" msgid "Create a report" msgstr "創建申報" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "登入或新建帳戶" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -924,18 +932,15 @@ msgstr "創建類別" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -953,7 +958,7 @@ msgstr "建立" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -979,7 +984,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "目前未創建內文" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "無法聨絡上的客戶" @@ -1007,6 +1012,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -1016,7 +1025,7 @@ msgstr "" msgid "Delete" msgstr "刪除" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -1028,8 +1037,8 @@ msgstr "刪除模版" msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1045,17 +1054,18 @@ msgstr "描述" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "細節" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1087,8 +1097,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1097,11 +1107,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: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:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "您是否有 %s密碼？ " @@ -1113,7 +1119,7 @@ msgstr "" msgid "Don’t know" msgstr "不知道" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "不喜歡此表單？" @@ -1121,7 +1127,7 @@ msgstr "不喜歡此表單？" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" @@ -1165,34 +1171,36 @@ msgstr "編輯" msgid "Edit body details" msgstr "編輯有關單位細節" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "編輯有關單位細節" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "編輯有關單位細節" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "更新" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1225,20 +1233,20 @@ msgstr "編輯器" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "電子郵件" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: 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 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "密碼(任選):" @@ -1251,6 +1259,15 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "取消電郵通知" +#: templates/web/base/auth/general.html:99 +#, fuzzy +msgid "Email me a link or text me a code to sign in" +msgstr "選擇確認電子郵件上的連結以作登入" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1337,11 +1354,6 @@ msgstr "輸入街道名稱 " msgid "Enter a nearby UK postcode, or street name and area" msgstr "輸入本區的郵編，街名或區域。" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "輸入本區的郵編，街名或區域。" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1392,11 +1404,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1439,6 +1451,8 @@ msgstr "其它資料：" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "其它資料：" @@ -1461,6 +1475,11 @@ msgstr "無法送出留言" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1538,17 +1557,22 @@ msgstr "" msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "更多資訊，請詳見<a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>（英文）" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "密碼" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "忘記您的密碼?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "轉寄給外部機構" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "轉寄願望給外部機構" @@ -1606,7 +1630,7 @@ msgstr "走" msgid "Going to send questionnaire?" msgstr "即將送出問卷？" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1674,7 +1698,7 @@ msgstr "隱藏" msgid "Hide all reports and updates" msgstr "標記警告申報與用戶" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1697,11 +1721,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "隱藏地圖標示" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1726,7 +1750,7 @@ msgstr "首頁" msgid "How to report a problem" msgstr "如何申報問題 " -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "如何成功地送出申報" @@ -1791,7 +1815,7 @@ msgstr "" "\n" "如果你想這樣，請確保你在有關單位中使用同一類別。" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1918,7 +1942,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1938,8 +1962,8 @@ msgstr "無效的權責單位數值 %s" msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1951,13 +1975,6 @@ msgstr "最快方式是 <a href=\"%s\">先查看問答集</a> ，看看答案是 msgid "It’s on its way to the council right now." msgstr "正呈送給地方政府中" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "新增類別承辦人" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1997,6 +2014,7 @@ msgstr "上回更新:" msgid "Last update:" msgstr "上一次更新:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -2023,7 +2041,7 @@ msgstr "列出所有申報的問題 " msgid "Loading reports…" msgstr "完結之申報 " -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "載入中...." @@ -2049,23 +2067,22 @@ msgstr "當地問題 " msgid "Locate the problem on a map of the area" msgstr "在地圖上標記問題之區域" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2077,7 +2094,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "地圖" @@ -2085,7 +2102,7 @@ msgstr "地圖" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2093,7 +2110,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "地圖" @@ -2105,11 +2122,11 @@ msgstr "標註為關閉" msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>." -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "留言" @@ -2129,24 +2146,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2155,6 +2173,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "一個工作天內協調出部門" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2180,9 +2203,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "名字" @@ -2195,6 +2218,12 @@ msgstr "名字" msgid "Name:" msgstr "名字：" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +#, fuzzy +msgid "Names are limited to %d characters in length." +msgstr "更新內容有 %s 字數限制，請簡化您的更新。" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2264,6 +2293,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2350,11 +2381,18 @@ msgstr "" msgid "Next" msgstr "下一步" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "下一步" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/category_edit.html:4 -#: templates/web/base/admin/list_updates.html:32 -#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2367,6 +2405,11 @@ msgstr "下一步" msgid "No" msgstr "無" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "確認帳戶" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2375,7 +2418,7 @@ msgstr "" msgid "No body" msgstr "無有關單位" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "未選擇地方政府" @@ -2408,7 +2451,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "查無結果" @@ -2486,16 +2529,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "現在送出您的申報 …" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "現在送出您更新的申報 … 您是否有本站帳密？" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2504,15 +2537,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "好了" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2564,6 +2597,14 @@ msgstr "Open311 規範 " msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or <a href=\"/\">search for a different location</a>" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2572,15 +2613,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2617,15 +2658,13 @@ msgstr "上級 " msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "密碼(任選):" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "永久連結" @@ -2644,16 +2683,22 @@ 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/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "電話號碼" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "電話號碼(非必填)" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +#, fuzzy +msgid "Phone numbers are limited to %s characters in length." +msgstr "申請內容有 %s 字數限制，請簡化您的申報。" + #: templates/web/base/admin/user-form.html:29 #, fuzzy msgid "Phone verified:" @@ -2665,12 +2710,14 @@ msgstr "已申報 %s" msgid "Phone:" msgstr "電話" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2684,7 +2731,7 @@ msgstr "電話" msgid "Photo" msgstr "照片" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "要求提供照片" @@ -2692,12 +2739,12 @@ msgstr "要求提供照片" msgid "Photo required" msgstr "要求提供照片" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2718,7 +2765,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "在地圖上作標記" @@ -2738,7 +2785,7 @@ msgstr "請再次確認您的密碼" msgid "Please check your email address is correct" msgstr "請確認您電郵地址無誤" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2748,15 +2795,15 @@ msgid "Please check your phone number is correct" msgstr "請確認您電郵地址無誤" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "請選擇類別" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2781,12 +2828,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見 " #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2795,8 +2842,8 @@ msgstr "請寫下您的留言" msgid "Please enter a mobile number" msgstr "請輸入您的電話號碼" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2806,22 +2853,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "請輸入密碼" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "請輸入有效電子郵件" @@ -2830,14 +2877,14 @@ msgstr "請輸入有效電子郵件" msgid "Please enter a valid email address" msgstr "請輸入有效的電子郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, 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:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "請填寫進一步細節" @@ -2847,39 +2894,39 @@ msgstr "請填寫進一步細節" #: 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:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "請輸入您的電子郵件" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "請輸入您的大名" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 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:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "請輸入您的姓氐" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "請輸入您的電話號碼" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "請輸入您的別名" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "請輸入您的稱呼" @@ -2906,8 +2953,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "請選擇您是否願意收到其它問卷" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2919,7 +2966,7 @@ msgstr "請注意這個更新不會送到地方政府" msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "請注意您的申報還<strong>未送出</strong>. 選擇合適類別及進一步資訊，再予送出。" @@ -2933,12 +2980,12 @@ msgstr "" msgid "Please note:" msgstr "請加註記" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "如果您是再次申報，請說明原因" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2971,15 +3018,15 @@ msgstr "請選擇更新通知方式" msgid "Please state whether or not the problem has been fixed" msgstr "請敍明該問題是否已解決" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2987,9 +3034,7 @@ msgstr "" msgid "Please write a message" msgstr "諘寫下您的留言" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "張貼" @@ -2998,19 +3043,19 @@ msgstr "張貼" msgid "Postcode or street name and area" msgstr "輸入本區的郵編，街名或區域。" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "匿名張貼 %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "由 %s 在 %s 張貼" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "由<strong>%s</strong> (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by <strong>%s</strong> at %s" msgstr "由<strong>%s</strong> 在%s" @@ -3045,14 +3090,10 @@ msgstr "隱私與cookies" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "私人" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "問題" @@ -3075,7 +3116,7 @@ msgstr "%s 問題已送達到地方政府 %s " msgid "Problem breakdown by state" msgstr "本站出現故障問題 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "問題標註為開放" @@ -3084,7 +3125,6 @@ msgid "Problem state change based on survey results" msgstr "依調查結果呈現的問題改善" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "問題" @@ -3111,7 +3151,7 @@ msgstr "FixMyStreet 最近回報的已修復問題 " msgid "Problems within %.1fkm of %s" msgstr "該地點 %.1f公里內的問題 " -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3137,26 +3177,26 @@ msgstr "在 %s, %s的問題 " msgid "Property address:" msgstr "公物地址：" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "提供更新資訊" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -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/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3225,7 +3265,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3250,7 +3290,7 @@ msgstr "最近當地問題更新的RSS訂閱" msgid "Receive email when updates are left on this problem." msgstr "透過電子郵件收取該問題之更新消息" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3297,9 +3337,9 @@ msgstr "移除標記" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3331,14 +3371,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "申報問題" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3349,14 +3389,14 @@ msgstr "申報問題" msgid "Report abuse" msgstr "申報濫用" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "申報問題" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3384,8 +3424,8 @@ msgstr "申報，檢視，或討論在地問題" msgid "Report, view, or discuss local problems" msgstr "申報，檢視，或討論在地問題" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "在%s 匿名申報 " @@ -3394,8 +3434,8 @@ msgstr "在%s 匿名申報 " msgid "Reported before" msgstr "之前的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "由%s 的 %s 申報" @@ -3404,31 +3444,31 @@ msgstr "由%s 的 %s 申報" msgid "Reported by:" msgstr "由 申報" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "%s 種類之申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿名申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "%s 透過 %s 在 %s類別的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 msgid "Reported via %s in the %s category anonymously at %s" msgstr "透過 %s 在 %s類別的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " @@ -3439,7 +3479,7 @@ msgstr "已申報 %s" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3448,17 +3488,23 @@ msgstr "申報問題" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "申報" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "申請內容有 %s 字數限制，請簡化您的申報。" +#: templates/web/base/js/translation_strings.html:10 +#, fuzzy +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "申請內容有 %s 字數限制，請簡化您的申報。" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "待核實之申報" @@ -3480,7 +3526,7 @@ msgstr "" msgid "Reports published" msgstr "己公開之申報" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3543,20 +3589,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "%s的回應模版" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "正確地點？" @@ -3568,15 +3614,15 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "左轉 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3587,7 +3633,7 @@ msgstr "右轉 " msgid "Rotating this photo will discard unsaved changes to the report." msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "衛星" @@ -3601,8 +3647,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3617,7 +3663,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3657,13 +3703,12 @@ msgstr "查無此用戶" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3694,7 +3739,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3711,11 +3756,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "送回申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "%s 稍後送給%s" @@ -3748,9 +3793,9 @@ msgid "Share" msgstr "分享" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3758,19 +3803,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3782,7 +3827,7 @@ msgstr "" msgid "Show my name publicly" msgstr "公開我的姓名" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3796,17 +3841,17 @@ msgstr "顯示舊文" msgid "Show older reports" msgstr "搜尋申報" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3814,20 +3859,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "登入" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 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:98 +#: templates/web/base/auth/create.html:20 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 "" @@ -3836,6 +3881,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "登入或新建帳戶" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "請輸入密碼" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3882,15 +3932,15 @@ msgstr "抱歉這個wasn’t 為有效的網址連結" msgid "Sorry, there has been an error confirming your problem." msgstr "抱歉無法確認你的問題" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "抱歉，我們無法找到此位置" -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3900,7 +3950,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "抱歉，我們無法解析此地點，請重試一次" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "抱歉，我們無法儲存你的照片，請重試一次" @@ -3944,13 +3994,13 @@ msgstr "問始日：" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "陳述" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3970,15 +4020,14 @@ msgid "State:" msgstr "陳述:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "陳述" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -4008,7 +4057,7 @@ msgstr "街景圖" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "子類別：%s" @@ -4017,21 +4066,22 @@ msgstr "子類別：%s" msgid "Subdivision/Body" msgstr "下屬單位/機關" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "主旨" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "主旨:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "送出" @@ -4083,8 +4133,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4119,18 +4168,22 @@ msgstr "" msgid "Survey Results" msgstr "調查結果" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "模版 «%s»" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "模版" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "內文" @@ -4141,6 +4194,7 @@ msgstr "文字版" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4174,7 +4228,7 @@ msgstr "感謝上傳照片，現在需要知道問題的地點位置，請在上 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "謝謝，很高興知道此問題己修復了。請問您過去是否曾申報過問題？ " -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 " @@ -4188,7 +4242,6 @@ msgstr "這地點似乎不在台灣; 請再試 一次。" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "抱歉此郵遞區號無法辨識" @@ -4201,28 +4254,28 @@ msgstr "問題被標註為送出" msgid "That problem will now be resent." msgstr "此問題將重新送出" -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "此申報無法在 %s上檢視 " -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "該申報已遭FixMyStreet 移除 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "該申報已遭FixMyStreet 移除 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4372,7 +4425,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "用戶無法在地點上標示問題，但可以看到他們輸入的地點" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "該申報已遭FixMyStreet 移除 " @@ -4392,7 +4445,7 @@ msgstr "" msgid "There are no reports to show." msgstr "沒有申報可顯示" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4409,15 +4462,19 @@ msgstr "本頁出現錯誤，請再試一次" msgid "There was a problem with your email/password combination. Please try again." msgstr "您的電子郵件/密碼不符，請重試一次" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "您的申報有問題，請重試一次" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 #, 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 ‘No’ section of the form." msgstr "您的電子郵件與密碼不相符，如果您遺忘密碼或尚未註冊，請在申請表單上填入電子郵件" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "您的申報有問題，請重試一次" @@ -4425,10 +4482,19 @@ msgstr "您的申報有問題，請重試一次" msgid "There were problems with your report. Please see below." msgstr "您的申報有問題，請見下方說明" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "您的更新有問題，請見下方說明" +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4457,15 +4523,6 @@ msgstr "" msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "此API執行正在安裝中尚未完全，未來將作無預警的更動" @@ -4502,10 +4559,10 @@ msgstr "當用戶沒有選擇類別時，電子郵件將送到負責該區域的 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "電子郵件將送到負責該區域的多個地方政府，因選擇的類別提供這些對象。如果您不是負責受理機關，請略過。" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "本項資訊必填" @@ -4544,7 +4601,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "此問題尚待審核" @@ -4560,7 +4617,7 @@ msgstr "該申報目前注記為解決狀態" msgid "This report is currently marked as open." msgstr "該申報目前注記為開放狀態" -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "該申報目前注記為開放狀態" @@ -4577,7 +4634,6 @@ msgid "Time spent (in minutes):" msgstr "花費時間(以分鐘計):" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -4661,7 +4717,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4671,7 +4727,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "再試一次" @@ -4707,7 +4763,7 @@ msgstr "" msgid "Unconfirmed" msgstr "未確認的" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "未知的" @@ -4715,18 +4771,18 @@ msgstr "未知的" msgid "Unknown alert type" msgstr "未知的通知類別" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "未知的錯誤" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "未知的問題編號 " @@ -4745,7 +4801,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "更新" @@ -4753,11 +4809,11 @@ msgstr "更新" msgid "Update %s created for problem %d; by %s" msgstr "由%s 更新%s 申報之問題%s " -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "下方更新 為匿名提供%s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "由%d 在 %s 所提供的更新" @@ -4797,24 +4853,24 @@ msgstr "更新之狀態" msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "由<strong>%s</strong> (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "由<strong>%s</strong> 在%s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "已更新！" @@ -4825,7 +4881,7 @@ msgstr "已更新！" msgid "Updates" msgstr "更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "更新內容有 %s 字數限制，請簡化您的更新。" @@ -4880,28 +4936,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "電子郵件列入濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "電子郵件己在濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "移除用戶的標記警告" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "給用戶標記警告" @@ -4927,10 +4983,8 @@ msgid "User:" msgstr "使用者" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "使用者" @@ -4978,6 +5032,10 @@ msgstr "檢視里/區之申報 " msgid "View wards" msgstr "其它地區:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -5009,7 +5067,7 @@ msgstr "" 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/auth/general.html:13 #: 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." @@ -5071,7 +5129,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -5099,17 +5157,15 @@ msgstr "您是否願意4週後再收到另一份問卷？以提醒您確認最 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱讀。" -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "錯誤的地? 請再次點擊此地圖" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 -#: templates/web/base/admin/list_updates.html:32 -#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5123,11 +5179,11 @@ msgstr "錯誤的地? 請再次點擊此地圖" msgid "Yes" msgstr "是" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "你申訴此問題遭不必要之和諧 " -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5135,11 +5191,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題 " -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "您檢舉下列問題之更為濫用，包括個人資料或相似" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 #, fuzzy msgid "You can <a href=\"%s\">make a new report in the same location</a>." msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>." @@ -5157,7 +5213,7 @@ msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。" @@ -5182,11 +5238,11 @@ msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件，把 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "您可以刪除某一單位如果不想讓它在本站激活" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "您受到拒絕，請填寫上方表格。" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5194,7 +5250,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "您已回覆過本問卷。如果您有問題，請<href='%s'>保持聯絡</a>, 或是<a href='%s'>檢視 您作的申報</a>\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "在此申報中你已經附加了照片(注意你最多可附3張照片,如果你還想上傳更多張,原先的照片會被移除)" @@ -5279,11 +5335,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "您的電子郵件" @@ -5292,9 +5348,9 @@ msgstr "您的電子郵件" 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 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 #, fuzzy msgid "Your email or mobile" msgstr "您的電子郵件" @@ -5303,9 +5359,7 @@ msgstr "您的電子郵件" 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:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "姓名" @@ -5321,13 +5375,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "密碼" @@ -5336,15 +5390,15 @@ msgstr "密碼" msgid "Your password has been changed" msgstr "密碼已更新" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "電話號碼" @@ -5366,7 +5420,12 @@ msgstr "" msgid "Your token has been generated" msgstr "密碼已更新" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "更新" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5378,8 +5437,8 @@ msgstr "更新" 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 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5398,13 +5457,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5430,7 +5491,7 @@ msgstr "例如 ‘%s’ 或 ‘%s’" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5469,6 +5530,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "標註為非本區政府職責範圍" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or <a href=\"%s\">create an account</a>" +msgstr "登入或新建帳戶" + +#: templates/web/base/auth/create.html:13 +msgid "or <a href=\"%s\">sign in</a>" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5505,12 +5575,12 @@ msgstr "登出" msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "當地地府" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "地圖上無標記，用戶未使用地圖" @@ -5527,11 +5597,11 @@ msgstr "此類在地問題" msgid "today" msgstr "今天" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5547,12 +5617,12 @@ msgstr "用戶來同一問題的地方政府- %d" msgid "user is problem owner" msgstr "%d 天數" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "電子郵件己在濫發名單" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "電子郵件列入濫發名單" @@ -5700,8 +5770,35 @@ msgid "report" msgid_plural "reports" msgstr[0] "" -#~ msgid "Enter a password" -#~ msgstr "請輸入密碼" +#~ msgid "<strong>No</strong> let me sign in by email" +#~ msgstr "<strong>不</strong> 我要用電子郵件登入" + +#, fuzzy +#~ msgid "<strong>No</strong> let me sign in by email or text" +#~ msgstr "<strong>不</strong> 我要用電子郵件登入" + +#, fuzzy +#~ msgid "Edit other users' details" +#~ msgstr "編輯有關單位細節" + +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "輸入本區的郵編，街名或區域。" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "新增類別承辦人" + +#~ msgid "Now to submit your report…" +#~ msgstr "現在送出您的申報 …" + +#~ msgid "Now to submit your update…" +#~ msgstr "現在送出您更新的申報 … 您是否有本站帳密？" + +#~ 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 "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。 " + +#~ msgid "Wrong location? Just click again on the map." +#~ msgstr "錯誤的地? 請再次點擊此地圖" #~ msgid "Password:" #~ msgstr "密碼:" |