diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-02 10:23:30 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-02-02 16:32:41 +0000 |
| commit | 2fde5b1ee5df7f8a931908656a2563885adb141d (patch) | |
| tree | 24d6a1da81c39ee9bfda45511aeaf72982caec35 /locale/zh.UTF-8 | |
| parent | 63d4804973ae4bd26bf4af098f3ba57a14a0647f (diff) | |
Update translations with new source strings.
Diffstat (limited to 'locale/zh.UTF-8')
| -rw-r--r-- | locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po | 540 |
1 files changed, 306 insertions, 234 deletions
diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 6d7242b38..600c79006 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: 2016-11-08 11:39+0000\n" +"POT-Creation-Date: 2017-02-02 10:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2016\n" "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:639 +#: perllib/FixMyStreet/DB/Result/Problem.pm:648 #: perllib/FixMyStreet/Script/Reports.pm:199 msgid " and " msgstr "與" @@ -121,7 +121,7 @@ msgstr "%s 里/區, %s " msgid "%s, within %s ward" msgstr "%s, 在%s 里/區" -#: perllib/FixMyStreet/Map/OSM.pm:42 +#: perllib/FixMyStreet/Map/OSM.pm:38 msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者" @@ -129,7 +129,7 @@ msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap msgid "(Defect & location of defect)" msgstr "(缺陷 & 缺陷地點)" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 #: templates/web/base/admin/users.html:32 msgid "(Email in abuse table)" msgstr "電郵為濫發信件" @@ -153,12 +153,10 @@ msgstr "預設距離約涵蓋20萬人口" msgid "(alternatively the RSS feed can be customised, within %s)" msgstr "或可在 %s另外修改自定RSS訂閱" -#: templates/web/base/report/_item.html:27 #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(結束)" -#: templates/web/base/report/_item.html:25 #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(己處理)" @@ -167,7 +165,7 @@ msgstr "(己處理)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:60 msgid "(not sent to council)" msgstr "不要向地方政府送出" @@ -175,21 +173,21 @@ msgstr "不要向地方政府送出" msgid "(optional)" msgstr "(任選)" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:59 msgid "(sent to both)" msgstr "兩個都送出" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:231 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:650 -#: perllib/FixMyStreet/DB/Result/Problem.pm:438 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:239 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/DB/Result/Problem.pm:439 msgid "-- Pick a category --" msgstr "選擇分類" -#: perllib/FixMyStreet/DB/Result/Problem.pm:444 +#: perllib/FixMyStreet/DB/Result/Problem.pm:445 msgid "-- Pick a property type --" msgstr "選擇公物種類" -#: templates/web/base/admin/response_templates_select.html:4 +#: templates/web/base/admin/response_templates_select.html:3 msgid "--Choose a template--" msgstr "" @@ -210,8 +208,8 @@ msgstr "" "\n" "可以在你的設定檔加入一些 <code>地圖連結別</code> " -#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") +#. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories') #: templates/web/base/reports/_list-filters.html:28 msgid "<label for=\"statuses\">Show</label> %s <label for=\"filter_categories\">about</label> %s" msgstr "<label for=\"statuses\">颢示</label> %s <label for=\"filter_categories\">關於</label> %s" @@ -234,11 +232,11 @@ msgstr "<strong>不</strong> 我要用電子郵件收到更新通知" msgid "<strong>No</strong> let me sign in by email" msgstr "<strong>不</strong> 我要用電子郵件登入" -#: templates/web/base/report/_inspect.html:133 +#: templates/web/base/report/_inspect.html:142 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:135 +#: templates/web/base/report/_inspect.html:144 msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -249,7 +247,7 @@ msgid "<strong>Yes</strong> I have a password" msgstr "<strong>是</strong> 我有密碼" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:8 +#: templates/web/base/admin/report_blocks.html:10 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:42 msgid "Action Scheduled" @@ -282,26 +280,29 @@ msgstr "新增有關單位" msgid "Add new category" msgstr "新增種類" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_item.html:10 +#: templates/web/base/report/_item.html:14 +#: templates/web/base/report/_main.html:136 #: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:30 msgid "Add to shortlist" msgstr "" #: templates/web/base/admin/user_edit.html:4 #: templates/web/base/admin/users.html:48 +#: templates/web/base/admin/users.html:51 msgid "Add user" msgstr "新增使用者" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Add/edit response templates" msgstr "" @@ -309,7 +310,7 @@ msgstr "" msgid "Added %s" msgstr "新增 %s" -#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:145 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +365,7 @@ msgstr "本問題已解決之更新標註" msgid "Anonymous" msgstr "匿名" -#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/report_edit.html:134 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "匿名:" @@ -419,7 +420,7 @@ msgstr "分派給外部機：" msgid "Assign to subdivision:" msgstr "交派給下級單位：" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:728 msgid "Assign users to areas" msgstr "" @@ -444,8 +445,8 @@ msgstr "" msgid "Auto-response:" msgstr "" -#: templates/web/base/admin/report_edit.html:133 -#: templates/web/base/report/_inspect.html:42 +#: templates/web/base/admin/report_edit.html:127 +#: templates/web/base/report/_inspect.html:41 msgid "Available categories" msgstr "" @@ -453,7 +454,7 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:402 #: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "待核可" @@ -466,12 +467,12 @@ msgstr "回上層" msgid "Back to all reports" msgstr "" -#: templates/web/base/admin/report_blocks.html:41 +#: templates/web/base/admin/report_blocks.html:43 msgid "Ban email address" msgstr "禁止之電子郵件" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 @@ -502,10 +503,6 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收 msgid "Can't see the map? <em>Skip this step</em>" msgstr "無法顯示地圖？ <em>略過本步驟</em>" -#: templates/web/base/report/_inspect.html:141 -msgid "Cancel" -msgstr "" - #: perllib/FixMyStreet/Cobrand/Default.pm:650 #: templates/web/base/admin/responsepriorities/list.html:8 msgid "Categories" @@ -518,7 +515,8 @@ msgstr "" #: templates/web/base/admin/body.html:72 #: templates/web/base/admin/contact-form.html:19 #: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/base/report/_inspect.html:33 +#: templates/web/base/report/_inspect.html:32 +#: templates/web/base/report/_item.html:82 #: templates/web/base/report/new/category.html:6 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -538,7 +536,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" -#: templates/web/base/admin/report_edit.html:125 +#: templates/web/base/admin/report_edit.html:119 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -611,6 +609,10 @@ msgid "" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。" +#: templates/web/base/report/_inspect.html:76 +msgid "Choose another" +msgstr "" + #: templates/web/base/admin/stats.html:72 #: templates/web/base/admin/stats.html:78 msgid "Click here or enter as dd/mm/yyyy" @@ -639,10 +641,11 @@ msgstr "選擇確認電子郵件上的連結以作登入" #: perllib/FixMyStreet/Cobrand/Zurich.pm:189 #: perllib/FixMyStreet/Cobrand/Zurich.pm:960 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:15 -#: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/admin/report_blocks.html:17 +#: templates/web/base/admin/report_blocks.html:27 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 +#: templates/web/base/report/_item.html:43 #: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 @@ -744,8 +747,8 @@ msgstr "連結本團隊" msgid "Coordinates:" msgstr "協同單位:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1677 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1651 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1679 msgid "Could not find user" msgstr "找不到該戶用" @@ -799,7 +802,7 @@ msgstr "" msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "創建模版" @@ -840,7 +843,7 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單位5個工作天內處理。" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: templates/web/base/admin/template_edit.html:40 +#: templates/web/base/admin/template_edit.html:50 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "刪除模版" @@ -906,21 +909,35 @@ msgstr "您是否有 %s密碼？ " msgid "Don’t know" msgstr "不知道" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:108 msgid "Don't like forms?" msgstr "不喜歡此表單？" +#: templates/web/base/report/_item.html:25 +msgid "Down one" +msgstr "" + #: templates/web/base/js/translation_strings.html:52 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:14 +#: templates/web/base/admin/report_blocks.html:16 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:43 msgid "Duplicate" msgstr "複製 " +#: templates/web/base/report/_inspect.html:71 +#, fuzzy +msgid "Duplicate of" +msgstr "複製 " + +#: templates/web/base/report/_inspect.html:81 +#, fuzzy +msgid "Duplicates" +msgstr "複製 " + #: templates/web/base/admin/body.html:116 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" @@ -932,7 +949,8 @@ msgstr "" "不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n" "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。" -#: templates/web/base/report/_inspect.html:16 +#: templates/web/base/report/_inspect.html:15 +#: templates/web/base/report/_item.html:73 msgid "Easting/Northing:" msgstr "" @@ -951,11 +969,11 @@ msgstr "編輯" msgid "Edit body details" msgstr "編輯有關單位細節" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Edit other users' permissions" msgstr "" @@ -1006,7 +1024,7 @@ msgstr "編輯器" msgid "Email" msgstr "電子郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1625 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1627 msgid "Email added to abuse list" msgstr "電子郵件列入濫發名單" @@ -1024,11 +1042,11 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "取消電郵通知" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1622 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1624 msgid "Email already in abuse list" msgstr "電子郵件己在濫發名單" -#: templates/web/base/admin/report_edit.html:147 +#: templates/web/base/admin/report_edit.html:141 #: templates/web/base/admin/update_edit.html:35 #: templates/web/base/admin/user-form.html:19 #: templates/web/zurich/admin/body.html:48 @@ -1100,7 +1118,7 @@ msgid "Enter details of the problem" msgstr "請在此填寫問題的細節" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:4 +#: templates/web/base/errors/generic.html:8 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 @@ -1122,8 +1140,8 @@ msgstr "郵遞區號範例 %s" msgid "Examples:" msgstr "範例：" -#: templates/web/base/admin/report_edit.html:128 -#: templates/web/base/report/_inspect.html:37 +#: templates/web/base/admin/report_edit.html:122 +#: templates/web/base/report/_inspect.html:36 msgid "Existing category" msgstr "" @@ -1159,7 +1177,8 @@ msgstr "" msgid "Extra data:" msgstr "其它資料：" -#: templates/web/base/report/_inspect.html:107 +#: templates/web/base/report/_inspect.html:116 +#: templates/web/base/report/_item.html:98 msgid "Extra details" msgstr "" @@ -1181,11 +1200,12 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:24 -#: templates/web/base/admin/report_blocks.html:9 +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:26 #: templates/web/base/admin/stats_fix_rate.html:4 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:142 +#: templates/web/base/report/_item.html:41 #: templates/web/base/report/banner.html:12 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:45 @@ -1193,12 +1213,12 @@ msgid "Fixed" msgstr "已處理" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/report_blocks.html:13 msgid "Fixed - Council" msgstr "已處理－地方政府" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:10 +#: templates/web/base/admin/report_blocks.html:12 msgid "Fixed - User" msgstr "已處理－用戶" @@ -1216,7 +1236,7 @@ msgstr "已處理:" msgid "Flag as deleted" msgstr "標記警告為刪除 " -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Flag user" msgstr "標記警告用戶" @@ -1237,7 +1257,7 @@ msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "被標記警告的用戶其權限不受影響，只是列入特別關注名單" -#: templates/web/base/admin/report_edit.html:153 +#: templates/web/base/admin/report_edit.html:147 #: templates/web/base/admin/user-form.html:100 msgid "Flagged:" msgstr "警告:" @@ -1275,7 +1295,7 @@ msgid "Frequently Asked Questions" msgstr "常見問題回覆 " #: templates/web/base/around/_updates.html:3 -#: templates/web/base/report/display_tools.html:12 +#: templates/web/base/report/display_tools.html:14 msgid "Get updates" msgstr "取得更新" @@ -1301,7 +1321,7 @@ msgstr "很高興聽到問題已處理了。" #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:13 #: templates/web/base/reports/_list-filters.html:29 -#: templates/web/base/reports/_list-filters.html:41 +#: templates/web/base/reports/_list-filters.html:44 #: templates/web/zurich/admin/stats.html:26 msgid "Go" msgstr "走" @@ -1310,7 +1330,7 @@ msgstr "走" msgid "Going to send questionnaire?" msgstr "即將送出問卷？" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Grant access to the admin" msgstr "" @@ -1352,8 +1372,8 @@ msgstr "您好 %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:906 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:17 -#: templates/web/base/admin/report_blocks.html:26 +#: templates/web/base/admin/report_blocks.html:19 +#: templates/web/base/admin/report_blocks.html:28 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 @@ -1396,7 +1416,7 @@ msgstr "我剛才申報了一個問題 " msgid "I just updated a problem on @fixmystreet" msgstr "我利用@fixmystreet 申報了一個問題 " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:88 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:87 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr " 我們無法在資料庫中找到您的問題。\n" @@ -1447,6 +1467,10 @@ msgstr "" msgid "If you submit a problem here the problem will <strong>not</strong> be reported to the council." msgstr "" +#: templates/web/base/admin/template_edit.html:36 +msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." +msgstr "" + #: templates/web/base/questionnaire/index.html:70 msgid "" "If you wish to leave a public update on the problem, please enter it here\n" @@ -1519,7 +1543,7 @@ msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送: #: perllib/FixMyStreet/Cobrand/Zurich.pm:192 #: perllib/FixMyStreet/Cobrand/Zurich.pm:954 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:7 +#: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 @@ -1555,7 +1579,7 @@ msgid "Internal notes" msgstr "內部筆記" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:16 +#: templates/web/base/admin/report_blocks.html:18 msgid "Internal referral" msgstr "內部推薦" @@ -1563,7 +1587,7 @@ msgstr "內部推薦" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單位數值 %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1483 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1485 msgid "Invalid end date" msgstr "無效的結束日期" @@ -1571,16 +1595,16 @@ msgstr "無效的結束日期" msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: perllib/FixMyStreet/App/Controller/Report.pm:361 +#: perllib/FixMyStreet/App/Controller/Report.pm:384 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1479 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1481 msgid "Invalid start date" msgstr "無效的開始日期" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:5 +#: templates/web/base/admin/report_blocks.html:7 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:141 #: templates/web/base/report/update/form_update.html:41 @@ -1626,7 +1650,11 @@ msgstr "上回更新:" msgid "Last update:" msgstr "上一次更新:" -#: templates/web/base/reports/_list-filters.html:38 +#: templates/web/base/report/_item.html:78 +msgid "Latitude/Longitude:" +msgstr "" + +#: templates/web/base/reports/_list-filters.html:41 msgid "Least recently updated" msgstr "" @@ -1671,6 +1699,10 @@ msgstr "地圖" msgid "Manage shortlist" msgstr "" +#: templates/web/base/reports/_list-filters.html:36 +msgid "Manual order" +msgstr "" + #: templates/web/base/js/translation_strings.html:46 msgid "Map" msgstr "地圖" @@ -1695,7 +1727,7 @@ msgstr "八週前曾經標記為已修復/結案" msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:98 +#: templates/web/base/contact/index.html:96 msgid "Message" msgstr "留言" @@ -1715,7 +1747,7 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate" msgstr "" @@ -1723,7 +1755,7 @@ msgstr "" msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:126 +#: templates/web/base/report/_main.html:130 msgid "Moderate this report" msgstr "" @@ -1735,7 +1767,7 @@ msgstr "一個工作天內協調出部門" msgid "Month" msgstr "月份" -#: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:42 msgid "Most commented" msgstr "" @@ -1759,7 +1791,7 @@ msgstr "" msgid "Name" msgstr "名字" -#: templates/web/base/admin/report_edit.html:145 +#: templates/web/base/admin/report_edit.html:139 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 #: templates/web/base/admin/user-form.html:16 @@ -1771,7 +1803,7 @@ msgstr "名字：" msgid "Name: %s" msgstr "名字： %s" -#: templates/web/base/report/_inspect.html:23 +#: templates/web/base/report/_inspect.html:22 msgid "Navigate to this problem" msgstr "" @@ -1873,7 +1905,7 @@ msgstr "新陳述" msgid "New template" msgstr "新模版" -#: templates/web/base/reports/_list-filters.html:35 +#: templates/web/base/reports/_list-filters.html:38 msgid "Newest" msgstr "" @@ -1888,7 +1920,7 @@ msgstr "下一步" #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:143 +#: templates/web/base/admin/report_edit.html:137 #: templates/web/base/admin/report_edit.html:95 #: templates/web/base/admin/update_edit.html:26 #: templates/web/base/questionnaire/creator_fixed.html:16 @@ -1909,7 +1941,7 @@ msgstr "無有關單位" msgid "No council" msgstr "無地方政府" -#: perllib/FixMyStreet/DB/Result/Problem.pm:429 +#: perllib/FixMyStreet/DB/Result/Problem.pm:430 msgid "No council selected" msgstr "未選擇地方政府" @@ -1975,7 +2007,7 @@ msgstr "" "所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:13 +#: templates/web/base/admin/report_blocks.html:15 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:44 msgid "Not Responsible" @@ -2053,15 +2085,15 @@ msgstr "己解決之舊問題 " msgid "Older <br>problems" msgstr "舊問題 " -#: templates/web/base/reports/_list-filters.html:36 +#: templates/web/base/reports/_list-filters.html:39 msgid "Oldest" msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: perllib/FixMyStreet/Cobrand/Zurich.pm:900 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:23 -#: templates/web/base/admin/report_blocks.html:4 +#: templates/web/base/admin/report_blocks.html:25 +#: templates/web/base/admin/report_blocks.html:6 #: templates/web/base/admin/update_edit.html:30 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/report/update/form_update.html:41 @@ -2107,13 +2139,13 @@ msgstr "或將此問題 申報給:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "您可以訂閱 里/區內的更新通知" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1056 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:650 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:651 -#: perllib/FixMyStreet/DB/Result/Problem.pm:594 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1064 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:658 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 +#: perllib/FixMyStreet/DB/Result/Problem.pm:602 #: perllib/FixMyStreet/DB/Result/Problem.pm:617 +#: perllib/FixMyStreet/DB/Result/Problem.pm:626 #: perllib/FixMyStreet/Script/Reports.pm:185 #: perllib/FixMyStreet/Script/Reports.pm:200 msgid "Other" @@ -2134,7 +2166,7 @@ msgid "Parent" msgstr "上級 " #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/report_blocks.html:20 msgid "Partial" msgstr "部份" @@ -2168,7 +2200,7 @@ msgid "Phone number (optional)" msgstr "電話號碼(非必填)" #: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:152 +#: templates/web/base/admin/report_edit.html:146 #: templates/web/base/admin/user-form.html:21 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" @@ -2220,7 +2252,7 @@ msgstr "在地圖上作標記" #: perllib/FixMyStreet/Cobrand/Zurich.pm:940 #: perllib/FixMyStreet/Cobrand/Zurich.pm:946 #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:6 +#: templates/web/base/admin/report_blocks.html:8 #: templates/web/base/dashboard/index.html:140 #: templates/web/base/dashboard/index.html:141 #: templates/web/zurich/admin/header.html:1 @@ -2248,14 +2280,14 @@ msgid "Please check your email address is correct" msgstr "請確認您電郵地址無誤" #: perllib/FixMyStreet/App/Controller/Admin.pm:350 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:837 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:860 -#: perllib/FixMyStreet/DB/Result/Problem.pm:440 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:868 +#: perllib/FixMyStreet/DB/Result/Problem.pm:441 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "請選擇類別" -#: perllib/FixMyStreet/DB/Result/Problem.pm:446 +#: perllib/FixMyStreet/DB/Result/Problem.pm:447 msgid "Please choose a property type" msgstr "選擇公物種類" @@ -2279,13 +2311,13 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見 " #: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:127 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "請寫下您的留言" #: perllib/FixMyStreet/App/Controller/Admin.pm:1204 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 msgid "Please enter a name" msgstr "" @@ -2300,13 +2332,13 @@ msgid "Please enter a password" msgstr "請輸入密碼" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/Problem.pm:423 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "請填下主旨" #: perllib/FixMyStreet/App/Controller/Admin.pm:1201 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 #: perllib/FixMyStreet/App/Controller/Admin.pm:363 #: perllib/FixMyStreet/DB/Result/User.pm:164 #: templates/web/base/js/translation_strings.html:12 @@ -2319,7 +2351,7 @@ msgstr "請輸入有效電子郵件" msgid "Please enter a valid email address" msgstr "請輸入有效的電子郵件" -#: perllib/FixMyStreet/DB/Result/Problem.pm:426 +#: perllib/FixMyStreet/DB/Result/Problem.pm:427 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "請填寫進一步細節" @@ -2352,8 +2384,8 @@ msgid "Please enter your full name, councils need this information – if you do msgstr "請輸入您的全名，地方政府需要此資料 – 如果您不希望名字公開在網站上，請在下面方格中劃掉勾選。" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 -#: perllib/FixMyStreet/DB/Result/Problem.pm:434 +#: perllib/FixMyStreet/DB/Result/Comment.pm:124 +#: perllib/FixMyStreet/DB/Result/Problem.pm:435 #: perllib/FixMyStreet/DB/Result/User.pm:157 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2390,7 +2422,7 @@ msgstr "請在此填寫問題的細節" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "請利用下方表單填寫問題細節，在細節項請儘量述明準確的位置。 " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "請選擇您是否願意收到其它問卷" @@ -2416,20 +2448,20 @@ msgstr "" msgid "Please note:" msgstr "請加註記" -#: perllib/FixMyStreet/App/Controller/Report.pm:335 +#: perllib/FixMyStreet/App/Controller/Report.pm:354 msgid "Please provide a public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:242 msgid "Please provide some explanation as to why you're reopening this report" msgstr "如果您是再次申報，請說明原因" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:250 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:249 msgid "Please provide some text as well as a photo" msgstr "請提供一些文字敍述與照片" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please say whether you've ever reported a problem to your council before" msgstr "請敍明您是否曾向地方政府申報過問題？ " @@ -2445,7 +2477,7 @@ msgstr "請選擇訂閱方式" msgid "Please select the type of alert you want" msgstr "請選擇更新通知方式" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:232 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 msgid "Please state whether or not the problem has been fixed" msgstr "請敍明該問題是否已解決" @@ -2464,22 +2496,22 @@ msgstr "諘寫下您的留言" msgid "Please write your update here" msgstr "請寫下您的更新" -#: templates/web/base/contact/index.html:105 +#: templates/web/base/contact/index.html:103 #: templates/web/base/report/update-form.html:25 #: templates/web/base/report/update/form_user_loggedout_by_email.html:14 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "張貼" -#: templates/web/base/report/updates.html:15 +#: perllib/FixMyStreet/DB/Result/Comment.pm:242 msgid "Posted anonymously at %s" msgstr "匿名張貼 %s" -#: templates/web/base/report/updates.html:22 +#: perllib/FixMyStreet/DB/Result/Comment.pm:250 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "由%s (<strong>%s</strong>) 在%s" -#: templates/web/base/report/updates.html:24 +#: perllib/FixMyStreet/DB/Result/Comment.pm:255 msgid "Posted by %s at %s" msgstr "由 %s 在 %s 張貼" @@ -2495,7 +2527,8 @@ msgstr "之前" msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:96 +#: templates/web/base/report/_item.html:90 msgid "Priority" msgstr "" @@ -2511,10 +2544,15 @@ msgstr "隱私與cookies" #: templates/web/base/admin/body.html:91 #: templates/web/base/admin/contact-form.html:74 -#: templates/web/base/admin/report_edit.html:155 +#: templates/web/base/admin/report_edit.html:149 msgid "Private" msgstr "私人" +#: templates/web/base/report/new/form_user.html:1 +#, fuzzy +msgid "Private details" +msgstr "私人" + #: templates/web/base/maps/pin.html:13 msgid "Problem" msgstr "問題" @@ -2550,11 +2588,11 @@ msgstr "依調查結果呈現的問題改善" msgid "Problems" msgstr "問題" -#: templates/web/base/report/display_tools.html:20 +#: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" msgstr "鄰近的問題" -#: templates/web/base/report/display_tools.html:18 +#: templates/web/base/report/display_tools.html:20 msgid "Problems on the map" msgstr "地圖上的問題" @@ -2566,7 +2604,7 @@ msgstr "FixMyStreet 最近回報的已修復問題 " msgid "Problems within %.1fkm of this location" msgstr "該地點 %.1f公里內的問題 " -#: perllib/FixMyStreet/Cobrand/Default.pm:833 +#: perllib/FixMyStreet/Cobrand/Default.pm:834 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" @@ -2590,6 +2628,7 @@ msgstr "在 範圍內的問題" msgid "Property address:" msgstr "公物地址：" +#: templates/web/base/report/duplicate-no-updates.html:2 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "提供更新資訊" @@ -2607,12 +2646,17 @@ msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。" +#: templates/web/base/report/new/form_report.html:10 +#, fuzzy +msgid "Public details" +msgstr "公眾反應" + #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "公眾反應" -#: templates/web/base/report/_inspect.html:125 +#: templates/web/base/report/_inspect.html:134 msgid "Public update:" msgstr "" @@ -2636,7 +2680,7 @@ msgstr " %d回覆之問題%d, %s 到 %s 問卷 " msgid "Questionnaire %d sent for problem %d" msgstr "關於 %d問題所送出之 %d問卷 " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:191 msgid "Questionnaire filled in by problem reporter" msgstr "由問題申報者所填之問卷" @@ -2644,7 +2688,7 @@ msgstr "由問題申報者所填之問卷" #: templates/web/base/alert/updates.html:9 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/display_tools.html:42 msgid "RSS feed" msgstr "RSS訂閱" @@ -2672,7 +2716,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:834 +#: perllib/FixMyStreet/Cobrand/Default.pm:835 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" @@ -2688,12 +2732,12 @@ msgid "RSS feed of recent local problems" msgstr "最近當地問題的RSS訂閱" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/display_tools.html:42 msgid "RSS feed of updates to this problem" msgstr "最近當地問題更新的RSS訂閱" #: templates/web/base/alert/updates.html:14 -#: templates/web/base/report/display_tools.html:42 +#: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." msgstr "透過電子郵件收取該問題之更新消息" @@ -2715,7 +2759,7 @@ msgstr "最新 <br>解決" msgid "Recently reported problems" msgstr "近期申報之問題 " -#: templates/web/base/reports/_list-filters.html:37 +#: templates/web/base/reports/_list-filters.html:40 msgid "Recently updated" msgstr "" @@ -2723,13 +2767,15 @@ msgstr "" msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." msgstr "記住 FixMyStreet主要為申報可修復之物理性問題。如果您的問題不適合透過本網站投送，請直接到地方政府各機關之網站。 " -#: templates/web/base/admin/report_blocks.html:46 +#: templates/web/base/admin/report_blocks.html:48 msgid "Remove flag" msgstr "移除標記" -#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_item.html:12 +#: templates/web/base/report/_item.html:9 +#: templates/web/base/report/_main.html:134 #: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:26 msgid "Remove from shortlist" msgstr "" @@ -2737,7 +2783,7 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:172 +#: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" @@ -2751,7 +2797,8 @@ msgstr "給用戶的回應" msgid "Report" msgstr "提報 " -#: templates/web/base/report/_inspect.html:11 +#: templates/web/base/report/_inspect.html:10 +#: templates/web/base/report/_item.html:68 msgid "Report ID:" msgstr "" @@ -2761,6 +2808,7 @@ msgstr "" msgid "Report a problem" msgstr "申報問題" +#: templates/web/base/report/display_tools.html:10 #: templates/web/base/report/display_tools.html:9 msgid "Report abuse" msgstr "申報濫用" @@ -2784,8 +2832,8 @@ msgstr "申報你的問題" msgid "Report, view, or discuss local problems" msgstr "申報，檢視，或討論在地問題" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:606 +#: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "在%s 匿名申報 " @@ -2794,8 +2842,8 @@ msgstr "在%s 匿名申報 " msgid "Reported before" msgstr "之前的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:621 -#: templates/web/base/contact/index.html:59 +#: perllib/FixMyStreet/DB/Result/Problem.pm:630 +#: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "由%s 的 %s 申報" @@ -2808,27 +2856,27 @@ msgstr "由 申報" msgid "Reported in the %s category" msgstr "%s 種類之申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿名申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:615 +#: perllib/FixMyStreet/DB/Result/Problem.pm:624 msgid "Reported via %s by %s at %s" msgstr "%s 透過 %s 在 %s類別的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 msgid "Reported via %s in the %s category anonymously at %s" msgstr "透過 %s 在 %s類別的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:610 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s %s類別的申報 " @@ -2938,16 +2986,16 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1728 -#: templates/web/base/admin/report_edit.html:169 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1730 +#: templates/web/base/admin/report_edit.html:163 #: templates/web/base/admin/update_edit.html:66 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "左轉 " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1724 -#: templates/web/base/admin/report_edit.html:170 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1726 +#: templates/web/base/admin/report_edit.html:164 #: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" @@ -2958,21 +3006,26 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:9 +#: templates/web/base/maps/google-ol.html:11 msgid "Satellite" msgstr "衛星" +#: templates/web/base/report/_inspect.html:150 +#, fuzzy +msgid "Save + close as duplicate" +msgstr "標註為重覆之申報" + #: templates/web/base/admin/contact-form.html:137 #: templates/web/base/admin/responsepriorities/edit.html:36 -#: templates/web/base/admin/template_edit.html:36 -#: templates/web/base/report/_inspect.html:142 +#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/report/_inspect.html:150 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:20 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "儲存變動" -#: templates/web/base/report/_inspect.html:121 +#: templates/web/base/report/_inspect.html:130 msgid "Save with a public update" msgstr "" @@ -3009,6 +3062,10 @@ msgstr "查無此用戶" msgid "See our privacy policy" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:716 +msgid "See user detail for reports created as the council" +msgstr "" + #: templates/web/base/admin/body-form.html:39 #: templates/web/zurich/admin/body-form.html:16 msgid "Select a body" @@ -3052,27 +3109,27 @@ msgstr "送出" msgid "Service:" msgstr "服務" -#: templates/web/base/report/_inspect.html:26 +#: templates/web/base/report/_inspect.html:25 msgid "Set to my current location" msgstr "" -#: templates/web/base/report/display_tools.html:15 +#: templates/web/base/report/display_tools.html:17 msgid "Share" msgstr "分享" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:136 #: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:29 msgid "Shortlist" msgstr "" -#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:134 #: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:25 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_main.html:140 +#: templates/web/base/report/_main.html:144 msgid "Shortlisted by %s" msgstr "" @@ -3147,7 +3204,7 @@ msgstr "抱歉這個wasn’t 為有效的網址連結" msgid "Sorry, there has been an error confirming your problem." msgstr "抱歉無法確認你的問題" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:222 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:230 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3195,12 +3252,14 @@ msgstr "問始日：" #: templates/web/base/admin/index.html:58 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 -#: templates/web/base/report/_inspect.html:67 +#: templates/web/base/admin/template_edit.html:40 +#: templates/web/base/report/_inspect.html:66 +#: templates/web/base/report/_item.html:86 #: templates/web/base/report/update/form_update.html:39 msgid "State" msgstr "陳述" -#: templates/web/base/admin/report_edit.html:115 +#: templates/web/base/admin/report_edit.html:116 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:75 #: templates/web/zurich/admin/report_edit.html:103 @@ -3240,7 +3299,7 @@ msgstr "子類別：%s" msgid "Subdivision/Body" msgstr "下屬單位/機關" -#: templates/web/base/contact/index.html:90 +#: templates/web/base/contact/index.html:88 msgid "Subject" msgstr "主旨" @@ -3257,7 +3316,7 @@ msgstr "主旨:" msgid "Submit" msgstr "送出" -#: templates/web/base/admin/report_edit.html:180 +#: templates/web/base/admin/report_edit.html:174 #: templates/web/base/admin/report_edit.html:24 #: templates/web/base/admin/update_edit.html:77 #: templates/web/base/admin/user-form.html:177 @@ -3283,7 +3342,7 @@ msgid "Submitted" msgstr "已送出" #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:49 +#: templates/web/base/report/display_tools.html:51 msgid "Subscribe" msgstr "訂閱" @@ -3566,7 +3625,7 @@ msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。" msgid "There was a problem showing this page. Please try again later." msgstr "本頁出現錯誤，請再試一次" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:759 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 #: templates/web/base/auth/general.html:53 #: templates/web/zurich/auth/general.html:28 @@ -3658,9 +3717,9 @@ msgstr "當用戶沒有選擇類別時，電子郵件將送到負責該區域的 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "電子郵件將送到負責該區域的多個地方政府，因選擇的類別提供這些對象。如果您不是負責受理機關，請略過。" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:874 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:918 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:926 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 #: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "本項資訊必填" @@ -3685,6 +3744,10 @@ msgstr "問題己處理完畢" msgid "This problem has not been fixed" msgstr "問題尚未解決" +#: templates/web/base/report/duplicate-no-updates.html:3 +msgid "This report is a duplicate. Please leave updates on the original report:" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162 #: templates/web/zurich/report/_main.html:14 @@ -3759,7 +3822,8 @@ msgstr "檢視地圖上問題之確切位置" msgid "Total" msgstr "總數" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:107 +#: templates/web/base/report/_item.html:94 msgid "Traffic management required?" msgstr "" @@ -3767,7 +3831,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -3784,14 +3848,14 @@ msgid "Try emailing us directly:" msgstr "何不直接發信給我們:" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:12 +#: templates/web/base/admin/report_blocks.html:14 #: templates/web/base/report/update/form_update.html:41 #: templates/web/base/report/update/form_update.html:44 msgid "Unable to fix" msgstr "無法修復" #: templates/web/base/admin/report_blocks.html:1 -#: templates/web/base/admin/report_blocks.html:19 +#: templates/web/base/admin/report_blocks.html:21 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -3811,8 +3875,8 @@ msgstr "未知的" msgid "Unknown alert type" msgstr "未知的通知類別" -#: perllib/FixMyStreet/App/Controller/Auth.pm:530 #: perllib/FixMyStreet/App/Controller/Photo.pm:109 +#: perllib/FixMyStreet/App/Controller/Root.pm:124 #: templates/web/base/js/translation_strings.html:38 msgid "Unknown error" msgstr "未知的錯誤" @@ -3823,6 +3887,10 @@ msgstr "未知的錯誤" msgid "Unknown problem ID" msgstr "未知的問題編號 " +#: templates/web/base/report/_item.html:24 +msgid "Up one" +msgstr "" + #: templates/web/base/report/update/form_update.html:29 msgid "Update" msgstr "更新" @@ -3876,7 +3944,7 @@ msgid "Updated" msgstr "已更新" #: perllib/FixMyStreet/App/Controller/Admin.pm:1161 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1224 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1223 #: perllib/FixMyStreet/App/Controller/Admin.pm:1376 #: perllib/FixMyStreet/App/Controller/Admin.pm:824 #: perllib/FixMyStreet/Cobrand/Zurich.pm:762 @@ -3891,7 +3959,7 @@ msgstr "已更新！" msgid "Updates" msgstr "更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:133 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "更新內容有 %s 字數限制，請簡化您的更新。" @@ -3922,11 +3990,11 @@ msgstr "已用過之地圖" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1681 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1683 msgid "User flag removed" msgstr "移除用戶的標記警告" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1653 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1655 msgid "User flagged" msgstr "給用戶標記警告" @@ -3935,7 +4003,7 @@ msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的名稱與電子郵件" #: perllib/FixMyStreet/Cobrand/Default.pm:670 -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 msgid "Users" @@ -4025,6 +4093,10 @@ msgstr "何時編輯 " msgid "When sent" msgstr "何時送出" +#: templates/web/base/report/_inspect.html:72 +msgid "Which report is it a duplicate of?" +msgstr "" + #: templates/web/base/js/translation_strings.html:51 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4073,7 +4145,7 @@ msgstr "年份" #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:142 +#: templates/web/base/admin/report_edit.html:136 #: templates/web/base/admin/report_edit.html:95 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/admin/users.html:32 @@ -4088,11 +4160,11 @@ msgstr "是" msgid "Yes I have a password" msgstr "我有密碼" -#: templates/web/base/contact/index.html:46 +#: templates/web/base/contact/index.html:45 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "你申訴此問題遭不必要之和諧 " -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/unsuitable-text.html:2 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題 " @@ -4109,7 +4181,7 @@ msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>." msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不會送出)該名用戶所提交的申報 " -#: templates/web/base/contact/index.html:113 +#: templates/web/base/contact/index.html:111 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。" @@ -4206,9 +4278,9 @@ msgstr "" #: templates/web/base/alert/_list.html:90 #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 -#: templates/web/base/contact/index.html:83 -#: templates/web/base/report/display_tools.html:44 -#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/contact/index.html:81 +#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/new/form_user_loggedout_email.html:1 #: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/zurich/report/new/fill_in_details_form.html:53 @@ -4228,7 +4300,7 @@ msgid "Your information will only be used in accordance with our <a href=\"/priv msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用" #: templates/web/base/auth/general.html:107 -#: templates/web/base/contact/index.html:76 +#: templates/web/base/contact/index.html:74 #: templates/web/base/report/new/form_user_loggedout_by_email.html:17 #: templates/web/base/report/update/form_name.html:29 #: templates/web/zurich/auth/general.html:61 @@ -4307,53 +4379,53 @@ msgstr "用戶編輯" msgid "from %s different users" msgstr "從不同的用戶%s " -#: templates/web/base/report/_item.html:15 +#: templates/web/base/report/_item.html:54 #: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "%s上回更新:" -#: perllib/Utils.pm:205 +#: perllib/Utils.pm:206 msgid "less than a minute" msgstr "少於一分鐘" -#: templates/web/base/report/updates.html:57 +#: perllib/FixMyStreet/DB/Result/Comment.pm:288 msgid "marked as a duplicate report" msgstr "標註為重覆之申報" -#: templates/web/base/report/updates.html:47 +#: perllib/FixMyStreet/DB/Result/Comment.pm:278 msgid "marked as action scheduled" msgstr "標註為排程行動" -#: templates/web/base/report/updates.html:59 +#: perllib/FixMyStreet/DB/Result/Comment.pm:290 msgid "marked as an internal referral" msgstr "標註為內部推薦" -#: templates/web/base/report/updates.html:49 +#: perllib/FixMyStreet/DB/Result/Comment.pm:280 msgid "marked as closed" msgstr "標註為關閉" -#: templates/web/base/report/updates.html:28 -#: templates/web/base/report/updates.html:51 +#: perllib/FixMyStreet/DB/Result/Comment.pm:261 +#: perllib/FixMyStreet/DB/Result/Comment.pm:282 msgid "marked as fixed" msgstr "標註為解決" -#: templates/web/base/report/updates.html:45 +#: perllib/FixMyStreet/DB/Result/Comment.pm:276 msgid "marked as in progress" msgstr "標註為處理中" -#: templates/web/base/report/updates.html:41 +#: perllib/FixMyStreet/DB/Result/Comment.pm:272 msgid "marked as investigating" msgstr "標註為調查中" -#: templates/web/base/report/updates.html:55 +#: perllib/FixMyStreet/DB/Result/Comment.pm:286 msgid "marked as not the council's responsibility" msgstr "標註為非本區政府職責範圍" -#: templates/web/base/report/updates.html:43 +#: perllib/FixMyStreet/DB/Result/Comment.pm:274 msgid "marked as planned" msgstr "標註為己規畫" -#: templates/web/base/report/updates.html:53 +#: perllib/FixMyStreet/DB/Result/Comment.pm:284 msgid "marked as unable to fix" msgstr "標註為無法解決" @@ -4399,8 +4471,8 @@ msgstr "原始輸入者" msgid "other areas:" msgstr "其它地區:" -#: templates/web/base/report/updates.html:29 -#: templates/web/base/report/updates.html:39 +#: perllib/FixMyStreet/DB/Result/Comment.pm:263 +#: perllib/FixMyStreet/DB/Result/Comment.pm:269 msgid "reopened" msgstr "重啟申報" @@ -4446,68 +4518,68 @@ msgstr "%d 天數" msgid "ward" msgstr "路檔" -#: templates/web/base/front/stats.html:13 +#: perllib/Utils.pm:223 #, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "近期的申報 <big>%s</big> " +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d 日期" -#: perllib/Utils.pm:224 +#: perllib/Utils.pm:225 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時數" -#: templates/web/base/report/_support.html:6 -#, perl-format -msgid "%d supporter" -msgid_plural "%d supporters" -msgstr[0] "%d 支援者" - -#: perllib/Utils.pm:226 +#: perllib/Utils.pm:227 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分鐘數" -#: templates/web/base/front/stats.html:25 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> 更新申報" - -#: templates/web/base/report/new/top_message_none.html:3 +#: templates/web/base/report/_support.html:6 #, perl-format -msgid "We do not yet have details for the council that covers this location." -msgid_plural "We do not yet have details for the councils that cover this location." -msgstr[0] "我們尚未有該區域負責單位之細節 " +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d 支援者" -#: perllib/Utils.pm:220 +#: perllib/Utils.pm:221 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d 週數" +#: templates/web/base/front/stats.html:19 +#, perl-format +msgid "<big>%s</big> fixed in past month" +msgid_plural "<big>%s</big> fixed in past month" +msgstr[0] "上個月解決的<big>%s</big> " + #: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> 上一週的申報 " -#: templates/web/base/front/stats.html:19 +#: templates/web/base/front/stats.html:13 #, perl-format -msgid "<big>%s</big> fixed in past month" -msgid_plural "<big>%s</big> fixed in past month" -msgstr[0] "上個月解決的<big>%s</big> " +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "近期的申報 <big>%s</big> " -#: perllib/Utils.pm:222 +#: templates/web/base/front/stats.html:25 #, perl-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 日期" +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> 更新申報" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "我們<strong>尚未<strong>有該區域其它單位之細節 " + +#: templates/web/base/report/new/top_message_none.html:3 +#, perl-format +msgid "We do not yet have details for the council that covers this location." +msgid_plural "We do not yet have details for the councils that cover this location." +msgstr[0] "我們尚未有該區域負責單位之細節 " |