diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/FixMyStreet.po | 628 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 861 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1035 |
3 files changed, 1560 insertions, 964 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 47c063ec3..b08ce69da 100644 --- a/locale/FixMyStreet.po +++ b/locale/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: 2011-08-18 11:07+0100\n" +"POT-Creation-Date: 2011-10-21 15:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <team@fixmystreet.com>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: bin/send-reports:179 perllib/FixMyStreet/DB/Result/Problem.pm:378 +#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 msgid " and " msgstr "" @@ -25,7 +25,7 @@ msgstr "" msgid " and <strong>we will now send it to the council</strong>" msgstr "" -#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_none.html:15 templates/web/default/report/new/councils_text_none.html:3 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/all_councils_text.html:2 +#: templates/web/default/report/new/councils_text_all.html:10 templates/web/default/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:17 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/all_councils_text.html:2 msgid " or " msgstr "" @@ -41,11 +41,11 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 msgid "%d day" msgstr "" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 msgid "%d days" msgstr "" @@ -53,11 +53,11 @@ msgstr "" msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 msgid "%d hour" msgstr "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 msgid "%d hours" msgstr "" @@ -65,11 +65,11 @@ msgstr "" msgid "%d live updates" msgstr "" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 msgid "%d minute" msgstr "" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 msgid "%d minutes" msgstr "" @@ -77,11 +77,11 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 msgid "%d week" msgstr "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 msgid "%d weeks" msgstr "" @@ -89,19 +89,19 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:826 perllib/FixMyStreet/Cobrand/Default.pm:840 +#: perllib/FixMyStreet/Cobrand/Default.pm:844 perllib/FixMyStreet/Cobrand/Default.pm:858 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: perllib/FixMyStreet/DB/Result/Problem.pm:466 msgid "%s, reported anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:311 +#: perllib/FixMyStreet/DB/Result/Problem.pm:468 msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:857 perllib/FixMyStreet/Cobrand/Default.pm:871 +#: perllib/FixMyStreet/Cobrand/Default.pm:875 perllib/FixMyStreet/Cobrand/Default.pm:889 msgid "%s, within %s ward" msgstr "" @@ -137,7 +137,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:208 +#: templates/web/default/report/new/fill_in_details_form.html:217 msgid "(optional)" msgstr "" @@ -145,23 +145,23 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:202 +#: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" msgstr "" -#: templates/web/default/report/display.html:206 +#: templates/web/default/report/display.html:217 msgid "(we never show your email)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin.pm:279 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 perllib/FixMyStreet/App/Controller/Report/New.pm:532 perllib/FixMyStreet/DB/Result/Problem.pm:206 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 perllib/FixMyStreet/App/Controller/Report/New.pm:566 perllib/FixMyStreet/DB/Result/Problem.pm:314 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:490 perllib/FixMyStreet/DB/Result/Problem.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "-- Pick a property type --" msgstr "" @@ -169,7 +169,7 @@ msgstr "" msgid ". You can <a href=\"%s\">view the problem on this site</a>." msgstr "" -#: templates/web/default/footer.html:13 +#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 msgid "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=\"logoie\"></span></a>" msgstr "" @@ -229,31 +229,31 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:162 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" -#: templates/web/default/report/display.html:160 +#: templates/web/default/report/display.html:170 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:142 templates/web/default/report/new/fill_in_details_form.html:136 +#: templates/web/default/auth/general.html:37 templates/web/default/report/display.html:148 templates/web/default/report/new/fill_in_details_form.html:140 msgid "<strong>Yes</strong>, I have a password:" msgstr "" -#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:32 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 +#: templates/web/default/static/about.html:1 templates/web/default/static/about.html:3 templates/web/emptyhomes/header.html:31 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "" -#: templates/web/default/admin/council_contacts.html:50 +#: templates/web/default/admin/council_contacts.html:57 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:51 +#: templates/web/default/my/my.html:56 msgid "Added %s" msgstr "" -#: templates/web/default/auth/change_password.html:31 +#: templates/web/default/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -265,7 +265,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:211 +#: templates/web/default/report/display.html:222 msgid "Alert me to future updates" msgstr "" @@ -277,7 +277,7 @@ msgstr "" msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:29 templates/web/fiksgatami/footer.html:6 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 msgid "All reports" msgstr "" @@ -329,15 +329,19 @@ msgstr "" msgid "Ban email address" msgstr "" -#: templates/web/default/footer.html:16 +#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "" -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" -#: templates/web/default/admin/council_contacts.html:19 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 +#: templates/web/default/admin/stats.html:80 +msgid "By Date" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:26 templates/web/default/admin/index.html:36 templates/web/default/admin/list_flagged.html:14 templates/web/default/admin/search_reports.html:17 msgid "Category" msgstr "" @@ -345,18 +349,34 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:507 perllib/FixMyStreet/App/Controller/Report/New.pm:533 templates/web/default/admin/council_contacts.html:56 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:26 templates/web/default/report/new/fill_in_details_form.html:67 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 perllib/FixMyStreet/App/Controller/Report/New.pm:567 templates/web/default/admin/council_contacts.html:63 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:29 templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "" -#: bin/send-reports:176 +#: bin/send-reports:180 msgid "Category: %s" msgstr "" -#: templates/web/default/auth/change_password.html:1 templates/web/default/auth/change_password.html:3 templates/web/default/auth/change_password.html:35 +#: templates/web/default/auth/change_password.html:1 templates/web/default/auth/change_password.html:3 templates/web/default/auth/change_password.html:33 msgid "Change Password" msgstr "" +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +msgid "Closed" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +msgid "Closed by council" +msgstr "" + +#: templates/web/default/my/my.html:32 +msgid "Closed reports" +msgstr "" + +#: templates/web/default/admin/problem_row.html:25 +msgid "Closed:" +msgstr "" + #: templates/web/default/around/display_location.html:102 templates/web/default/around/display_location.html:104 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -365,19 +385,35 @@ msgstr "" msgid "Co-ordinates:" msgstr "" -#: templates/web/default/admin/list_flagged.html:16 templates/web/default/admin/list_updates.html:11 templates/web/default/admin/search_reports.html:19 +#: templates/web/default/admin/list_flagged.html:16 templates/web/default/admin/list_updates.html:13 templates/web/default/admin/search_reports.html:19 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:36 templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:39 templates/web/default/admin/update_edit.html:41 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/update_edit.html:25 +#: templates/web/default/admin/report_edit.html:38 templates/web/default/admin/update_edit.html:40 msgid "Cobrand:" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +msgid "Configuration updated" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +msgid "Configuration updated - contacts will be generated automatically later" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:119 +msgid "Configure Open311" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:96 +msgid "Configure Open311 integration" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:33 msgid "Confirm" msgstr "" @@ -389,19 +425,19 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/default/admin/council_contacts.html:21 templates/web/default/admin/council_contacts.html:66 templates/web/default/admin/council_edit.html:28 templates/web/default/admin/council_edit.html:43 templates/web/default/admin/stats.html:5 +#: templates/web/default/admin/council_contacts.html:28 templates/web/default/admin/council_contacts.html:73 templates/web/default/admin/council_edit.html:28 templates/web/default/admin/council_edit.html:43 templates/web/default/admin/stats.html:5 msgid "Confirmed" msgstr "" -#: templates/web/default/admin/problem_row.html:23 templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/problem_row.html:23 templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" msgstr "" -#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:10 msgid "Contact" msgstr "" -#: templates/web/default/footer.html:17 +#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 msgid "Contact FixMyStreet" msgstr "" @@ -413,15 +449,15 @@ msgstr "" msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:965 perllib/FixMyStreet/App/Controller/Admin.pm:993 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 perllib/FixMyStreet/App/Controller/Admin.pm:1133 msgid "Could not find user" msgstr "" -#: templates/web/default/admin/list_flagged.html:13 templates/web/default/admin/search_reports.html:16 +#: templates/web/default/admin/list_flagged.html:13 templates/web/default/admin/list_updates.html:12 templates/web/default/admin/search_reports.html:16 templates/web/default/admin/search_users.html:14 msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 templates/web/default/admin/council_list.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:977 templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -429,11 +465,15 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: templates/web/default/admin/stats.html:84 templates/web/default/admin/user_edit.html:12 +msgid "Council:" +msgstr "" + #: templates/web/default/admin/council_list.html:36 msgid "Councils" msgstr "" -#: templates/web/default/admin/stats.html:10 +#: templates/web/default/admin/stats.html:12 templates/web/default/admin/stats.html:32 msgid "Count" msgstr "" @@ -441,7 +481,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:87 msgid "Create category" msgstr "" @@ -449,11 +489,11 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:30 templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:33 templates/web/default/admin/update_edit.html:42 msgid "Created:" msgstr "" -#: templates/web/default/admin/stats.html:9 +#: templates/web/default/admin/stats.html:31 msgid "Current state" msgstr "" @@ -461,7 +501,7 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:22 templates/web/default/admin/council_contacts.html:69 templates/web/default/admin/council_edit.html:29 templates/web/default/admin/council_edit.html:44 +#: templates/web/default/admin/council_contacts.html:29 templates/web/default/admin/council_contacts.html:76 templates/web/default/admin/council_edit.html:29 templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "" @@ -481,7 +521,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/default/admin/list_updates.html:31 templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/list_updates.html:35 templates/web/default/admin/problem_row.html:29 templates/web/default/admin/search_users.html:24 msgid "Edit" msgstr "" @@ -493,19 +533,23 @@ msgstr "" msgid "Editing update %d" msgstr "" +#: templates/web/default/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "" + #: templates/web/default/admin/council_edit.html:45 msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_abuse.html:11 templates/web/default/admin/search_reports.html:15 +#: templates/web/default/admin/council_contacts.html:27 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_flagged.html:12 templates/web/default/admin/list_flagged.html:35 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_abuse.html:11 templates/web/default/admin/search_reports.html:15 templates/web/default/admin/search_users.html:13 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:938 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 msgid "Email already in abuse list" msgstr "" @@ -513,23 +557,23 @@ msgstr "" msgid "Email me new local problems" msgstr "" -#: templates/web/default/report/display.html:42 +#: templates/web/default/report/display.html:35 msgid "Email me updates" msgstr "" -#: templates/web/default/admin/council_contacts.html:61 templates/web/default/admin/council_edit.html:26 templates/web/default/admin/report_edit.html:28 templates/web/default/admin/update_edit.html:24 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:46 +#: templates/web/default/admin/council_contacts.html:68 templates/web/default/admin/council_edit.html:26 templates/web/default/admin/report_edit.html:31 templates/web/default/admin/update_edit.html:24 templates/web/default/admin/user_edit.html:11 templates/web/default/alert/updates.html:13 templates/web/default/report/display.html:39 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:492 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:491 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:494 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 msgid "Empty office or other commercial" msgstr "" @@ -537,23 +581,23 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:495 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:496 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/default/admin/stats.html:47 +#: templates/web/default/admin/stats.html:70 msgid "End Year:" msgstr "" -#: templates/web/default/admin/stats.html:49 +#: templates/web/default/admin/stats.html:72 msgid "End day:" msgstr "" -#: templates/web/default/admin/stats.html:48 +#: templates/web/default/admin/stats.html:71 msgid "End month:" msgstr "" @@ -565,7 +609,7 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:167 templates/web/default/report/new/fill_in_details_form.html:161 +#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:177 templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "" @@ -597,7 +641,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/default/header.html:22 templates/web/fiksgatami/header.html:13 +#: templates/web/default/header.html:29 templates/web/fiksgatami/header.html:16 templates/web/reading/header.html:31 msgid "Fix<span id=\"my\">My</span>Street" msgstr "" @@ -626,12 +670,16 @@ msgid "" "for the county council." msgstr "" -#: templates/web/default/front/stats.html:7 -msgid "FixMyStreet updates" +#: templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +msgid "Fixed" msgstr "" -#: templates/web/default/admin/index.html:36 templates/web/default/admin/report_edit.html:22 -msgid "Fixed" +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 +msgid "Fixed - Council" +msgstr "" + +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 +msgid "Fixed - User" msgstr "" #: templates/web/default/my/my.html:27 @@ -646,7 +694,11 @@ msgstr "" msgid "Flag user" msgstr "" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/search_users.html:15 +msgid "Flagged" +msgstr "" + +#: templates/web/default/admin/report_edit.html:41 templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" @@ -678,7 +730,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 msgid "Going to send questionnaire?" msgstr "" @@ -698,7 +750,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/default/footer.html:10 templates/web/emptyhomes/header.html:31 templates/web/fiksgatami/footer.html:8 +#: templates/web/default/footer.html:10 templates/web/emptyhomes/header.html:30 templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 msgid "Help" msgstr "" @@ -706,7 +758,7 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:19 msgid "Hidden" msgstr "" @@ -726,7 +778,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:546 +#: perllib/FixMyStreet/App/Controller/Admin.pm:587 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -738,7 +790,7 @@ msgstr "" msgid "I'm afraid we couldn't validate that token, as the report was made too long ago." msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:232 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" msgstr "" @@ -746,7 +798,7 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:12 msgid "If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council." msgstr "" @@ -773,6 +825,10 @@ msgstr "" msgid "Illegal feed selection" msgstr "" +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:24 templates/web/default/report/display.html:85 templates/web/default/report/display.html:87 +msgid "In Progress" +msgstr "" + #: templates/web/default/open311/index.html:21 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" @@ -781,51 +837,55 @@ msgstr "" msgid "Include stale reports" msgstr "" -#: templates/web/default/admin/stats.html:53 +#: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:355 +#: perllib/FixMyStreet/App/Controller/Open311.pm:358 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:340 +#: perllib/FixMyStreet/App/Controller/Open311.pm:343 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:785 +#: perllib/FixMyStreet/App/Controller/Admin.pm:897 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:423 +#: perllib/FixMyStreet/App/Controller/Open311.pm:426 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:887 msgid "Invalid start date" msgstr "" +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:23 templates/web/default/report/display.html:85 templates/web/default/report/display.html:86 +msgid "Investigating" +msgstr "" + #: templates/web/emptyhomes/tokens/confirm_problem.html:12 templates/web/emptyhomes/tokens/confirm_problem.html:14 msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn’t mean the council isn’t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step." msgstr "" -#: templates/web/default/auth/general.html:44 templates/web/default/report/display.html:149 templates/web/default/report/new/fill_in_details_form.html:143 +#: templates/web/default/auth/general.html:44 templates/web/default/report/display.html:157 templates/web/default/report/new/fill_in_details_form.html:149 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:23 +#: templates/web/default/admin/council_contacts.html:30 msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 msgid "Last update:" msgstr "" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:26 msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 msgid "List Flagged" msgstr "" @@ -845,7 +905,7 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:30 templates/web/fiksgatami/footer.html:7 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "" @@ -857,35 +917,31 @@ msgstr "" msgid "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" -#: perllib/FixMyStreet/Map/OSM/StreetView.pm:27 -msgid "Map contains Ordnance Survey data © Crown copyright and database right 2010." -msgstr "" - -#: perllib/FixMyStreet/Map/FMS.pm:24 -msgid "Map contains Ordnance Survey data © Crown copyright and database right 2010.<br>© 2011 <a href=\"http://www.bing.com/maps/\">Microsoft</a>. © AND, Navteq, Ordnance Survey." -msgstr "" - #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:431 +#: perllib/FixMyStreet/App/Controller/Open311.pm:434 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/default/report/display.html:38 +#: templates/web/default/admin/stats.html:11 +msgid "Month" +msgstr "" + +#: templates/web/default/report/display.html:31 msgid "More problems nearby" msgstr "" -#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/reports/index.html:10 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/reports/index.html:9 +#: templates/web/default/admin/list_flagged.html:11 templates/web/default/admin/list_flagged.html:34 templates/web/default/admin/list_updates.html:7 templates/web/default/admin/search_reports.html:14 templates/web/default/admin/search_users.html:12 templates/web/default/reports/index.html:10 templates/web/emptyhomes/reports/index.html:10 templates/web/fiksgatami/reports/index.html:9 msgid "Name" msgstr "" -#: templates/web/default/admin/report_edit.html:27 templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/report_edit.html:30 templates/web/default/admin/update_edit.html:23 templates/web/default/admin/user_edit.html:10 msgid "Name:" msgstr "" -#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 templates/web/reading/footer.html:4 msgid "Navigation" msgstr "" @@ -893,11 +949,11 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:564 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:558 +#: perllib/FixMyStreet/Cobrand/Default.pm:553 perllib/FixMyStreet/Cobrand/Default.pm:588 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -905,7 +961,7 @@ msgstr "" msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:300 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 msgid "New category contact added" msgstr "" @@ -969,11 +1025,15 @@ msgstr "" msgid "New!" msgstr "" -#: templates/web/default/admin/council_contacts.html:32 templates/web/default/admin/council_contacts.html:33 templates/web/default/admin/council_edit.html:4 templates/web/default/admin/list_updates.html:28 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:16 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:70 +#: templates/web/default/admin/council_contacts.html:39 templates/web/default/admin/council_contacts.html:40 templates/web/default/admin/council_edit.html:4 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:19 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/update_edit.html:16 templates/web/default/questionnaire/creator_fixed.html:16 templates/web/default/questionnaire/index.html:109 templates/web/default/questionnaire/index.html:70 msgid "No" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:189 +#: templates/web/default/admin/stats.html:85 templates/web/default/admin/user_edit.html:13 +msgid "No council" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:297 msgid "No council selected" msgstr "" @@ -1013,15 +1073,15 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/default/admin/council_contacts.html:24 templates/web/default/admin/council_edit.html:46 +#: templates/web/default/admin/council_contacts.html:31 templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "" -#: templates/web/default/admin/stats.html:28 +#: templates/web/default/admin/stats.html:51 msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:73 templates/web/default/admin/council_edit.html:31 +#: templates/web/default/admin/council_contacts.html:80 templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "" @@ -1029,15 +1089,15 @@ msgstr "" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:127 +#: templates/web/default/report/new/fill_in_details_form.html:131 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/display.html:139 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" -#: templates/web/default/report/display.html:33 templates/web/default/report/updates.html:19 +#: templates/web/default/report/display.html:26 templates/web/default/report/updates.html:23 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1065,7 +1125,7 @@ msgstr "" msgid "Older problems" msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:19 templates/web/default/report/display.html:85 msgid "Open" msgstr "" @@ -1093,7 +1153,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: bin/send-reports:171 bin/send-reports:180 perllib/FixMyStreet/App/Controller/Report/New.pm:523 perllib/FixMyStreet/App/Controller/Report/New.pm:532 perllib/FixMyStreet/App/Controller/Report/New.pm:903 perllib/FixMyStreet/DB/Result/Problem.pm:318 perllib/FixMyStreet/DB/Result/Problem.pm:328 perllib/FixMyStreet/DB/Result/Problem.pm:338 perllib/FixMyStreet/DB/Result/Problem.pm:350 +#: bin/send-reports:175 bin/send-reports:184 perllib/FixMyStreet/App/Controller/Report/New.pm:553 perllib/FixMyStreet/App/Controller/Report/New.pm:566 perllib/FixMyStreet/App/Controller/Report/New.pm:969 perllib/FixMyStreet/DB/Result/Problem.pm:475 perllib/FixMyStreet/DB/Result/Problem.pm:485 perllib/FixMyStreet/DB/Result/Problem.pm:495 perllib/FixMyStreet/DB/Result/Problem.pm:507 msgid "Other" msgstr "" @@ -1101,23 +1161,27 @@ msgstr "" msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." msgstr "" +#: templates/web/default/admin/list_updates.html:11 +msgid "Owner" +msgstr "" + #: templates/web/default/errors/page_error_404_not_found.html:1 templates/web/default/errors/page_error_404_not_found.html:3 msgid "Page Not Found" msgstr "" -#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 msgid "Partial" msgstr "" -#: templates/web/default/auth/change_password.html:27 +#: templates/web/default/auth/change_password.html:25 msgid "Password:" msgstr "" -#: bin/send-reports:68 templates/web/default/admin/report_edit.html:29 templates/web/default/report/new/fill_in_details_form.html:206 +#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "" -#: templates/web/default/questionnaire/index.html:97 templates/web/default/report/display.html:109 templates/web/default/report/new/fill_in_details_form.html:98 +#: templates/web/default/questionnaire/index.html:97 templates/web/default/report/display.html:115 templates/web/default/report/new/fill_in_details_form.html:102 msgid "Photo:" msgstr "" @@ -1125,15 +1189,15 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/default/index.html:63 -msgid "Photos of recent reports" +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:23 templates/web/default/report/display.html:85 templates/web/default/report/display.html:86 +msgid "Planned" msgstr "" #: templates/web/default/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "" -#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:19 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" @@ -1145,11 +1209,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:686 perllib/FixMyStreet/App/Controller/Report/New.pm:705 perllib/FixMyStreet/App/Controller/Report/New.pm:722 perllib/FixMyStreet/DB/Result/Problem.pm:208 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 perllib/FixMyStreet/App/Controller/Report/New.pm:741 perllib/FixMyStreet/App/Controller/Report/New.pm:778 perllib/FixMyStreet/DB/Result/Problem.pm:316 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:214 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 msgid "Please choose a property type" msgstr "" @@ -1164,19 +1228,19 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:113 msgid "Please enter a message" msgstr "" -#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:17 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:15 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:183 +#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:291 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/DB/Result/User.pm:94 +#: perllib/FixMyStreet/DB/Result/User.pm:96 msgid "Please enter a valid email" msgstr "" @@ -1184,19 +1248,19 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:186 +#: perllib/FixMyStreet/DB/Result/Problem.pm:294 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:91 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:93 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:201 +#: perllib/FixMyStreet/DB/Result/Problem.pm:309 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" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:108 perllib/FixMyStreet/DB/Result/Problem.pm:194 perllib/FixMyStreet/DB/Result/User.pm:87 +#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:110 perllib/FixMyStreet/DB/Result/Problem.pm:302 perllib/FixMyStreet/DB/Result/User.pm:89 msgid "Please enter your name" msgstr "" @@ -1210,7 +1274,7 @@ msgid "" "to read, as does a lack of punctuation." msgstr "" -#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:8 +#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "" @@ -1226,11 +1290,11 @@ 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:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: templates/web/default/report/display.html:69 +#: templates/web/default/report/display.html:62 msgid "Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href=\"/faq#privacy\">privacy policy</a>" msgstr "" @@ -1242,15 +1306,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1262,7 +1326,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:227 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1270,7 +1334,7 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:774 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 msgid "Please upload a JPEG image only" msgstr "" @@ -1278,7 +1342,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/default/contact/index.html:93 templates/web/default/report/display.html:119 templates/web/default/report/display.html:154 templates/web/default/report/display.html:175 +#: templates/web/default/contact/index.html:93 templates/web/default/report/display.html:125 templates/web/default/report/display.html:162 templates/web/default/report/display.html:184 msgid "Post" msgstr "" @@ -1286,7 +1350,11 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: templates/web/default/report/updates.html:10 +#: templates/web/default/report/updates.html:11 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "" + +#: templates/web/default/report/updates.html:13 msgid "Posted by %s at %s" msgstr "" @@ -1310,7 +1378,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 +#: perllib/FixMyStreet/App/Controller/Admin.pm:774 msgid "Problem marked as open." msgstr "" @@ -1334,11 +1402,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:782 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:791 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 +#: perllib/FixMyStreet/Cobrand/Default.pm:809 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "" @@ -1354,15 +1422,15 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:498 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 msgid "Property type:" msgstr "" -#: templates/web/default/report/display.html:64 +#: templates/web/default/report/display.html:57 msgid "Provide an update" msgstr "" -#: templates/web/default/report/display.html:172 templates/web/default/report/new/fill_in_details_form.html:166 +#: templates/web/default/report/display.html:181 templates/web/default/report/new/fill_in_details_form.html:173 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -1378,27 +1446,27 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/default/alert/list.html:54 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:55 templates/web/default/reports/council.html:61 +#: templates/web/default/alert/list.html:54 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:48 templates/web/default/reports/council.html:61 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:820 perllib/FixMyStreet/Cobrand/Default.pm:834 +#: perllib/FixMyStreet/Cobrand/Default.pm:838 perllib/FixMyStreet/Cobrand/Default.pm:852 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:827 perllib/FixMyStreet/Cobrand/Default.pm:841 +#: perllib/FixMyStreet/Cobrand/Default.pm:845 perllib/FixMyStreet/Cobrand/Default.pm:859 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:850 perllib/FixMyStreet/Cobrand/Default.pm:864 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 +#: perllib/FixMyStreet/Cobrand/Default.pm:868 perllib/FixMyStreet/Cobrand/Default.pm:882 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 perllib/FixMyStreet/Cobrand/Default.pm:870 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 perllib/FixMyStreet/Cobrand/Default.pm:888 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1410,11 +1478,11 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:783 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:790 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/Default.pm:808 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1422,11 +1490,11 @@ msgstr "" msgid "RSS feed of recent local problems" msgstr "" -#: templates/web/default/report/display.html:55 +#: templates/web/default/report/display.html:48 msgid "RSS feed of updates to this problem" msgstr "" -#: templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:45 +#: templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:38 msgid "Receive email when updates are left on this problem." msgstr "" @@ -1438,7 +1506,7 @@ msgstr "" msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:72 +#: templates/web/default/index.html:62 msgid "Recently reported problems" msgstr "" @@ -1450,7 +1518,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:44 templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/report_edit.html:47 templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -1458,11 +1526,11 @@ msgstr "" msgid "Report Empty Homes" msgstr "" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:28 templates/web/fiksgatami/footer.html:5 +#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 msgid "Report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:268 +#: perllib/FixMyStreet/App/Controller/Rss.pm:274 msgid "Report on %s" msgstr "" @@ -1470,15 +1538,15 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: templates/web/default/my/my.html:69 +#: templates/web/default/my/my.html:74 msgid "Reported %s" msgstr "" -#: templates/web/default/my/my.html:67 +#: templates/web/default/my/my.html:72 msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 templates/web/default/contact/index.html:45 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" msgstr "" @@ -1486,31 +1554,31 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "Reported by %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 templates/web/default/contact/index.html:47 +#: perllib/FixMyStreet/DB/Result/Problem.pm:513 templates/web/default/contact/index.html:47 msgid "Reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:321 +#: perllib/FixMyStreet/DB/Result/Problem.pm:478 msgid "Reported by %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "Reported by %s in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:329 +#: perllib/FixMyStreet/DB/Result/Problem.pm:486 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category by %s at %s" msgstr "" @@ -1522,7 +1590,7 @@ msgstr "" msgid "Reports on and around the map" msgstr "" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "Resend report" msgstr "" @@ -1538,7 +1606,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 msgid "Search Abuse" msgstr "" @@ -1546,11 +1614,15 @@ msgstr "" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:840 templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 templates/web/default/admin/list_flagged.html:1 templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" -#: templates/web/default/admin/search_abuse.html:4 templates/web/default/admin/search_reports.html:5 +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 templates/web/default/admin/search_users.html:1 +msgid "Search Users" +msgstr "" + +#: templates/web/default/admin/search_abuse.html:4 templates/web/default/admin/search_reports.html:5 templates/web/default/admin/search_users.html:5 msgid "Search:" msgstr "" @@ -1558,15 +1630,15 @@ msgstr "" msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 msgid "Sent to %s %s later" msgstr "" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "Sent:" msgstr "" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 msgid "Service:" msgstr "" @@ -1587,7 +1659,7 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:205 templates/web/default/report/new/fill_in_details_form.html:201 +#: templates/web/default/report/display.html:216 templates/web/default/report/new/fill_in_details_form.html:210 msgid "Show my name publicly" msgstr "" @@ -1607,14 +1679,18 @@ msgstr "" msgid "Sign in or create an account" msgstr "" -#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:28 templates/web/emptyhomes/header.html:44 templates/web/lichfielddc/header.html:174 +#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:35 templates/web/emptyhomes/header.html:43 templates/web/fiksgatami/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:37 msgid "Sign out" msgstr "" -#: templates/web/default/header.html:27 templates/web/emptyhomes/header.html:43 templates/web/lichfielddc/header.html:174 +#: templates/web/default/header.html:34 templates/web/emptyhomes/header.html:42 templates/web/fiksgatami/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:36 msgid "Signed in as %s" msgstr "" +#: templates/web/default/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "" + #: templates/web/default/alert/index.html:31 msgid "Some photos of recent reports" msgstr "" @@ -1627,7 +1703,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:516 +#: perllib/FixMyStreet/Cobrand/Default.pm:517 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -1635,27 +1711,27 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:68 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:44 perllib/FixMyStreet/Geocode/Google.pm:60 +#: perllib/FixMyStreet/Geocode/Bing.pm:45 perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "" -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "Source code" msgstr "" -#: templates/web/default/admin/stats.html:41 +#: templates/web/default/admin/stats.html:64 msgid "Start Year:" msgstr "" -#: templates/web/default/admin/stats.html:43 +#: templates/web/default/admin/stats.html:66 msgid "Start day:" msgstr "" -#: templates/web/default/admin/stats.html:42 +#: templates/web/default/admin/stats.html:65 msgid "Start month:" msgstr "" @@ -1663,11 +1739,11 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:18 +#: templates/web/default/admin/report_edit.html:21 templates/web/default/admin/update_edit.html:18 templates/web/default/report/display.html:83 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:845 templates/web/default/admin/stats.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "" @@ -1675,11 +1751,11 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:110 templates/web/default/report/new/fill_in_details_form.html:148 templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 msgid "Submit" msgstr "" -#: templates/web/default/admin/report_edit.html:47 templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/report_edit.html:50 templates/web/default/admin/update_edit.html:51 templates/web/default/admin/user_edit.html:20 msgid "Submit changes" msgstr "" @@ -1687,7 +1763,7 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:50 +#: templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:43 msgid "Subscribe" msgstr "" @@ -1695,7 +1771,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:838 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:976 templates/web/default/admin/index.html:1 msgid "Summary" msgstr "" @@ -1703,11 +1779,11 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:842 templates/web/default/admin/questionnaire.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:14 msgid "Text" msgstr "" @@ -1755,7 +1831,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/Controller/Report/New.pm:783 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -1767,11 +1843,11 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:509 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 +#: perllib/FixMyStreet/Cobrand/Default.pm:510 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:517 +#: perllib/FixMyStreet/App/Controller/Admin.pm:558 msgid "That problem will now be resent." msgstr "" @@ -1866,7 +1942,7 @@ msgstr "" msgid "The latest reports within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:18 +#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -1874,7 +1950,7 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 perllib/FixMyStreet/App/Controller/Admin.pm:497 perllib/FixMyStreet/App/Controller/Admin.pm:630 perllib/FixMyStreet/App/Controller/Admin.pm:894 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 perllib/FixMyStreet/App/Controller/Admin.pm:1179 perllib/FixMyStreet/App/Controller/Admin.pm:538 perllib/FixMyStreet/App/Controller/Admin.pm:701 msgid "The requested URL was not found on this server." msgstr "" @@ -1886,7 +1962,7 @@ msgstr "" msgid "The subject and details of the problem will be public, plus your name if you give us permission." msgstr "" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -1894,7 +1970,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:605 perllib/FixMyStreet/App/Controller/Report/Update.pm:117 templates/web/default/auth/general.html:23 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 perllib/FixMyStreet/App/Controller/Report/Update.pm:125 templates/web/default/auth/general.html:23 msgid "There was a problem with your email/password combination. Passwords and user accounts are a brand <strong>new</strong> service, so you probably do not have one yet – please fill in the right hand side of this form to get one." msgstr "" @@ -1902,11 +1978,15 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "" +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +msgid "There was a problem with your update. Please try again." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:117 msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:211 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 msgid "There were problems with your update. Please see below." msgstr "" @@ -1914,14 +1994,18 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: bin/send-reports:181 +#: bin/send-reports:185 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: bin/send-reports:184 +#: bin/send-reports:188 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:761 +msgid "This information is required" +msgstr "" + #: templates/web/default/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" @@ -1938,31 +2022,43 @@ msgstr "" msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:903 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:96 +#: perllib/FixMyStreet/Cobrand/Default.pm:926 +msgid "This problem has been closed" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:922 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:101 msgid "This problem has been fixed" msgstr "" -#: templates/web/default/report/display.html:91 +#: templates/web/default/report/display.html:96 msgid "This problem has not been fixed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:899 +#: perllib/FixMyStreet/Cobrand/Default.pm:931 +msgid "This problem is in progress" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:918 msgid "This problem is old and of unknown status." msgstr "" #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +msgid "This report is currently marked as closed." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:70 +#: bin/send-reports:71 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:841 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -1980,11 +2076,11 @@ msgid "" "postcode or street name and area:" msgstr "" -#: bin/send-reports:76 +#: bin/send-reports:77 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/default/admin/index.html:36 templates/web/default/admin/questionnaire.html:24 templates/web/default/admin/stats.html:21 +#: templates/web/default/admin/index.html:36 templates/web/default/admin/questionnaire.html:24 templates/web/default/admin/stats.html:24 templates/web/default/admin/stats.html:43 msgid "Total" msgstr "" @@ -1992,7 +2088,7 @@ msgstr "" msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" -#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/update_edit.html:19 +#: templates/web/default/admin/report_edit.html:22 templates/web/default/admin/report_edit.html:25 templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "" @@ -2024,15 +2120,27 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/update_edit.html:33 +msgid "Update changed problem state to %s" +msgstr "" + +#: templates/web/default/admin/update_edit.html:35 +msgid "Update marked problem as fixed" +msgstr "" + +#: templates/web/default/admin/update_edit.html:37 +msgid "Update reopened problem" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:53 msgid "Update statuses" msgstr "" -#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:77 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:606 perllib/FixMyStreet/App/Controller/Admin.pm:693 +#: perllib/FixMyStreet/App/Controller/Admin.pm:647 perllib/FixMyStreet/App/Controller/Admin.pm:764 perllib/FixMyStreet/App/Controller/Admin.pm:844 msgid "Updated!" msgstr "" @@ -2048,11 +2156,11 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:969 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 msgid "User flagged" msgstr "" @@ -2060,7 +2168,7 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:295 perllib/FixMyStreet/App/Controller/Admin.pm:325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:304 perllib/FixMyStreet/App/Controller/Admin.pm:334 msgid "Values updated" msgstr "" @@ -2084,11 +2192,7 @@ msgstr "" msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -msgid "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:520 perllib/FixMyStreet/Geocode/Google.pm:63 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 perllib/FixMyStreet/Geocode/Bing.pm:47 perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "" @@ -2104,7 +2208,7 @@ msgstr "" msgid "We may contact you periodically to ask if anything has changed with the property you reported." msgstr "" -#: bin/send-reports:191 +#: bin/send-reports:195 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -2124,7 +2228,7 @@ msgstr "" msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" msgstr "" -#: templates/web/default/admin/council_contacts.html:25 templates/web/default/admin/council_edit.html:41 +#: templates/web/default/admin/council_contacts.html:32 templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -2132,7 +2236,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:493 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 msgid "Whole block of empty flats" msgstr "" @@ -2148,7 +2252,11 @@ msgstr "" msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: templates/web/default/admin/council_contacts.html:32 templates/web/default/admin/council_contacts.html:33 templates/web/default/admin/council_edit.html:5 templates/web/default/admin/list_updates.html:28 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:15 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 +#: templates/web/default/admin/stats.html:10 +msgid "Year" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:39 templates/web/default/admin/council_contacts.html:40 templates/web/default/admin/council_edit.html:5 templates/web/default/admin/list_updates.html:30 templates/web/default/admin/list_updates.html:31 templates/web/default/admin/list_updates.html:32 templates/web/default/admin/problem_row.html:19 templates/web/default/admin/report_edit.html:18 templates/web/default/admin/report_edit.html:40 templates/web/default/admin/search_users.html:23 templates/web/default/admin/update_edit.html:15 templates/web/default/questionnaire/creator_fixed.html:14 templates/web/default/questionnaire/index.html:107 templates/web/default/questionnaire/index.html:68 msgid "Yes" msgstr "" @@ -2168,7 +2276,7 @@ msgstr "" msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:3 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 +#: templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_none.html:16 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" @@ -2176,11 +2284,11 @@ 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 "" -#: templates/web/default/questionnaire/index.html:94 templates/web/default/report/new/fill_in_details_form.html:89 +#: templates/web/default/questionnaire/index.html:94 templates/web/default/report/new/fill_in_details_form.html:93 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" -#: templates/web/default/report/display.html:106 +#: templates/web/default/report/display.html:112 msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" @@ -2212,7 +2320,7 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 perllib/FixMyStreet/App/Controller/Report/Update.pm:131 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2220,7 +2328,7 @@ msgstr "" msgid "You must now click the link in the email we've just sent you — if you do not, %s." msgstr "" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "You really want to resend?" msgstr "" @@ -2232,11 +2340,11 @@ msgstr "" msgid "Your email address:" msgstr "" -#: templates/web/default/alert/list.html:122 templates/web/default/report/display.html:128 templates/web/default/report/new/fill_in_details_form.html:120 +#: templates/web/default/alert/list.html:122 templates/web/default/report/display.html:134 templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "" -#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/display.html:199 templates/web/default/report/new/fill_in_details_form.html:194 +#: templates/web/default/auth/general.html:59 templates/web/default/contact/index.html:68 templates/web/default/report/display.html:210 templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "" @@ -2244,11 +2352,11 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/default/footer.html:7 +#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 templates/web/reading/footer.html:7 msgid "Your reports" msgstr "" -#: templates/web/default/my/my.html:40 +#: templates/web/default/my/my.html:45 msgid "Your updates" msgstr "" @@ -2272,15 +2380,19 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:248 msgid "less than a minute" msgstr "" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:18 +msgid "marked as %s" +msgstr "" + +#: templates/web/default/report/updates.html:16 msgid "marked as fixed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:109 templates/web/default/admin/questionnaire.html:15 templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" @@ -2296,7 +2408,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:14 +#: templates/web/default/report/updates.html:17 msgid "reopened" msgstr "" @@ -2304,15 +2416,15 @@ msgstr "" msgid "the local council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:363 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "the map was not used so pin location may be inaccurate" msgstr "" -#: bin/send-reports:172 +#: bin/send-reports:176 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:221 +#: perllib/Utils.pm:222 msgid "today" msgstr "" @@ -2320,6 +2432,14 @@ msgstr "" msgid "used map" msgstr "" +#: templates/web/default/admin/update_edit.html:26 +msgid "user is from same council as problem - %d" +msgstr "" + +#: templates/web/default/admin/update_edit.html:29 +msgid "user is problem owner" +msgstr "" + #: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:3 msgid "ward" msgstr "" @@ -2348,7 +2468,7 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front/stats.html:19 +#: templates/web/default/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -2362,21 +2482,21 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:14 +#: templates/web/default/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:25 +#: templates/web/default/front/stats.html:23 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:31 +#: templates/web/default/front/stats.html:29 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index be5260a1b..0e6f7ecac 100644 --- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po +++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-08-18 11:07+0100\n" +"POT-Creation-Date: 2011-10-21 15:56+0100\n" "PO-Revision-Date: 2009-07-10 14:20-0000\n" "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n" "Language-Team: mySociety\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:179 perllib/FixMyStreet/DB/Result/Problem.pm:378 +#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 msgid " and " msgstr "" @@ -30,8 +30,8 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" #: templates/web/default/report/new/councils_text_all.html:10 #: templates/web/default/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_none.html:15 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:14 +#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -53,12 +53,12 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 #, fuzzy msgid "%d day" msgstr "diwrnod" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 #, fuzzy msgid "%d days" msgstr "diwrnod" @@ -67,12 +67,12 @@ msgstr "diwrnod" msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 #, fuzzy msgid "%d hour" msgstr "awr" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 #, fuzzy msgid "%d hours" msgstr "awr" @@ -82,12 +82,12 @@ msgstr "awr" msgid "%d live updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 #, fuzzy msgid "%d minute" msgstr "munud" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 #, fuzzy msgid "%d minutes" msgstr "munud" @@ -96,12 +96,12 @@ msgstr "munud" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 #, fuzzy msgid "%d week" msgstr "wythnos" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 #, fuzzy msgid "%d weeks" msgstr "wythnos" @@ -111,21 +111,21 @@ msgstr "wythnos" msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/Cobrand/Default.pm:826 -#: perllib/FixMyStreet/Cobrand/Default.pm:840 +#: perllib/FixMyStreet/Cobrand/Default.pm:844 +#: perllib/FixMyStreet/Cobrand/Default.pm:858 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: perllib/FixMyStreet/DB/Result/Problem.pm:466 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:311 +#: perllib/FixMyStreet/DB/Result/Problem.pm:468 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:857 -#: perllib/FixMyStreet/Cobrand/Default.pm:871 +#: perllib/FixMyStreet/Cobrand/Default.pm:875 +#: perllib/FixMyStreet/Cobrand/Default.pm:889 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -165,7 +165,7 @@ msgstr " " msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/report/new/fill_in_details_form.html:208 +#: templates/web/default/report/new/fill_in_details_form.html:217 msgid "(optional)" msgstr "(dewisol)" @@ -174,28 +174,28 @@ msgstr "(dewisol)" msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/report/new/fill_in_details_form.html:202 +#: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: templates/web/default/report/display.html:206 +#: templates/web/default/report/display.html:217 #, fuzzy msgid "(we never show your email)" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin.pm:279 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:532 -#: perllib/FixMyStreet/DB/Result/Problem.pm:206 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:490 -#: perllib/FixMyStreet/DB/Result/Problem.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -204,7 +204,7 @@ msgstr "-- Dewiswch fath o eiddo --" msgid ". You can <a href=\"%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." -#: templates/web/default/footer.html:13 +#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 msgid "" "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" "\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" @@ -342,40 +342,40 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:162 #, fuzzy msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/report/display.html:160 +#: templates/web/default/report/display.html:170 #, fuzzy msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 -#: templates/web/default/report/new/fill_in_details_form.html:136 +#: templates/web/default/report/display.html:148 +#: templates/web/default/report/new/fill_in_details_form.html:140 #, fuzzy msgid "<strong>Yes</strong>, I have a password:" msgstr "Adrodd am eiddo gwag a gweld y rhain" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:32 +#: templates/web/emptyhomes/header.html:31 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:50 +#: templates/web/default/admin/council_contacts.html:57 msgid "Add new category" msgstr "" -#: templates/web/default/my/my.html:51 +#: templates/web/default/my/my.html:56 msgid "Added %s" msgstr "" -#: templates/web/default/auth/change_password.html:31 +#: templates/web/default/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -387,7 +387,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:211 +#: templates/web/default/report/display.html:222 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" @@ -399,8 +399,8 @@ msgstr "" msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:6 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 msgid "Reports" msgstr "Adroddiadau" @@ -487,17 +487,21 @@ msgstr "" msgid "Ban email address" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/footer.html:16 +#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "" -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" -#: templates/web/default/admin/council_contacts.html:19 +#: templates/web/default/admin/stats.html:80 +msgid "By Date" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:26 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 @@ -509,26 +513,47 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:507 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:533 -#: templates/web/default/admin/council_contacts.html:56 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 +#: templates/web/default/admin/council_contacts.html:63 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: bin/send-reports:176 +#: bin/send-reports:180 #, fuzzy msgid "Category: %s" msgstr "Categori:" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 -#: templates/web/default/auth/change_password.html:35 +#: templates/web/default/auth/change_password.html:33 msgid "Change Password" msgstr "" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 +msgid "Closed" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#, fuzzy +msgid "Closed by council" +msgstr "Ni roddwyd gwybod i'r cyngor am hyn" + +#: templates/web/default/my/my.html:32 +#, fuzzy +msgid "Closed reports" +msgstr "Cuddio hen adroddiadau " + +#: templates/web/default/admin/problem_row.html:25 +msgid "Closed:" +msgstr "" + #: templates/web/default/around/display_location.html:102 #: templates/web/default/around/display_location.html:104 msgid "Closest nearby empty properties <small>(within %skm)</small>" @@ -539,22 +564,39 @@ msgid "Co-ordinates:" msgstr "" #: templates/web/default/admin/list_flagged.html:16 -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:13 #: templates/web/default/admin/search_reports.html:19 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:41 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/update_edit.html:25 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/update_edit.html:40 msgid "Cobrand:" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#, fuzzy +msgid "Configuration updated" +msgstr "Cadarnhau" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +msgid "Configuration updated - contacts will be generated automatically later" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:119 +msgid "Configure Open311" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:96 +msgid "Configure Open311 integration" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:33 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" @@ -574,8 +616,8 @@ msgstr "Cadarnhau" msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:21 -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:28 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -584,16 +626,16 @@ msgid "Confirmed" msgstr "Cadarnhau" #: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:34 #, fuzzy msgid "Confirmed:" msgstr "Cadarnhau" -#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:10 msgid "Contact" msgstr "Cysylltu" -#: templates/web/default/footer.html:17 +#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 #, fuzzy msgid "Contact reportemptyhomes.com" msgstr "Adroddiadau newydd ar reportemptyhomes.com" @@ -609,18 +651,20 @@ msgstr "Cysylltwch â Ni" msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:965 -#: perllib/FixMyStreet/App/Controller/Admin.pm:993 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 msgid "Could not find user" msgstr "" #: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/list_updates.html:12 #: templates/web/default/admin/search_reports.html:16 +#: templates/web/default/admin/search_users.html:14 #, fuzzy msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:977 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -631,12 +675,19 @@ msgstr "Cysylltwch â Ni" msgid "Council contacts for %s" msgstr "" +#: templates/web/default/admin/stats.html:84 +#: templates/web/default/admin/user_edit.html:12 +#, fuzzy +msgid "Council:" +msgstr "cyngor" + #: templates/web/default/admin/council_list.html:36 #, fuzzy msgid "Councils" msgstr "cyngor" -#: templates/web/default/admin/stats.html:10 +#: templates/web/default/admin/stats.html:12 +#: templates/web/default/admin/stats.html:32 #, fuzzy msgid "Count" msgstr "Cysylltu" @@ -646,7 +697,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:87 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -657,12 +708,12 @@ msgstr "Categori:" msgid "Created" msgstr "" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/update_edit.html:42 msgid "Created:" msgstr "" -#: templates/web/default/admin/stats.html:9 +#: templates/web/default/admin/stats.html:31 msgid "Current state" msgstr "" @@ -670,8 +721,8 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:22 -#: templates/web/default/admin/council_contacts.html:69 +#: templates/web/default/admin/council_contacts.html:29 +#: templates/web/default/admin/council_contacts.html:76 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" @@ -695,8 +746,9 @@ msgstr "Diweddariadau i reportemptyhomes.com" msgid "Don’t know" msgstr "Ddim yn gwybod" -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/search_users.html:24 msgid "Edit" msgstr "" @@ -710,26 +762,32 @@ msgstr "Gweld eiddo gwag" msgid "Editing update %d" msgstr "Cyflwyno'ch diweddariad" +#: templates/web/default/admin/user_edit.html:1 +#, fuzzy +msgid "Editing user %d" +msgstr "Cyflwyno'ch diweddariad" + #: templates/web/default/admin/council_edit.html:45 msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/council_contacts.html:27 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 +#: templates/web/default/admin/search_users.html:13 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:938 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 msgid "Email already in abuse list" msgstr "" @@ -737,28 +795,29 @@ msgstr "" msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: templates/web/default/report/display.html:42 +#: templates/web/default/report/display.html:35 msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:61 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:46 +#: templates/web/default/report/display.html:39 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:492 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:491 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:494 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -766,24 +825,24 @@ msgstr "Swyddfa wag neu fan masnachol gwag arall" msgid "Empty property details form" msgstr "Ffurflen manylion eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:495 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:496 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." -#: templates/web/default/admin/stats.html:47 +#: templates/web/default/admin/stats.html:70 msgid "End Year:" msgstr "" -#: templates/web/default/admin/stats.html:49 +#: templates/web/default/admin/stats.html:72 #, fuzzy msgid "End day:" msgstr "diwrnod" -#: templates/web/default/admin/stats.html:48 +#: templates/web/default/admin/stats.html:71 msgid "End month:" msgstr "" @@ -799,8 +858,8 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:167 -#: templates/web/default/report/new/fill_in_details_form.html:161 +#: templates/web/default/report/display.html:177 +#: templates/web/default/report/new/fill_in_details_form.html:169 #, fuzzy msgid "Enter a new password:" msgstr "Ychwanegwch neges" @@ -846,8 +905,9 @@ msgstr "Adroddiadau newydd ar reportemptyhomes.com" msgid "First time" msgstr "Y tro cyntaf" -#: templates/web/default/header.html:22 -#: templates/web/fiksgatami/header.html:13 +#: templates/web/default/header.html:29 +#: templates/web/fiksgatami/header.html:16 +#: templates/web/reading/header.html:31 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" @@ -898,15 +958,26 @@ msgstr "" "rhanbarth a'r cyngor, ond dim ond yn yr hysbysiad \"O fewn y ffin\" \n" "y bydd yn ymddangos yn achos y cyngor sir." -#: templates/web/default/front/stats.html:7 -msgid "reportemptyhomes.com updates" -msgstr "Diweddariadau i reportemptyhomes.com" - #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 msgid "Fixed" msgstr "" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 +#, fuzzy +msgid "Fixed - Council" +msgstr "cyngor" + +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 +#, fuzzy +msgid "Fixed - User" +msgstr "Cuddio hen adroddiadau " + #: templates/web/default/my/my.html:27 #, fuzzy msgid "Fixed reports" @@ -920,7 +991,12 @@ msgstr "" msgid "Flag user" msgstr "" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/search_users.html:15 +msgid "Flagged" +msgstr "" + +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" @@ -958,7 +1034,7 @@ msgstr "Rhowch borthiant RSS i mi" msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 #, fuzzy msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" @@ -985,8 +1061,8 @@ msgstr "" "dyma'ch tro cyntaf?" #: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:31 -#: templates/web/fiksgatami/footer.html:8 +#: templates/web/emptyhomes/header.html:30 +#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 msgid "FAQs" msgstr "Cwestiynau Cyffredin" @@ -996,6 +1072,7 @@ msgstr "" "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer ‘%s’." #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:19 #, fuzzy msgid "Hidden" @@ -1017,7 +1094,7 @@ msgstr "" msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:546 +#: perllib/FixMyStreet/App/Controller/Admin.pm:587 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1035,7 +1112,7 @@ msgstr "" "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r " "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:232 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" @@ -1050,7 +1127,7 @@ msgid "ID" msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:12 msgid "" "If you submit an empty property here the subject and details of the empty " "property will be public, but the empty property will <strong>not</strong> be " @@ -1100,6 +1177,13 @@ msgstr "ID Anghyfreithlon" msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 +msgid "In Progress" +msgstr "" + #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " @@ -1112,32 +1196,40 @@ msgstr "" msgid "Include stale reports" msgstr "Cynnwys hen adroddiadau" -#: templates/web/default/admin/stats.html:53 +#: templates/web/default/admin/stats.html:76 #, fuzzy msgid "Include unconfirmed reports" msgstr "Cynnwys hen adroddiadau" -#: perllib/FixMyStreet/App/Controller/Open311.pm:355 +#: perllib/FixMyStreet/App/Controller/Open311.pm:358 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:340 +#: perllib/FixMyStreet/App/Controller/Open311.pm:343 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:785 +#: perllib/FixMyStreet/App/Controller/Admin.pm:897 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" -#: perllib/FixMyStreet/App/Controller/Open311.pm:423 +#: perllib/FixMyStreet/App/Controller/Open311.pm:426 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:887 msgid "Invalid start date" msgstr "" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:86 +#, fuzzy +msgid "Investigating" +msgstr "Mordwyo " + #: templates/web/emptyhomes/tokens/confirm_problem.html:12 #: templates/web/emptyhomes/tokens/confirm_problem.html:14 #, fuzzy @@ -1163,25 +1255,25 @@ msgstr "" "fel y gallwch weld beth sy'n digwydd." #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:149 -#: templates/web/default/report/new/fill_in_details_form.html:143 +#: templates/web/default/report/display.html:157 +#: templates/web/default/report/new/fill_in_details_form.html:149 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:23 +#: templates/web/default/admin/council_contacts.html:30 msgid "Last editor" msgstr "" -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 #, fuzzy msgid "Last update:" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:26 msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 msgid "List Flagged" msgstr "" @@ -1214,8 +1306,8 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:7 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 +#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" @@ -1230,28 +1322,20 @@ msgid "" "licenses/by-sa/2.0/\">CC-BY-SA</a>" msgstr "" -#: perllib/FixMyStreet/Map/OSM/StreetView.pm:27 -msgid "" -"Map contains Ordnance Survey data © Crown copyright and database right " -"2010." -msgstr "" - -#: perllib/FixMyStreet/Map/FMS.pm:24 -msgid "" -"Map contains Ordnance Survey data © Crown copyright and database right " -"2010.<br>© 2011 <a href=\"http://www.bing.com/maps/\">Microsoft</a>. " -"© AND, Navteq, Ordnance Survey." -msgstr "" - #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Neges:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:431 +#: perllib/FixMyStreet/App/Controller/Open311.pm:434 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/default/report/display.html:38 +#: templates/web/default/admin/stats.html:11 +#, fuzzy +msgid "Month" +msgstr "Cysylltu" + +#: templates/web/default/report/display.html:31 msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" @@ -1259,18 +1343,21 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/default/admin/list_flagged.html:34 #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 +#: templates/web/default/admin/search_users.html:12 #: templates/web/default/reports/index.html:10 #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:9 msgid "Name" msgstr "Enw" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/user_edit.html:10 msgid "Name:" msgstr "Enw:" #: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Mordwyo " @@ -1280,13 +1367,14 @@ msgid "" "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:564 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:558 +#: perllib/FixMyStreet/Cobrand/Default.pm:553 +#: perllib/FixMyStreet/Cobrand/Default.pm:588 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1296,7 +1384,7 @@ msgstr "" msgid "Nearly Done! Now check your email..." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:300 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 msgid "New category contact added" msgstr "" @@ -1380,13 +1468,15 @@ msgstr "" msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:32 -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:4 -#: templates/web/default/admin/list_updates.html:28 +#: templates/web/default/admin/list_updates.html:30 +#: templates/web/default/admin/list_updates.html:31 +#: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:109 @@ -1394,7 +1484,13 @@ msgstr "Newydd!" msgid "No" msgstr "Nac ydw" -#: perllib/FixMyStreet/DB/Result/Problem.pm:189 +#: templates/web/default/admin/stats.html:85 +#: templates/web/default/admin/user_edit.html:13 +#, fuzzy +msgid "No council" +msgstr "cyngor" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:297 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1438,20 +1534,20 @@ msgstr "Wedi adrodd o'r blaen" msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:24 +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/council_edit.html:46 #, fuzzy msgid "Note" msgstr "Nac ydw" -#: templates/web/default/admin/stats.html:28 +#: templates/web/default/admin/stats.html:51 msgid "" "Note that when including unconfirmed reports we use the date the report was " "created which may not be in the same month the report was confirmed so the " "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:80 #: templates/web/default/admin/council_edit.html:31 #, fuzzy msgid "Note:" @@ -1461,20 +1557,20 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/default/report/new/fill_in_details_form.html:127 +#: templates/web/default/report/new/fill_in_details_form.html:131 msgid "" "Now to submit your report… do you have a reportemptyhomes.com " "password?" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/display.html:139 msgid "" "Now to submit your update… do you have a reportemptyhomes.com " "password?" msgstr "" -#: templates/web/default/report/display.html:33 -#: templates/web/default/report/updates.html:19 +#: templates/web/default/report/display.html:26 +#: templates/web/default/report/updates.html:23 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" @@ -1515,6 +1611,7 @@ msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/report/display.html:85 msgid "Open" msgstr "" @@ -1548,14 +1645,14 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: bin/send-reports:171 bin/send-reports:180 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:532 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:903 -#: perllib/FixMyStreet/DB/Result/Problem.pm:318 -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 -#: perllib/FixMyStreet/DB/Result/Problem.pm:338 -#: perllib/FixMyStreet/DB/Result/Problem.pm:350 +#: bin/send-reports:175 bin/send-reports:184 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 +#: perllib/FixMyStreet/DB/Result/Problem.pm:475 +#: perllib/FixMyStreet/DB/Result/Problem.pm:485 +#: perllib/FixMyStreet/DB/Result/Problem.pm:495 +#: perllib/FixMyStreet/DB/Result/Problem.pm:507 msgid "Other" msgstr "Arall" @@ -1565,27 +1662,33 @@ msgid "" "\">available on GitHub</a>." msgstr "" +#: templates/web/default/admin/list_updates.html:11 +#, fuzzy +msgid "Owner" +msgstr "Arall" + #: templates/web/default/errors/page_error_404_not_found.html:1 #: templates/web/default/errors/page_error_404_not_found.html:3 msgid "Page Not Found" msgstr "" #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 msgid "Partial" msgstr "" -#: templates/web/default/auth/change_password.html:27 +#: templates/web/default/auth/change_password.html:25 msgid "Password:" msgstr "" -#: bin/send-reports:68 templates/web/default/admin/report_edit.html:29 -#: templates/web/default/report/new/fill_in_details_form.html:206 +#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Rhif ffôn:" #: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:109 -#: templates/web/default/report/new/fill_in_details_form.html:98 +#: templates/web/default/report/display.html:115 +#: templates/web/default/report/new/fill_in_details_form.html:102 msgid "Photo:" msgstr "Ffotograff:" @@ -1593,16 +1696,19 @@ msgstr "Ffotograff:" msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/index.html:63 -msgid "Photos of recent reports" -msgstr "Ffotograffau o adroddiadau diweddar" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:86 +msgid "Planned" +msgstr "" #: templates/web/default/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "" -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:19 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" @@ -1617,14 +1723,14 @@ msgstr "Rhowch eich cyfeiriad e-bost" msgid "Please check your email address is correct" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:686 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:705 #: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/DB/Result/Problem.pm:208 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:316 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:214 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" @@ -1649,22 +1755,22 @@ msgid "" "for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:113 msgid "Please enter a message" msgstr "Ychwanegwch neges" -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:17 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:15 #, fuzzy msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:183 +#: perllib/FixMyStreet/DB/Result/Problem.pm:291 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" -#: perllib/FixMyStreet/DB/Result/User.pm:94 +#: perllib/FixMyStreet/DB/Result/User.pm:96 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" @@ -1673,18 +1779,18 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys" msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:186 +#: perllib/FixMyStreet/DB/Result/Problem.pm:294 msgid "Please enter some details" msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:91 +#: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: perllib/FixMyStreet/DB/Result/Problem.pm:201 +#: perllib/FixMyStreet/DB/Result/Problem.pm:309 msgid "" "Please enter your full name - if you do not wish your name to be shown on " "the site, untick the box" @@ -1693,9 +1799,9 @@ msgstr "" "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:194 -#: perllib/FixMyStreet/DB/Result/User.pm:87 +#: perllib/FixMyStreet/DB/Result/Comment.pm:110 +#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/User.pm:89 msgid "Please enter your name" msgstr "Cofnodwch eich enw" @@ -1720,7 +1826,7 @@ msgstr "" "yn ei gwneud hi'n anodd ei darllen, fel y mae diffyg atalnodi.\n" #: templates/web/default/report/new/fill_in_details_text.html:1 -#: templates/web/default/report/new/fill_in_details_text.html:8 +#: templates/web/default/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the empty property below." msgstr "Llenwch fanylion yr eiddo gwag isod." @@ -1745,11 +1851,11 @@ msgstr "" "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n" "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" -#: templates/web/default/report/display.html:69 +#: templates/web/default/report/display.html:62 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1766,16 +1872,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 msgid "" "Please say whether you've ever reported an empty property to your council " "before" @@ -1791,7 +1897,7 @@ msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" msgid "Please select the type of alert you want" msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:227 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please state whether or not the empty property has been returned to use" msgstr "" "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio" @@ -1800,7 +1906,7 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:774 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -1809,9 +1915,9 @@ msgid "Please write a message" msgstr "Ysgrifennwch neges" #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:154 -#: templates/web/default/report/display.html:175 +#: templates/web/default/report/display.html:125 +#: templates/web/default/report/display.html:162 +#: templates/web/default/report/display.html:184 msgid "Post" msgstr "Postio" @@ -1819,7 +1925,12 @@ msgstr "Postio" msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: templates/web/default/report/updates.html:10 +#: templates/web/default/report/updates.html:11 +#, fuzzy +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "Cofnodwyd gan %s am %s" + +#: templates/web/default/report/updates.html:13 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" @@ -1847,7 +1958,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 +#: perllib/FixMyStreet/App/Controller/Admin.pm:774 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -1878,13 +1989,13 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:782 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:791 +#: perllib/FixMyStreet/Cobrand/Default.pm:809 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -1904,16 +2015,16 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:498 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 msgid "Property type:" msgstr "Math o eiddo:" -#: templates/web/default/report/display.html:64 +#: templates/web/default/report/display.html:57 msgid "Provide an update" msgstr "Rhowch ddiweddariad" -#: templates/web/default/report/display.html:172 -#: templates/web/default/report/new/fill_in_details_form.html:166 +#: templates/web/default/report/display.html:181 +#: templates/web/default/report/new/fill_in_details_form.html:173 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." @@ -1937,32 +2048,32 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire %d sent for empty property %d" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" #: templates/web/default/alert/list.html:54 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:55 +#: templates/web/default/report/display.html:48 #: templates/web/default/reports/council.html:61 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:820 -#: perllib/FixMyStreet/Cobrand/Default.pm:834 +#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:852 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:827 -#: perllib/FixMyStreet/Cobrand/Default.pm:841 +#: perllib/FixMyStreet/Cobrand/Default.pm:845 +#: perllib/FixMyStreet/Cobrand/Default.pm:859 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:850 -#: perllib/FixMyStreet/Cobrand/Default.pm:864 +#: perllib/FixMyStreet/Cobrand/Default.pm:868 +#: perllib/FixMyStreet/Cobrand/Default.pm:882 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -1970,8 +2081,8 @@ msgstr "Porthiant RSS %s" msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 -#: perllib/FixMyStreet/Cobrand/Default.pm:870 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 +#: perllib/FixMyStreet/Cobrand/Default.pm:888 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -1984,14 +2095,14 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:783 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:790 +#: perllib/FixMyStreet/Cobrand/Default.pm:808 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 #, fuzzy msgid "RSS feed of empty properties within %s ward" @@ -2002,12 +2113,12 @@ msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" -#: templates/web/default/report/display.html:55 +#: templates/web/default/report/display.html:48 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" #: templates/web/default/alert/updates.html:9 -#: templates/web/default/report/display.html:45 +#: templates/web/default/report/display.html:38 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2026,7 +2137,7 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:72 +#: templates/web/default/index.html:62 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -2042,8 +2153,8 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" @@ -2051,12 +2162,12 @@ msgstr "" msgid "Report Empty Homes" msgstr "Adrodd am Eiddo Gwag" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:5 +#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: perllib/FixMyStreet/App/Controller/Rss.pm:268 +#: perllib/FixMyStreet/App/Controller/Rss.pm:274 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" @@ -2065,17 +2176,17 @@ msgstr "Adroddiadau" msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/my/my.html:69 +#: templates/web/default/my/my.html:74 #, fuzzy msgid "Reported %s" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:67 +#: templates/web/default/my/my.html:72 #, fuzzy msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 #: templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddi-enw am %s" @@ -2085,32 +2196,32 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:513 #: templates/web/default/contact/index.html:47 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:321 +#: perllib/FixMyStreet/DB/Result/Problem.pm:478 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:329 +#: perllib/FixMyStreet/DB/Result/Problem.pm:486 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2125,7 +2236,7 @@ msgstr "Adrodd am eiddo gwag" msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 #, fuzzy msgid "Resend report" msgstr "Cuddio hen adroddiadau " @@ -2144,7 +2255,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 #, fuzzy msgid "Search Abuse" msgstr "Adroddiadau cryno" @@ -2153,15 +2264,22 @@ msgstr "Adroddiadau cryno" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:840 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: templates/web/default/admin/search_users.html:1 +#, fuzzy +msgid "Search Users" +msgstr "Adroddiadau cryno" + #: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 +#: templates/web/default/admin/search_users.html:5 msgid "Search:" msgstr "" @@ -2175,16 +2293,16 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 #, fuzzy msgid "Sent:" msgstr "Pwnc:" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 msgid "Service:" msgstr "" @@ -2228,8 +2346,8 @@ msgstr "" "cat=20'>Gwybodaeth\n" "bellach am ein gwaith ar gartrefi gwag</a>.\n" -#: templates/web/default/report/display.html:205 -#: templates/web/default/report/new/fill_in_details_form.html:201 +#: templates/web/default/report/display.html:216 +#: templates/web/default/report/new/fill_in_details_form.html:210 msgid "Show my name publicly" msgstr "" @@ -2251,18 +2369,26 @@ msgid "Sign in or create an account" msgstr "" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:28 -#: templates/web/emptyhomes/header.html:44 -#: templates/web/lichfielddc/header.html:174 +#: templates/web/default/header.html:35 +#: templates/web/emptyhomes/header.html:43 +#: templates/web/fiksgatami/header.html:22 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:37 msgid "Sign out" msgstr "" -#: templates/web/default/header.html:27 -#: templates/web/emptyhomes/header.html:43 -#: templates/web/lichfielddc/header.html:174 +#: templates/web/default/header.html:34 +#: templates/web/emptyhomes/header.html:42 +#: templates/web/fiksgatami/header.html:21 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:36 msgid "Signed in as %s" msgstr "" +#: templates/web/default/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "" + #: templates/web/default/alert/index.html:31 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2276,7 +2402,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:516 +#: perllib/FixMyStreet/Cobrand/Default.pm:517 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2285,32 +2411,32 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: perllib/FixMyStreet/Geocode/Bing.pm:44 +#: perllib/FixMyStreet/Geocode/Bing.pm:45 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "Source code" msgstr "" -#: templates/web/default/admin/stats.html:41 +#: templates/web/default/admin/stats.html:64 #, fuzzy msgid "Start Year:" msgstr "Diweddariad:" -#: templates/web/default/admin/stats.html:43 +#: templates/web/default/admin/stats.html:66 #, fuzzy msgid "Start day:" msgstr "Diweddariad:" -#: templates/web/default/admin/stats.html:42 +#: templates/web/default/admin/stats.html:65 msgid "Start month:" msgstr "" @@ -2323,11 +2449,12 @@ msgstr "Diweddariad:" #: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/report/display.html:83 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:845 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -2340,14 +2467,15 @@ msgid "Subject:" msgstr "Pwnc:" #: templates/web/default/questionnaire/creator_fixed.html:19 -#: templates/web/default/report/new/fill_in_details_form.html:110 -#: templates/web/default/report/new/fill_in_details_form.html:148 -#: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/new/fill_in_details_form.html:114 +#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:176 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:47 -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/user_edit.html:20 #, fuzzy msgid "Submit changes" msgstr "Anfon" @@ -2357,7 +2485,7 @@ msgid "Submit questionnaire" msgstr "Anfon yr holiadur" #: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:50 +#: templates/web/default/report/display.html:43 msgid "Subscribe" msgstr "Tanysgrifio" @@ -2365,7 +2493,7 @@ msgstr "Tanysgrifio" msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:838 +#: perllib/FixMyStreet/App/Controller/Admin.pm:976 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2377,12 +2505,12 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:842 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:14 msgid "Text" msgstr "" @@ -2476,7 +2604,7 @@ msgstr "" "i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag " "cyn hyn?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:783 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2497,12 +2625,12 @@ msgstr "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Cobrand/Default.pm:509 +#: perllib/FixMyStreet/Cobrand/Default.pm:510 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:517 +#: perllib/FixMyStreet/App/Controller/Admin.pm:558 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -2666,8 +2794,8 @@ msgstr "" "Yr adroddiadau diweddaraf o fewn ffin {{NAME}} y mae defnyddwyr wedi rhoi " "gwybod amdanynt" -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:18 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -2676,10 +2804,10 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 -#: perllib/FixMyStreet/App/Controller/Admin.pm:630 -#: perllib/FixMyStreet/App/Controller/Admin.pm:894 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 +#: perllib/FixMyStreet/App/Controller/Admin.pm:538 +#: perllib/FixMyStreet/App/Controller/Admin.pm:701 msgid "The requested URL was not found on this server." msgstr "" @@ -2696,7 +2824,7 @@ msgid "" "if you give us permission." msgstr "" -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -2710,8 +2838,8 @@ msgid "" "later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:605 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 msgid "" "There was an empty property with your email/password combination. Passwords " @@ -2726,11 +2854,16 @@ msgid "" "again." msgstr "" +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#, fuzzy +msgid "There was an empty property with your update. Please try again." +msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" + #: perllib/FixMyStreet/App/Controller/Contact.pm:117 msgid "There were problems with your report. Please see below." msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:211 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2740,7 +2873,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: bin/send-reports:181 +#: bin/send-reports:185 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -2748,13 +2881,17 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: bin/send-reports:184 +#: bin/send-reports:188 msgid "" "This email has been sent to several councils covering the location of the " "empty property, 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:761 +msgid "This information is required" +msgstr "" + #: templates/web/default/debug_header.html:3 #, fuzzy msgid "" @@ -2780,31 +2917,46 @@ msgstr "" "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i " "weld yr adroddiadau a anfonwyd ato." -#: perllib/FixMyStreet/Cobrand/Default.pm:903 +#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#, fuzzy +msgid "This empty property has been closed" +msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" + +#: perllib/FixMyStreet/Cobrand/Default.pm:922 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:101 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: templates/web/default/report/display.html:91 +#: templates/web/default/report/display.html:96 #, fuzzy msgid "This empty property has not been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:899 +#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#, fuzzy +msgid "This empty property is in progress" +msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" + +#: perllib/FixMyStreet/Cobrand/Default.pm:918 msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 #, fuzzy +msgid "This report is currently marked as closed." +msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 +#, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:70 +#: bin/send-reports:71 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -2812,7 +2964,7 @@ msgstr "" "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i " "ddarparu gan y defnyddiwr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:841 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2841,13 +2993,14 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: bin/send-reports:76 +#: bin/send-reports:77 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/questionnaire.html:24 -#: templates/web/default/admin/stats.html:21 +#: templates/web/default/admin/stats.html:24 +#: templates/web/default/admin/stats.html:43 msgid "Total" msgstr "" @@ -2856,6 +3009,7 @@ msgid "Unable to look up areas in MaPit. Please try again later." msgstr "" #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "" @@ -2891,17 +3045,37 @@ msgstr "" msgid "Update by {{name}}" msgstr "Diweddariadau yn ôl {{name}}" -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/update_edit.html:33 +#, fuzzy +msgid "Update changed empty property state to %s" +msgstr "" +"Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " +"ddefnyddio." + +#: templates/web/default/admin/update_edit.html:35 +#, fuzzy +msgid "Update marked empty property as returned to use" +msgstr "" +"Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w " +"ddefnyddio." + +#: templates/web/default/admin/update_edit.html:37 +#, fuzzy +msgid "Update reopened empty property" +msgstr "Sut i roi gwybod am eiddo gwag" + +#: templates/web/default/admin/council_contacts.html:53 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:77 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:606 -#: perllib/FixMyStreet/App/Controller/Admin.pm:693 +#: perllib/FixMyStreet/App/Controller/Admin.pm:647 +#: perllib/FixMyStreet/App/Controller/Admin.pm:764 +#: perllib/FixMyStreet/App/Controller/Admin.pm:844 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -2920,11 +3094,11 @@ msgstr "Diweddariadau am {{title}}" msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:969 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 msgid "User flagged" msgstr "" @@ -2932,8 +3106,8 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:295 -#: perllib/FixMyStreet/App/Controller/Admin.pm:325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:334 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -2961,15 +3135,8 @@ msgstr "Gweld eiddo gwag" msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -msgid "" -"We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " -"any maps for the region." -msgstr "" -"Nid ydym yn ymdrin â Gogledd Iwerddon, yn anffodus, gan nad yw ein trwydded " -"yn cynnwys unrhyw fapiau ar gyfer y rhanbarth." - -#: perllib/FixMyStreet/Cobrand/Default.pm:520 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Geocode/Bing.pm:47 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "" @@ -2995,7 +3162,7 @@ msgid "" "property you reported." msgstr "" -#: bin/send-reports:191 +#: bin/send-reports:195 msgid "" "We realise this empty property might be the responsibility of %s; however, " "we don't currently have any contact details for them. If you know of an " @@ -3036,7 +3203,7 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:25 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -3046,7 +3213,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:493 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -3069,13 +3236,20 @@ msgid "" "does a lack of punctuation." msgstr "" -#: templates/web/default/admin/council_contacts.html:32 -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/stats.html:10 +msgid "Year" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:5 -#: templates/web/default/admin/list_updates.html:28 +#: templates/web/default/admin/list_updates.html:30 +#: templates/web/default/admin/list_updates.html:31 +#: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:107 @@ -3112,7 +3286,7 @@ msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -3130,13 +3304,13 @@ msgstr "" "s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</a>.\n" #: templates/web/default/questionnaire/index.html:94 -#: templates/web/default/report/new/fill_in_details_form.html:89 +#: templates/web/default/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." msgstr "" -#: templates/web/default/report/display.html:106 +#: templates/web/default/report/display.html:112 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3183,8 +3357,8 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 #, fuzzy msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3197,7 +3371,7 @@ msgid "" "do not, %s." msgstr "" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "You really want to resend?" msgstr "" @@ -3213,15 +3387,15 @@ msgid "Your email address:" msgstr "Eich cyfeiriad e-bost:" #: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:128 -#: templates/web/default/report/new/fill_in_details_form.html:120 +#: templates/web/default/report/display.html:134 +#: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:199 -#: templates/web/default/report/new/fill_in_details_form.html:194 +#: templates/web/default/report/display.html:210 +#: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Eich enw:" @@ -3229,12 +3403,13 @@ msgstr "Eich enw:" msgid "Your password has been changed" msgstr "" -#: templates/web/default/footer.html:7 +#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/reading/footer.html:7 #, fuzzy msgid "Your reports" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:40 +#: templates/web/default/my/my.html:45 #, fuzzy msgid "Your updates" msgstr "Adroddiadau" @@ -3260,15 +3435,19 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:248 msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:18 +msgid "marked as %s" +msgstr "" + +#: templates/web/default/report/updates.html:16 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:109 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -3286,7 +3465,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:14 +#: templates/web/default/report/updates.html:17 msgid "reopened" msgstr "wedi'i ailagor" @@ -3296,17 +3475,17 @@ msgstr "wedi'i ailagor" msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:363 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "the map was not used so pin location may be inaccurate" msgstr "" "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: bin/send-reports:172 +#: bin/send-reports:176 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:221 +#: perllib/Utils.pm:222 msgid "today" msgstr "heddiw" @@ -3314,6 +3493,15 @@ msgstr "heddiw" msgid "used map" msgstr "" +#: templates/web/default/admin/update_edit.html:26 +msgid "user is from same council as empty property - %d" +msgstr "" + +#: templates/web/default/admin/update_edit.html:29 +#, fuzzy +msgid "user is empty property owner" +msgstr "Adroddiadau hŷn o eiddo gwag" + #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 msgid "ward" @@ -3352,7 +3540,7 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "your update will not be posted" msgstr "ni fydd eich diweddariad yn cael ei bostio" -#: templates/web/default/front/stats.html:19 +#: templates/web/default/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -3367,21 +3555,21 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front/stats.html:14 +#: templates/web/default/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> adroddiad o fewn yr wythnos ddiwethaf" msgstr[1] "<big>%s</big> o adroddiadau o fewn yr wythnos ddiwethaf" -#: templates/web/default/front/stats.html:25 +#: templates/web/default/front/stats.html:23 #, perl-format msgid "<big>%s</big> returned to use in past month" msgid_plural "<big>%s</big> returned to use in past month" msgstr[0] "Dychwelwyd <big>%s</big> i'w ddefnyddio yn y mis diwethaf" msgstr[1] "Dychwelwyd <big>%s</big> i'w defnyddio yn y mis diwethaf" -#: templates/web/default/front/stats.html:31 +#: templates/web/default/front/stats.html:29 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -3399,6 +3587,19 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#~ msgid "reportemptyhomes.com updates" +#~ msgstr "Diweddariadau i reportemptyhomes.com" + +#~ msgid "Photos of recent reports" +#~ msgstr "Ffotograffau o adroddiadau diweddar" + +#~ msgid "" +#~ "We do not cover Northern Ireland, I'm afraid, as our licence doesn't " +#~ "include any maps for the region." +#~ msgstr "" +#~ "Nid ydym yn ymdrin â Gogledd Iwerddon, yn anffodus, gan nad yw ein " +#~ "trwydded yn cynnwys unrhyw fapiau ar gyfer y rhanbarth." + #, fuzzy #~ msgid "" #~ "© Crown copyright. All rights reserved. Ministry of Justice " diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index dd4aa6cc4..3d0751cea 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2011-08-18 11:07+0100\n" +"POT-Creation-Date: 2011-10-21 15:56+0100\n" "PO-Revision-Date: 2011-08-29 10:26MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: bin/send-reports:179 perllib/FixMyStreet/DB/Result/Problem.pm:378 +#: bin/send-reports:183 perllib/FixMyStreet/DB/Result/Problem.pm:535 msgid " and " msgstr " og " @@ -30,8 +30,8 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_all.html:10 #: templates/web/default/report/new/councils_text_all.html:3 -#: templates/web/default/report/new/councils_text_none.html:15 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:14 +#: templates/web/default/report/new/councils_text_none.html:17 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 @@ -51,11 +51,11 @@ msgstr "%d bekreftede varsler, %d ubekreftede" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontakter – %d bekreftet, %d ubekreftet" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 msgid "%d day" msgstr "%d dag" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:252 msgid "%d days" msgstr "%d dager" @@ -63,11 +63,11 @@ msgstr "%d dager" msgid "%d edits by %s" msgstr "%d redigeringer av %s" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 msgid "%d hour" msgstr "%d time" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:253 msgid "%d hours" msgstr "%d timer" @@ -75,11 +75,11 @@ msgstr "%d timer" msgid "%d live updates" msgstr "%d aktive oppdateringer" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 msgid "%d minute" msgstr "%d minutt" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:254 msgid "%d minutes" msgstr "%d minutter" @@ -87,11 +87,11 @@ msgstr "%d minutter" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%s%%)" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 msgid "%d week" msgstr "%d uke" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:251 msgid "%d weeks" msgstr "%d uker" @@ -100,21 +100,21 @@ msgstr "%d uker" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:826 -#: perllib/FixMyStreet/Cobrand/Default.pm:840 +#: perllib/FixMyStreet/Cobrand/Default.pm:844 +#: perllib/FixMyStreet/Cobrand/Default.pm:858 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:309 +#: perllib/FixMyStreet/DB/Result/Problem.pm:466 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:311 +#: perllib/FixMyStreet/DB/Result/Problem.pm:468 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:857 -#: perllib/FixMyStreet/Cobrand/Default.pm:871 +#: perllib/FixMyStreet/Cobrand/Default.pm:875 +#: perllib/FixMyStreet/Cobrand/Default.pm:889 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -151,7 +151,7 @@ msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/default/report/new/fill_in_details_form.html:208 +#: templates/web/default/report/new/fill_in_details_form.html:217 msgid "(optional)" msgstr "(valgfritt)" @@ -160,26 +160,26 @@ msgstr "(valgfritt)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/default/report/new/fill_in_details_form.html:202 +#: templates/web/default/report/new/fill_in_details_form.html:211 msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" -#: templates/web/default/report/display.html:206 +#: templates/web/default/report/display.html:217 msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:270 +#: perllib/FixMyStreet/App/Controller/Admin.pm:279 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:532 -#: perllib/FixMyStreet/DB/Result/Problem.pm:206 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:534 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 +#: perllib/FixMyStreet/DB/Result/Problem.pm:314 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:490 -#: perllib/FixMyStreet/DB/Result/Problem.pm:212 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:520 +#: perllib/FixMyStreet/DB/Result/Problem.pm:320 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -189,7 +189,7 @@ msgstr "-- Velg en eiendomsstype --" msgid ". You can <a href=\"%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lese om problemet på portalen </a>." -#: templates/web/default/footer.html:13 +#: templates/web/default/footer.html:13 templates/web/reading/footer.html:16 msgid "" "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=" "\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" @@ -217,9 +217,12 @@ msgid "" "pledge</a>?\n" "</p>" msgstr "" -"<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: hva med å forsøke\n" -"<a href=\"%s\">å skrive direkte til dine representanter</a>, eller hvis det er et problem som kan fikses\n" -"av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www.pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" +"<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: " +"hva med å forsøke\n" +"<a href=\"%s\">å skrive direkte til dine representanter</a>, eller hvis det " +"er et problem som kan fikses\n" +"av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." +"pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" #: templates/web/default/questionnaire/index.html:37 msgid "" @@ -285,37 +288,37 @@ msgstr "<strong>%d</strong> aktive problemer" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" -#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:162 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" -#: templates/web/default/report/display.html:160 +#: templates/web/default/report/display.html:170 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:142 -#: templates/web/default/report/new/fill_in_details_form.html:136 +#: templates/web/default/report/display.html:148 +#: templates/web/default/report/new/fill_in_details_form.html:140 msgid "<strong>Yes</strong>, I have a password:" msgstr "<strong>Ja</strong>, jeg har et passord:" #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 -#: templates/web/emptyhomes/header.html:32 +#: templates/web/emptyhomes/header.html:31 #: templates/web/emptyhomes/static/about.html:1 #: templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:50 +#: templates/web/default/admin/council_contacts.html:57 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/default/my/my.html:51 +#: templates/web/default/my/my.html:56 msgid "Added %s" msgstr "La til %s" -#: templates/web/default/auth/change_password.html:31 +#: templates/web/default/auth/change_password.html:29 msgid "Again:" msgstr "Gjenta:" @@ -327,7 +330,7 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d koblet ut (opprettet %s)" -#: templates/web/default/report/display.html:211 +#: templates/web/default/report/display.html:222 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -339,8 +342,8 @@ msgstr "Alle" msgid "All confirmed" msgstr "Alle bekreftet" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:29 -#: templates/web/fiksgatami/footer.html:6 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:28 +#: templates/web/fiksgatami/footer.html:7 templates/web/reading/footer.html:8 msgid "All reports" msgstr "Alle rapporter" @@ -363,8 +366,10 @@ msgstr "" #: templates/web/default/report/new/councils_text_all.html:12 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 -msgid "All the information you provide here will be sent to <strong>%s</strong>." -msgstr "All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." +msgid "" +"All the information you provide here will be sent to <strong>%s</strong>." +msgstr "" +"All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." #: templates/web/emptyhomes/report/new/all_councils_text.html:2 #: templates/web/emptyhomes/report/new/all_councils_text.html:4 @@ -398,15 +403,21 @@ msgid "Are you a developer? Would you like to contribute to FixMyStreet?" msgstr "Er du en utvikler? Kunne du tenke deg å bidra til FiksGataMi?" #: templates/web/default/footer.html:26 -msgid "Are you from a council? Would you like better integration with FixMyStreet?" -msgstr "Er du fra det offentlige? Kunne du tenke deg bedre integrasjon med FiksGataMi?" +msgid "" +"Are you from a council? Would you like better integration with FixMyStreet?" +msgstr "" +"Er du fra det offentlige? Kunne du tenke deg bedre integrasjon med " +"FiksGataMi?" #: templates/web/default/open311/index.html:17 msgid "" "At most %d requests are returned in each query. The returned requests are " "ordered by requested_datetime, so to get all requests, do several searches " "with rolling start_date and end_date." -msgstr "På det meste blir %d forespørsler returnert i hver spørring. De returnerte forespørslene blir sortert på requested_datetime, så en må gjøre flere søk med rullerende start_date og end_date for å få tak i alle forespørslene." +msgstr "" +"På det meste blir %d forespørsler returnert i hver spørring. De returnerte " +"forespørslene blir sortert på requested_datetime, så en må gjøre flere søk " +"med rullerende start_date og end_date for å få tak i alle forespørslene." #: templates/web/default/open311/index.html:9 msgid "At the moment only searching for and looking at reports work." @@ -416,11 +427,11 @@ msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungere msgid "Ban email address" msgstr "Bannlys epostadresse" -#: templates/web/default/footer.html:16 +#: templates/web/default/footer.html:16 templates/web/reading/footer.html:14 msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>" -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "" "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " "by <a href=\"http://www.nuug.no/\">NUUG</a>" @@ -428,7 +439,11 @@ msgstr "" "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a> og " "vedlikeholdt av <a href=\"http://www.nuug.no/\">NUUG</a>" -#: templates/web/default/admin/council_contacts.html:19 +#: templates/web/default/admin/stats.html:80 +msgid "By Date" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:26 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 @@ -439,25 +454,46 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:507 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:533 -#: templates/web/default/admin/council_contacts.html:56 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:567 +#: templates/web/default/admin/council_contacts.html:63 #: templates/web/default/admin/council_edit.html:23 -#: templates/web/default/admin/report_edit.html:26 +#: templates/web/default/admin/report_edit.html:29 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:176 +#: bin/send-reports:180 msgid "Category: %s" msgstr "Kategori: %s" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 -#: templates/web/default/auth/change_password.html:35 +#: templates/web/default/auth/change_password.html:33 msgid "Change Password" msgstr "Bytt passord" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 +msgid "Closed" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#, fuzzy +msgid "Closed by council" +msgstr "(ikke rapportert til administrasjonen)" + +#: templates/web/default/my/my.html:32 +#, fuzzy +msgid "Closed reports" +msgstr "Fiksede rapporter" + +#: templates/web/default/admin/problem_row.html:25 +msgid "Closed:" +msgstr "" + #: templates/web/default/around/display_location.html:102 #: templates/web/default/around/display_location.html:104 msgid "Closest nearby problems <small>(within %skm)</small>" @@ -468,22 +504,39 @@ msgid "Co-ordinates:" msgstr "Koordinater:" #: templates/web/default/admin/list_flagged.html:16 -#: templates/web/default/admin/list_updates.html:11 +#: templates/web/default/admin/list_updates.html:13 #: templates/web/default/admin/search_reports.html:19 msgid "Cobrand" msgstr "" -#: templates/web/default/admin/report_edit.html:36 -#: templates/web/default/admin/update_edit.html:26 +#: templates/web/default/admin/report_edit.html:39 +#: templates/web/default/admin/update_edit.html:41 msgid "Cobrand data:" msgstr "" -#: templates/web/default/admin/report_edit.html:35 -#: templates/web/default/admin/update_edit.html:25 +#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/update_edit.html:40 msgid "Cobrand:" msgstr "" -#: templates/web/default/admin/council_contacts.html:26 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#, fuzzy +msgid "Configuration updated" +msgstr "Bekreftelse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:359 +msgid "Configuration updated - contacts will be generated automatically later" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:119 +msgid "Configure Open311" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:96 +msgid "Configure Open311 integration" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:33 msgid "Confirm" msgstr "Bekreft" @@ -501,8 +554,8 @@ msgstr "Bekreft konto" msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:21 -#: templates/web/default/admin/council_contacts.html:66 +#: templates/web/default/admin/council_contacts.html:28 +#: templates/web/default/admin/council_contacts.html:73 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -510,15 +563,15 @@ msgid "Confirmed" msgstr "Bekreftet" #: templates/web/default/admin/problem_row.html:23 -#: templates/web/default/admin/report_edit.html:31 +#: templates/web/default/admin/report_edit.html:34 msgid "Confirmed:" msgstr "Bekreftet:" -#: templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:10 msgid "Contact" msgstr "Kontakt" -#: templates/web/default/footer.html:17 +#: templates/web/default/footer.html:17 templates/web/reading/footer.html:15 msgid "Contact FixMyStreet" msgstr "Kontakt FiksGataMi" @@ -533,17 +586,19 @@ msgstr "Kontakt oss" msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:965 -#: perllib/FixMyStreet/App/Controller/Admin.pm:993 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1105 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1133 msgid "Could not find user" msgstr "Kunne ikke finne bruker" #: templates/web/default/admin/list_flagged.html:13 +#: templates/web/default/admin/list_updates.html:12 #: templates/web/default/admin/search_reports.html:16 +#: templates/web/default/admin/search_users.html:14 msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:839 +#: perllib/FixMyStreet/App/Controller/Admin.pm:977 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -553,11 +608,18 @@ msgstr "Administrasjonskontakter" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" +#: templates/web/default/admin/stats.html:84 +#: templates/web/default/admin/user_edit.html:12 +#, fuzzy +msgid "Council:" +msgstr "Administrasjon" + #: templates/web/default/admin/council_list.html:36 msgid "Councils" msgstr "Administrasjoner" -#: templates/web/default/admin/stats.html:10 +#: templates/web/default/admin/stats.html:12 +#: templates/web/default/admin/stats.html:32 msgid "Count" msgstr "Antall" @@ -565,7 +627,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:80 +#: templates/web/default/admin/council_contacts.html:87 msgid "Create category" msgstr "Lag kategori" @@ -575,12 +637,12 @@ msgstr "Lag kategori" msgid "Created" msgstr "Opprettet" -#: templates/web/default/admin/report_edit.html:30 -#: templates/web/default/admin/update_edit.html:27 +#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/update_edit.html:42 msgid "Created:" msgstr "Opprettet:" -#: templates/web/default/admin/stats.html:9 +#: templates/web/default/admin/stats.html:31 msgid "Current state" msgstr "Gjeldende tilstand" @@ -588,8 +650,8 @@ msgstr "Gjeldende tilstand" msgid "Currently has 1+ deleted" msgstr "For tiden har 1+ slettet" -#: templates/web/default/admin/council_contacts.html:22 -#: templates/web/default/admin/council_contacts.html:69 +#: templates/web/default/admin/council_contacts.html:29 +#: templates/web/default/admin/council_contacts.html:76 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" @@ -613,8 +675,9 @@ msgstr "Har du et FiksGataMi-passord?" msgid "Don’t know" msgstr "Vet ikke" -#: templates/web/default/admin/list_updates.html:31 -#: templates/web/default/admin/problem_row.html:28 +#: templates/web/default/admin/list_updates.html:35 +#: templates/web/default/admin/problem_row.html:29 +#: templates/web/default/admin/search_users.html:24 msgid "Edit" msgstr "Rediger" @@ -626,25 +689,31 @@ msgstr "Rediger problem %d" msgid "Editing update %d" msgstr "Redigerer oppdatering %d" +#: templates/web/default/admin/user_edit.html:1 +#, fuzzy +msgid "Editing user %d" +msgstr "Redigerer oppdatering %d" + #: templates/web/default/admin/council_edit.html:45 msgid "Editor" msgstr "Oppdatert av" -#: templates/web/default/admin/council_contacts.html:20 +#: templates/web/default/admin/council_contacts.html:27 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 #: templates/web/default/admin/list_updates.html:8 #: templates/web/default/admin/search_abuse.html:11 #: templates/web/default/admin/search_reports.html:15 +#: templates/web/default/admin/search_users.html:13 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1081 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:938 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -652,28 +721,29 @@ msgstr "Epost allerede i misbrukslisten" msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" -#: templates/web/default/report/display.html:42 +#: templates/web/default/report/display.html:35 msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:61 +#: templates/web/default/admin/council_contacts.html:68 #: templates/web/default/admin/council_edit.html:26 -#: templates/web/default/admin/report_edit.html:28 +#: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 +#: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:46 +#: templates/web/default/report/display.html:39 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:492 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:522 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:491 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:521 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:494 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:524 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -681,23 +751,23 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:495 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:525 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:496 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:526 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." -#: templates/web/default/admin/stats.html:47 +#: templates/web/default/admin/stats.html:70 msgid "End Year:" msgstr "Sluttår:" -#: templates/web/default/admin/stats.html:49 +#: templates/web/default/admin/stats.html:72 msgid "End day:" msgstr "Slutt-dag:" -#: templates/web/default/admin/stats.html:48 +#: templates/web/default/admin/stats.html:71 msgid "End month:" msgstr "Sluttmåned:" @@ -712,8 +782,8 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:167 -#: templates/web/default/report/new/fill_in_details_form.html:161 +#: templates/web/default/report/display.html:177 +#: templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "Skriv inn et nytt passord:" @@ -756,8 +826,9 @@ msgstr "Finn ut om FiksGataMi for det offentlige" msgid "First time" msgstr "Første gang" -#: templates/web/default/header.html:22 -#: templates/web/fiksgatami/header.html:13 +#: templates/web/default/header.html:29 +#: templates/web/fiksgatami/header.html:16 +#: templates/web/reading/header.html:31 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Fiks<span id=\"my\">Gata</span>Mi" @@ -799,15 +870,26 @@ msgstr "" "administrasjoner, problemer som gjelder flere administrasjoner blir sendt " "til alle de det gjelder." -#: templates/web/default/front/stats.html:7 -msgid "FixMyStreet updates" -msgstr "Fiksgatami-oppdateringer" - #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 msgid "Fixed" msgstr "Løst" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 +#, fuzzy +msgid "Fixed - Council" +msgstr "Administrasjon" + +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 +#, fuzzy +msgid "Fixed - User" +msgstr "Fiksede rapporter" + #: templates/web/default/my/my.html:27 msgid "Fixed reports" msgstr "Fiksede rapporter" @@ -820,7 +902,13 @@ msgstr "Løst:" msgid "Flag user" msgstr "Flag bruker" -#: templates/web/default/admin/report_edit.html:38 +#: templates/web/default/admin/search_users.html:15 +#, fuzzy +msgid "Flagged" +msgstr "Flagget:" + +#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "Flagget:" @@ -857,7 +945,7 @@ msgstr "Gi meg en RSS-strøm" msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -868,7 +956,8 @@ msgstr "Graf over problemoppretting fordelt på status over tid" #: templates/web/default/reports/index.html:5 #: templates/web/emptyhomes/reports/index.html:5 msgid "Greyed-out lines are councils that no longer exist." -msgstr "Linjer med grå bakgrunn er administrasjoner som ikke lenger eksisterer." +msgstr "" +"Linjer med grå bakgrunn er administrasjoner som ikke lenger eksisterer." #: templates/web/default/questionnaire/index.html:63 msgid "Has this problem been fixed?" @@ -883,16 +972,18 @@ msgstr "" "første gangen?" #: templates/web/default/footer.html:10 -#: templates/web/emptyhomes/header.html:31 -#: templates/web/fiksgatami/footer.html:8 +#: templates/web/emptyhomes/header.html:30 +#: templates/web/fiksgatami/footer.html:9 templates/web/reading/footer.html:10 msgid "Help" msgstr "Hjelp" #: templates/web/default/alert/list.html:39 msgid "Here are the types of local problem alerts for ‘%s’." -msgstr "Her er de forskjellige typene lokale problemvarsler for ‘%s’." +msgstr "" +"Her er de forskjellige typene lokale problemvarsler for ‘%s’." #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:19 msgid "Hidden" msgstr "Skjul" @@ -913,7 +1004,7 @@ msgstr "Historie" msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:546 +#: perllib/FixMyStreet/App/Controller/Admin.pm:587 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -925,9 +1016,11 @@ msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" msgid "" "I'm afraid we couldn't validate that token, as the report was made too long " "ago." -msgstr "Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge siden rapporten ble laget." +msgstr "" +"Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge " +"siden rapporten ble laget." -#: perllib/FixMyStreet/App/Controller/Tokens.pm:232 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" @@ -942,7 +1035,7 @@ msgid "ID" msgstr "ID" #: templates/web/default/report/new/councils_text_none.html:11 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:12 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -991,42 +1084,61 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:24 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:87 +msgid "In Progress" +msgstr "" + #: templates/web/default/open311/index.html:21 msgid "" "In addition, the following attributes that are not part of the Open311 v2 " "specification are returned: agency_sent_datetime, title (also returned as " "part of description), interface_used, comment_count, requestor_name (only " "present if requestor allowed the name to be shown on this site)." -msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." +msgstr "" +"I tillegg er følgende attributter som ikke er del av Open311 v2-" +"spesifikasjonen returnert: agency_sent_datetime, title (også returnert som " +"del av description), interface_used, comment_count, requestor_name (kun " +"tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." #: templates/web/default/around/display_location.html:61 msgid "Include stale reports" msgstr "Inkludert utdaterte problemer" -#: templates/web/default/admin/stats.html:53 +#: templates/web/default/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" -#: perllib/FixMyStreet/App/Controller/Open311.pm:355 +#: perllib/FixMyStreet/App/Controller/Open311.pm:358 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: perllib/FixMyStreet/App/Controller/Open311.pm:340 +#: perllib/FixMyStreet/App/Controller/Open311.pm:343 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:785 +#: perllib/FixMyStreet/App/Controller/Admin.pm:897 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:423 +#: perllib/FixMyStreet/App/Controller/Open311.pm:426 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:775 +#: perllib/FixMyStreet/App/Controller/Admin.pm:887 msgid "Invalid start date" msgstr "Ugyldig startdato" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:86 +#, fuzzy +msgid "Investigating" +msgstr "Navigasjon" + #: templates/web/emptyhomes/tokens/confirm_problem.html:12 #: templates/web/emptyhomes/tokens/confirm_problem.html:14 msgid "" @@ -1041,24 +1153,24 @@ msgid "" msgstr "" #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:149 -#: templates/web/default/report/new/fill_in_details_form.html:143 +#: templates/web/default/report/display.html:157 +#: templates/web/default/report/new/fill_in_details_form.html:149 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" -#: templates/web/default/admin/council_contacts.html:23 +#: templates/web/default/admin/council_contacts.html:30 msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/default/admin/report_edit.html:33 +#: templates/web/default/admin/report_edit.html:36 msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/default/admin/problem_row.html:25 +#: templates/web/default/admin/problem_row.html:26 msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:844 +#: perllib/FixMyStreet/App/Controller/Admin.pm:983 msgid "List Flagged" msgstr "List flagget" @@ -1089,8 +1201,8 @@ msgstr "Lokal RSS-strøm og e-postvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:30 -#: templates/web/fiksgatami/footer.html:7 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:29 +#: templates/web/fiksgatami/footer.html:8 templates/web/reading/footer.html:9 msgid "Local alerts" msgstr "Lokale varsler" @@ -1108,33 +1220,20 @@ msgstr "" "\">OpenStreetMap</a> og bidragsytere, <a href=\"http://creativecommons.org/" "licenses/by-sa/2.0/\">CC-BY-SA</a>" -#: perllib/FixMyStreet/Map/OSM/StreetView.pm:27 -msgid "" -"Map contains Ordnance Survey data © Crown copyright and database right " -"2010." -msgstr "" -"Kartet inneholder data fra Ordnance Survey © Crown copyright og " -"databaserettigheter 2010." - -#: perllib/FixMyStreet/Map/FMS.pm:24 -msgid "" -"Map contains Ordnance Survey data © Crown copyright and database right " -"2010.<br>© 2011 <a href=\"http://www.bing.com/maps/\">Microsoft</a>. " -"© AND, Navteq, Ordnance Survey." -msgstr "" -"Kartet inneholder data fra Ordnance Survey © Crown copyright og " -"databaserettigheter 2010. <a href=\"http://www.bing.com/maps/\">Microsoft</" -"a>. © AND, Navteq, Ordnance Survey." - #: templates/web/default/contact/index.html:90 msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:431 +#: perllib/FixMyStreet/App/Controller/Open311.pm:434 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/default/report/display.html:38 +#: templates/web/default/admin/stats.html:11 +#, fuzzy +msgid "Month" +msgstr "Antall" + +#: templates/web/default/report/display.html:31 msgid "More problems nearby" msgstr "Flere problemer i nærheten" @@ -1142,18 +1241,21 @@ msgstr "Flere problemer i nærheten" #: templates/web/default/admin/list_flagged.html:34 #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 +#: templates/web/default/admin/search_users.html:12 #: templates/web/default/reports/index.html:10 #: templates/web/emptyhomes/reports/index.html:10 #: templates/web/fiksgatami/reports/index.html:9 msgid "Name" msgstr "Navn" -#: templates/web/default/admin/report_edit.html:27 +#: templates/web/default/admin/report_edit.html:30 #: templates/web/default/admin/update_edit.html:23 +#: templates/web/default/admin/user_edit.html:10 msgid "Name:" msgstr "Navn:" #: templates/web/default/footer.html:4 templates/web/fiksgatami/footer.html:3 +#: templates/web/reading/footer.html:4 msgid "Navigation" msgstr "Navigasjon" @@ -1165,7 +1267,7 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:564 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1173,7 +1275,8 @@ msgstr "" "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s (%" "sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:558 +#: perllib/FixMyStreet/Cobrand/Default.pm:553 +#: perllib/FixMyStreet/Cobrand/Default.pm:588 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1185,7 +1288,7 @@ msgstr "" msgid "Nearly Done! Now check your email..." msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." -#: perllib/FixMyStreet/App/Controller/Admin.pm:300 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1226,8 +1329,10 @@ msgid "New problems within {{NAME}}'s boundary on FixMyStreet" msgstr "Nye rapporter innenfor grensen til {{NAME}} på FiksGataMi" #: db/alert_types_eha.pl:23 -msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -msgstr "Nye rapporter for {{COUNCIL}} innenfor {{WARD}} bydel på reportemptyhomes.com" +msgid "" +"New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" +msgstr "" +"Nye rapporter for {{COUNCIL}} innenfor {{WARD}} bydel på reportemptyhomes.com" #: db/alert_types_eha.pl:5 msgid "New reports on reportemptyhomes.com" @@ -1254,13 +1359,15 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:32 -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:4 -#: templates/web/default/admin/list_updates.html:28 +#: templates/web/default/admin/list_updates.html:30 +#: templates/web/default/admin/list_updates.html:31 +#: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:109 @@ -1268,7 +1375,13 @@ msgstr "Ny!" msgid "No" msgstr "Nei" -#: perllib/FixMyStreet/DB/Result/Problem.pm:189 +#: templates/web/default/admin/stats.html:85 +#: templates/web/default/admin/user_edit.html:13 +#, fuzzy +msgid "No council" +msgstr "administrasjon" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:297 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1309,19 +1422,22 @@ msgstr "Ikke rapportert tidligere" msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:24 +#: templates/web/default/admin/council_contacts.html:31 #: templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "Merk" -#: templates/web/default/admin/stats.html:28 +#: templates/web/default/admin/stats.html:51 msgid "" "Note that when including unconfirmed reports we use the date the report was " "created which may not be in the same month the report was confirmed so the " "numbers may jump about a little" -msgstr "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporten var opprettet, hvilket ikke trenger være den samme måneden som rapporten var bekreftet, så tallene kan hoppe litt opp og ned." +msgstr "" +"Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporten var " +"opprettet, hvilket ikke trenger være den samme måneden som rapporten var " +"bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:80 #: templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "Merk:" @@ -1330,16 +1446,17 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" -#: templates/web/default/report/new/fill_in_details_form.html:127 +#: templates/web/default/report/new/fill_in_details_form.html:131 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/display.html:139 msgid "Now to submit your update… do you have a FixMyStreet password?" -msgstr "På tide å registrere din oppdatering… har du et FiksGataMi-passord?" +msgstr "" +"På tide å registrere din oppdatering… har du et FiksGataMi-passord?" -#: templates/web/default/report/display.html:33 -#: templates/web/default/report/updates.html:19 +#: templates/web/default/report/display.html:26 +#: templates/web/default/report/updates.html:23 msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" @@ -1380,6 +1497,7 @@ msgstr "Eldre problemer" #: templates/web/default/admin/report_edit.html:22 #: templates/web/default/admin/update_edit.html:19 +#: templates/web/default/report/display.html:85 msgid "Open" msgstr "Åpen" @@ -1411,14 +1529,14 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: bin/send-reports:171 bin/send-reports:180 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:532 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:903 -#: perllib/FixMyStreet/DB/Result/Problem.pm:318 -#: perllib/FixMyStreet/DB/Result/Problem.pm:328 -#: perllib/FixMyStreet/DB/Result/Problem.pm:338 -#: perllib/FixMyStreet/DB/Result/Problem.pm:350 +#: bin/send-reports:175 bin/send-reports:184 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:553 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:566 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:969 +#: perllib/FixMyStreet/DB/Result/Problem.pm:475 +#: perllib/FixMyStreet/DB/Result/Problem.pm:485 +#: perllib/FixMyStreet/DB/Result/Problem.pm:495 +#: perllib/FixMyStreet/DB/Result/Problem.pm:507 msgid "Other" msgstr "Annet" @@ -1426,7 +1544,14 @@ msgstr "Annet" msgid "" "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet" "\">available on GitHub</a>." -msgstr "Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengelig på GitHub</a>." +msgstr "" +"Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/" +"fixmystreet\">tilgjengelig på GitHub</a>." + +#: templates/web/default/admin/list_updates.html:11 +#, fuzzy +msgid "Owner" +msgstr "Annet" #: templates/web/default/errors/page_error_404_not_found.html:1 #: templates/web/default/errors/page_error_404_not_found.html:3 @@ -1434,21 +1559,22 @@ msgid "Page Not Found" msgstr "Fant ikke siden" #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 msgid "Partial" msgstr "Delvis" -#: templates/web/default/auth/change_password.html:27 +#: templates/web/default/auth/change_password.html:25 msgid "Password:" msgstr "Passord:" -#: bin/send-reports:68 templates/web/default/admin/report_edit.html:29 -#: templates/web/default/report/new/fill_in_details_form.html:206 +#: bin/send-reports:69 templates/web/default/admin/report_edit.html:32 +#: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Telefon:" #: templates/web/default/questionnaire/index.html:97 -#: templates/web/default/report/display.html:109 -#: templates/web/default/report/new/fill_in_details_form.html:98 +#: templates/web/default/report/display.html:115 +#: templates/web/default/report/new/fill_in_details_form.html:102 msgid "Photo:" msgstr "Bilde:" @@ -1456,16 +1582,19 @@ msgstr "Bilde:" msgid "Photos of recent nearby reports" msgstr "Bilder av nye problemer i nærheten" -#: templates/web/default/index.html:63 -msgid "Photos of recent reports" -msgstr "Bilder av nylig meldte problemer" +#: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:23 +#: templates/web/default/report/display.html:85 +#: templates/web/default/report/display.html:86 +msgid "Planned" +msgstr "" #: templates/web/default/report/new/notes.html:6 msgid "Please be polite, concise and to the point." msgstr "Vær høflig, poengtert og kortfattet." -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:19 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" @@ -1478,14 +1607,14 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:686 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:705 #: perllib/FixMyStreet/App/Controller/Report/New.pm:722 -#: perllib/FixMyStreet/DB/Result/Problem.pm:208 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:741 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 +#: perllib/FixMyStreet/DB/Result/Problem.pm:316 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:214 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 msgid "Please choose a property type" msgstr "Velg en type egenskap" @@ -1510,21 +1639,21 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." -#: perllib/FixMyStreet/DB/Result/Comment.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:113 msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:17 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:15 msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:183 +#: perllib/FixMyStreet/DB/Result/Problem.pm:291 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/DB/Result/User.pm:94 +#: perllib/FixMyStreet/DB/Result/User.pm:96 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" @@ -1533,18 +1662,18 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:186 +#: perllib/FixMyStreet/DB/Result/Problem.pm:294 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:91 +#: perllib/FixMyStreet/DB/Result/User.pm:93 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 msgid "Please enter your email" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:201 +#: perllib/FixMyStreet/DB/Result/Problem.pm:309 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" @@ -1553,9 +1682,9 @@ msgstr "" "dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:194 -#: perllib/FixMyStreet/DB/Result/User.pm:87 +#: perllib/FixMyStreet/DB/Result/Comment.pm:110 +#: perllib/FixMyStreet/DB/Result/Problem.pm:302 +#: perllib/FixMyStreet/DB/Result/User.pm:89 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -1573,7 +1702,7 @@ msgid "" msgstr "" #: templates/web/default/report/new/fill_in_details_text.html:1 -#: templates/web/default/report/new/fill_in_details_text.html:8 +#: templates/web/default/report/new/fill_in_details_text.html:11 msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" @@ -1602,11 +1731,11 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:244 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" -#: templates/web/default/report/display.html:69 +#: templates/web/default/report/display.html:62 msgid "" "Please note that updates are not sent to the council. If you leave your name " "it will be public. Your information will only be used in accordance with our " @@ -1629,18 +1758,23 @@ msgstr "" msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please provide some explanation as to why you're reopening this report" -msgstr "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne problemrapporten" +msgstr "" +"Vennligst bidra med en forklaring for hvorfor du gjenåpner denne " +"problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:231 -msgid "Please say whether you've ever reported a problem to your council before" -msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:240 +msgid "" +"Please say whether you've ever reported a problem to your council before" +msgstr "" +"Vennligst opplys om du har rapportert et problem til din administrasjon " +"tidligere" #: perllib/FixMyStreet/App/Controller/Alert.pm:82 msgid "Please select the feed you want" @@ -1650,7 +1784,7 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:227 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:236 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -1658,7 +1792,7 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:774 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:830 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" @@ -1667,9 +1801,9 @@ msgid "Please write a message" msgstr "Skriv inn en melding" #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:119 -#: templates/web/default/report/display.html:154 -#: templates/web/default/report/display.html:175 +#: templates/web/default/report/display.html:125 +#: templates/web/default/report/display.html:162 +#: templates/web/default/report/display.html:184 msgid "Post" msgstr "Send inn" @@ -1677,7 +1811,12 @@ msgstr "Send inn" msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/default/report/updates.html:10 +#: templates/web/default/report/updates.html:11 +#, fuzzy +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "Note: <strong>%d</strong>" + +#: templates/web/default/report/updates.html:13 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" @@ -1701,7 +1840,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 +#: perllib/FixMyStreet/App/Controller/Admin.pm:774 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -1725,13 +1864,13 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:782 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:791 +#: perllib/FixMyStreet/Cobrand/Default.pm:809 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -1747,18 +1886,19 @@ msgstr "Problemer innenfor grensene av:" #: db/alert_types_eha.pl:8 msgid "Properties recently reported as put back to use on reportemptyhomes.com" -msgstr "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" +msgstr "" +"Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:498 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:528 msgid "Property type:" msgstr "Type egenskap:" -#: templates/web/default/report/display.html:64 +#: templates/web/default/report/display.html:57 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/default/report/display.html:172 -#: templates/web/default/report/new/fill_in_details_form.html:166 +#: templates/web/default/report/display.html:181 +#: templates/web/default/report/new/fill_in_details_form.html:173 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -1783,30 +1923,30 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:190 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/default/alert/list.html:54 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:55 +#: templates/web/default/report/display.html:48 #: templates/web/default/reports/council.html:61 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/Default.pm:820 -#: perllib/FixMyStreet/Cobrand/Default.pm:834 +#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:852 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:827 -#: perllib/FixMyStreet/Cobrand/Default.pm:841 +#: perllib/FixMyStreet/Cobrand/Default.pm:845 +#: perllib/FixMyStreet/Cobrand/Default.pm:859 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:850 -#: perllib/FixMyStreet/Cobrand/Default.pm:864 +#: perllib/FixMyStreet/Cobrand/Default.pm:868 +#: perllib/FixMyStreet/Cobrand/Default.pm:882 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 @@ -1814,8 +1954,8 @@ msgstr "RSS-strøm for %s bydel, %s" msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 -#: perllib/FixMyStreet/Cobrand/Default.pm:870 +#: perllib/FixMyStreet/Cobrand/Default.pm:874 +#: perllib/FixMyStreet/Cobrand/Default.pm:888 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -1827,13 +1967,13 @@ msgstr "RSS-strøm med problemer i nærheten" msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:783 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:790 +#: perllib/FixMyStreet/Cobrand/Default.pm:808 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -1843,12 +1983,12 @@ msgstr "RSS-strøm for problemer innenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" -#: templates/web/default/report/display.html:55 +#: templates/web/default/report/display.html:48 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" #: templates/web/default/alert/updates.html:9 -#: templates/web/default/report/display.html:45 +#: templates/web/default/report/display.html:38 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" @@ -1865,7 +2005,7 @@ msgstr "Nylige lokale problemer, FiksGataMi." msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:72 +#: templates/web/default/index.html:62 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -1885,8 +2025,8 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:44 -#: templates/web/default/admin/update_edit.html:33 +#: templates/web/default/admin/report_edit.html:47 +#: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" @@ -1894,12 +2034,12 @@ msgstr "Fjern bilde (kan ikke gjøres om!)" msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" -#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:28 -#: templates/web/fiksgatami/footer.html:5 +#: templates/web/default/footer.html:6 templates/web/emptyhomes/header.html:27 +#: templates/web/fiksgatami/footer.html:5 templates/web/reading/footer.html:6 msgid "Report a problem" msgstr "Rapporter et problem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:268 +#: perllib/FixMyStreet/App/Controller/Rss.pm:274 msgid "Report on %s" msgstr "Rapport på %s" @@ -1907,15 +2047,15 @@ msgstr "Rapport på %s" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: templates/web/default/my/my.html:69 +#: templates/web/default/my/my.html:74 msgid "Reported %s" msgstr "Rapportert %s" -#: templates/web/default/my/my.html:67 +#: templates/web/default/my/my.html:72 msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 #: templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -1925,32 +2065,32 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 +#: perllib/FixMyStreet/DB/Result/Problem.pm:482 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:356 +#: perllib/FixMyStreet/DB/Result/Problem.pm:513 #: templates/web/default/contact/index.html:47 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:347 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:321 +#: perllib/FixMyStreet/DB/Result/Problem.pm:478 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:341 +#: perllib/FixMyStreet/DB/Result/Problem.pm:498 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:329 +#: perllib/FixMyStreet/DB/Result/Problem.pm:486 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:351 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -1965,7 +2105,7 @@ msgstr "Legger til et problem" msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "Resend report" msgstr "Send rapport på nytt" @@ -1985,7 +2125,7 @@ msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:982 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -1993,14 +2133,21 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbrukstabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:840 +#: perllib/FixMyStreet/App/Controller/Admin.pm:978 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" +#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: templates/web/default/admin/search_users.html:1 +#, fuzzy +msgid "Search Users" +msgstr "Søk i rapporter" + #: templates/web/default/admin/search_abuse.html:4 #: templates/web/default/admin/search_reports.html:5 +#: templates/web/default/admin/search_users.html:5 msgid "Search:" msgstr "Søk:" @@ -2012,15 +2159,15 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "Sent:" msgstr "Sendt:" -#: templates/web/default/admin/report_edit.html:34 +#: templates/web/default/admin/report_edit.html:37 msgid "Service:" msgstr "Tjeneste:" @@ -2045,8 +2192,8 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:205 -#: templates/web/default/report/new/fill_in_details_form.html:201 +#: templates/web/default/report/display.html:216 +#: templates/web/default/report/new/fill_in_details_form.html:210 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" @@ -2068,18 +2215,26 @@ msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" #: templates/web/default/auth/sign_out.html:1 -#: templates/web/default/header.html:28 -#: templates/web/emptyhomes/header.html:44 -#: templates/web/lichfielddc/header.html:174 +#: templates/web/default/header.html:35 +#: templates/web/emptyhomes/header.html:43 +#: templates/web/fiksgatami/header.html:22 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:37 msgid "Sign out" msgstr "Logg ut" -#: templates/web/default/header.html:27 -#: templates/web/emptyhomes/header.html:43 -#: templates/web/lichfielddc/header.html:174 +#: templates/web/default/header.html:34 +#: templates/web/emptyhomes/header.html:42 +#: templates/web/fiksgatami/header.html:21 +#: templates/web/lichfielddc/header.html:177 +#: templates/web/reading/header.html:36 msgid "Signed in as %s" msgstr "Logget inn som %s" +#: templates/web/default/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "" + #: templates/web/default/alert/index.html:31 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2093,8 +2248,9 @@ msgstr "Noe tekst å oversette" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: perllib/FixMyStreet/Cobrand/Default.pm:516 -msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +#: perllib/FixMyStreet/Cobrand/Default.pm:517 +msgid "" +"Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi " "ikke dekker." @@ -2105,29 +2261,29 @@ msgstr "" "Beklager, men det oppsto et problem når vi forsøkte å bekrefte " "problemrapporten din" -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:52 #: perllib/FixMyStreet/Geocode/Google.pm:68 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode/Bing.pm:44 +#: perllib/FixMyStreet/Geocode/Bing.pm:45 #: perllib/FixMyStreet/Geocode/Google.pm:60 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." -#: templates/web/fiksgatami/footer.html:15 +#: templates/web/fiksgatami/footer.html:16 msgid "Source code" msgstr "Kildekode" -#: templates/web/default/admin/stats.html:41 +#: templates/web/default/admin/stats.html:64 msgid "Start Year:" msgstr "Startår:" -#: templates/web/default/admin/stats.html:43 +#: templates/web/default/admin/stats.html:66 msgid "Start day:" msgstr "Startdag:" -#: templates/web/default/admin/stats.html:42 +#: templates/web/default/admin/stats.html:65 msgid "Start month:" msgstr "Startmåned:" @@ -2139,10 +2295,11 @@ msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:21 #: templates/web/default/admin/update_edit.html:18 +#: templates/web/default/report/display.html:83 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:845 +#: perllib/FixMyStreet/App/Controller/Admin.pm:984 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2154,14 +2311,15 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/default/questionnaire/creator_fixed.html:19 -#: templates/web/default/report/new/fill_in_details_form.html:110 -#: templates/web/default/report/new/fill_in_details_form.html:148 -#: templates/web/default/report/new/fill_in_details_form.html:169 +#: templates/web/default/report/new/fill_in_details_form.html:114 +#: templates/web/default/report/new/fill_in_details_form.html:154 +#: templates/web/default/report/new/fill_in_details_form.html:176 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:47 -#: templates/web/default/admin/update_edit.html:36 +#: templates/web/default/admin/report_edit.html:50 +#: templates/web/default/admin/update_edit.html:51 +#: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" msgstr "Send inn endringer" @@ -2170,7 +2328,7 @@ msgid "Submit questionnaire" msgstr "Send inn spørreskjema" #: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:50 +#: templates/web/default/report/display.html:43 msgid "Subscribe" msgstr "Abonner" @@ -2178,7 +2336,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:838 +#: perllib/FixMyStreet/App/Controller/Admin.pm:976 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2189,12 +2347,12 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:842 +#: perllib/FixMyStreet/App/Controller/Admin.pm:980 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" -#: templates/web/default/admin/list_updates.html:12 +#: templates/web/default/admin/list_updates.html:14 msgid "Text" msgstr "Tekst" @@ -2250,7 +2408,9 @@ msgstr "" msgid "" "Thank you for using ReportEmptyHomes.com. Your action is already helping to " "resolve the UK’s empty homes crisis." -msgstr "Takk for at du bruker ReportEmptyHomes.com. Ditt bidrag bidrar allerede for å løse UKs tomme hjem-krise." +msgstr "" +"Takk for at du bruker ReportEmptyHomes.com. Ditt bidrag bidrar allerede for " +"å løse UKs tomme hjem-krise." #: templates/web/default/around/around_index.html:44 msgid "" @@ -2270,11 +2430,12 @@ 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 "" -"Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om " -"du har rapportert et problem til en administrasjon tidligere?" +"Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du " +"har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:783 -msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +#: perllib/FixMyStreet/App/Controller/Report/New.pm:839 +msgid "" +"That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." #: templates/web/default/alert/index.html:12 @@ -2290,12 +2451,12 @@ msgstr "" msgid "That location does not appear to be in Britain; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." -#: perllib/FixMyStreet/Cobrand/Default.pm:509 +#: perllib/FixMyStreet/Cobrand/Default.pm:510 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:517 +#: perllib/FixMyStreet/App/Controller/Admin.pm:558 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -2356,7 +2517,8 @@ msgstr "" msgid "" "The details of your problem are available on the right hand side of this " "page." -msgstr "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." +msgstr "" +"Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." #: perllib/FixMyStreet/App/Controller/Reports.pm:46 #: perllib/FixMyStreet/App/Controller/Reports.pm:73 @@ -2397,7 +2559,8 @@ msgid "The latest problems for {{COUNCIL}} reported by users" msgstr "De siste problemer for {{COUNCIL}} rapportert av brukere" #: db/alert_types.pl:39 -msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" +msgid "" +"The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" msgstr "" "De siste problemene for {{COUNCIL}} innenfor {{WARD}} bydel rapportert av " "brukere" @@ -2423,7 +2586,8 @@ msgid "The latest reports for {{COUNCIL}} reported by users" msgstr "De siste rapporter for {{COUNCIL}} rapportert av brukere" #: db/alert_types_eha.pl:24 -msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" +msgid "" +"The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" msgstr "" "De siste rapporter for {{COUNCIL}} innenfor {{WARD}} bydel rapporter av " "brukere" @@ -2432,8 +2596,8 @@ msgstr "" msgid "The latest reports within {{NAME}}'s boundary reported by users" msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere" -#: templates/web/default/auth/change_password.html:14 -#: templates/web/default/auth/change_password.html:18 +#: templates/web/default/auth/change_password.html:12 +#: templates/web/default/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Passordene er ikke like" @@ -2442,10 +2606,10 @@ msgstr "Passordene er ikke like" msgid "The requested URL '%s' was not found on this server" msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1039 -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 -#: perllib/FixMyStreet/App/Controller/Admin.pm:630 -#: perllib/FixMyStreet/App/Controller/Admin.pm:894 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1034 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1179 +#: perllib/FixMyStreet/App/Controller/Admin.pm:538 +#: perllib/FixMyStreet/App/Controller/Admin.pm:701 msgid "The requested URL was not found on this server." msgstr "Den forespurte URL-en ble ikke funnet på denne tjeneren" @@ -2464,7 +2628,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: bin/send-reports:77 +#: bin/send-reports:78 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -2473,13 +2637,14 @@ msgstr "" "stedet de skrev inn" #: perllib/FixMyStreet/App/Controller/Reports.pm:72 -msgid "There was a problem showing the All Reports page. Please try again later." +msgid "" +"There was a problem showing the All Reports page. Please try again later." msgstr "" "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen " "senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:605 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:117 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 #: templates/web/default/auth/general.html:23 msgid "" "There was a problem with your email/password combination. Passwords and user " @@ -2493,7 +2658,15 @@ msgstr "" "skjemaet for å skaffe deg en." #: perllib/FixMyStreet/App/Controller/Alert.pm:354 -msgid "There was a problem with your email/password combination. Please try again." +msgid "" +"There was a problem with your email/password combination. Please try again." +msgstr "" +"Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " +"igjen." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:214 +#, fuzzy +msgid "There was a problem with your update. Please try again." msgstr "" "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " "igjen." @@ -2502,7 +2675,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:211 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:241 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -2510,9 +2683,11 @@ msgstr "Det var problemer med din oppdatering. Vennligst se under." msgid "" "This API implementation is work in progress and not yet stabilized. It will " "change without warnings in the future." -msgstr "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil endre seg uten advarsel i fremtiden." +msgstr "" +"Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " +"endre seg uten advarsel i fremtiden." -#: bin/send-reports:181 +#: bin/send-reports:185 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -2525,7 +2700,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: bin/send-reports:184 +#: bin/send-reports:188 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 " @@ -2536,6 +2711,10 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." +#: perllib/FixMyStreet/App/Controller/Report/New.pm:761 +msgid "This information is required" +msgstr "" + #: templates/web/default/debug_header.html:3 msgid "" "This is a developer site; things might break at any time, and the database " @@ -2562,33 +2741,50 @@ msgstr "" "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " "administrasjon for å se problemer som er sendt dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:903 +#: perllib/FixMyStreet/Cobrand/Default.pm:926 +#, fuzzy +msgid "This problem has been closed" +msgstr "Dette problemet er løst" + +#: perllib/FixMyStreet/Cobrand/Default.pm:922 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:96 +#: templates/web/default/report/display.html:101 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/default/report/display.html:91 +#: templates/web/default/report/display.html:96 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" -#: perllib/FixMyStreet/Cobrand/Default.pm:899 +#: perllib/FixMyStreet/Cobrand/Default.pm:931 +#, fuzzy +msgid "This problem is in progress" +msgstr "Dette problemet er løst" + +#: perllib/FixMyStreet/Cobrand/Default.pm:918 msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#, fuzzy +msgid "This report is currently marked as closed." +msgstr "Denne rapporten er for tiden markert som åpen." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:77 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:80 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: bin/send-reports:70 -msgid "This web page also contains a photo of the problem, provided by the user." -msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." +#: bin/send-reports:71 +msgid "" +"This web page also contains a photo of the problem, provided by the user." +msgstr "" +"Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:841 +#: perllib/FixMyStreet/App/Controller/Admin.pm:979 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -2602,21 +2798,24 @@ msgstr "Tittel" msgid "" "To <strong>report a problem</strong>, simply click on the map at the correct " "location." -msgstr "For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." +msgstr "" +"For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." #: templates/web/default/alert/index.html:21 msgid "" "To find out what local alerts we have for you, please enter your GB\n" "postcode or street name and area:" -msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted:" +msgstr "" +"Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted:" -#: bin/send-reports:76 +#: bin/send-reports:77 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/questionnaire.html:24 -#: templates/web/default/admin/stats.html:21 +#: templates/web/default/admin/stats.html:24 +#: templates/web/default/admin/stats.html:43 msgid "Total" msgstr "Totalt" @@ -2625,6 +2824,7 @@ msgid "Unable to look up areas in MaPit. Please try again later." msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." #: templates/web/default/admin/report_edit.html:22 +#: templates/web/default/admin/report_edit.html:25 #: templates/web/default/admin/update_edit.html:19 msgid "Unconfirmed" msgstr "Ubekreftet" @@ -2657,16 +2857,32 @@ msgstr "Tilstandsfordeling for oppdateringer" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/default/admin/council_contacts.html:46 +#: templates/web/default/admin/update_edit.html:33 +#, fuzzy +msgid "Update changed problem state to %s" +msgstr "Oppdatering %s opprettet for problem %d, av %s" + +#: templates/web/default/admin/update_edit.html:35 +#, fuzzy +msgid "Update marked problem as fixed" +msgstr "En oppdatering markerte dette problemet som fikset." + +#: templates/web/default/admin/update_edit.html:37 +#, fuzzy +msgid "Update reopened problem" +msgstr "Oppdatering %s opprettet for problem %d, av %s" + +#: templates/web/default/admin/council_contacts.html:53 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:84 +#: templates/web/default/report/display.html:77 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:606 -#: perllib/FixMyStreet/App/Controller/Admin.pm:693 +#: perllib/FixMyStreet/App/Controller/Admin.pm:647 +#: perllib/FixMyStreet/App/Controller/Admin.pm:764 +#: perllib/FixMyStreet/App/Controller/Admin.pm:844 msgid "Updated!" msgstr "Oppdatert!" @@ -2684,11 +2900,11 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:969 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1109 msgid "User flagged" msgstr "Bruker flagget" @@ -2696,8 +2912,8 @@ msgstr "Bruker flagget" msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:295 -#: perllib/FixMyStreet/App/Controller/Admin.pm:325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:334 msgid "Values updated" msgstr "Verdier oppdatert" @@ -2723,15 +2939,8 @@ msgstr "Ser på et problem" msgid "Wards of this council" msgstr "Bydeler innenfor denne administrasjonen" -#: perllib/FixMyStreet/Geocode/Bing.pm:46 -msgid "" -"We do not cover Northern Ireland, I'm afraid, as our licence doesn't include " -"any maps for the region." -msgstr "" -"Vi dekker ikke nordlige Irland, er jeg redd, da vår lisens ikke inkluderer " -"noen kart for den regionen." - -#: perllib/FixMyStreet/Cobrand/Default.pm:520 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Geocode/Bing.pm:47 #: perllib/FixMyStreet/Geocode/Google.pm:63 msgid "We do not currently cover Northern Ireland, I'm afraid." msgstr "Vi dekker desverre ikke Nord-Irland." @@ -2747,7 +2956,8 @@ msgstr "" #: templates/web/default/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." -msgstr "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." +msgstr "" +"Vi har sendt deg en epost som inneholder link for å bekrefte din konto." #: templates/web/emptyhomes/tokens/confirm_problem.html:18 #: templates/web/emptyhomes/tokens/confirm_problem.html:20 @@ -2758,7 +2968,7 @@ msgstr "" "Det kan hende vi periodisk tar kontakt med deg for å spørre om noe har " "endret seg med eiedommen du rapporterte." -#: bin/send-reports:191 +#: bin/send-reports:195 msgid "" "We realise this problem might be the responsibility of %s; however, we don't " "currently have any contact details for them. If you know of an appropriate " @@ -2788,7 +2998,8 @@ msgid "" msgstr "" "Vi vil gjerne høre hva du tenker om dette nettstedet. Det er bare å fylle " "inn skjemaet. Vær så snill å ikke kontakte oss om individuelle tomme hjem. " -"For det bør du i stedet bruke boksen tilgjengelig fra <a href=\"/\">forsiden</a>." +"For det bør du i stedet bruke boksen tilgjengelig fra <a href=\"/" +"\">forsiden</a>." #: templates/web/default/contact/blurb.html:8 msgid "" @@ -2798,7 +3009,7 @@ msgstr "" "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare " "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:25 +#: templates/web/default/admin/council_contacts.html:32 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "Når redigert" @@ -2808,7 +3019,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:493 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:523 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -2817,7 +3028,11 @@ msgid "" "With request searches, it is also possible to search for agency_responsible " "to limit the requests to those sent to a single administration. The search " "term is the administration ID provided by <a href=\"%s\">MaPit</a>." -msgstr "Når du søker etter forespørsler, så er det også mulig å søke etter agency_responsible for å begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a href=\"%s\">MaPit</a>." +msgstr "" +"Når du søker etter forespørsler, så er det også mulig å søke etter " +"agency_responsible for å begrense det til forespørsler som er sendt til en " +"enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a " +"href=\"%s\">MaPit</a>." #: templates/web/default/questionnaire/index.html:104 msgid "" @@ -2835,13 +3050,21 @@ msgstr "" "Når du skriver meldingen din med kun store bokstaver blir den vanskelig å " "lese. Det samme gjelder manglende tegnsetting." -#: templates/web/default/admin/council_contacts.html:32 -#: templates/web/default/admin/council_contacts.html:33 +#: templates/web/default/admin/stats.html:10 +#, fuzzy +msgid "Year" +msgstr "Sluttår:" + +#: templates/web/default/admin/council_contacts.html:39 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:5 -#: templates/web/default/admin/list_updates.html:28 +#: templates/web/default/admin/list_updates.html:30 +#: templates/web/default/admin/list_updates.html:31 +#: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:18 -#: templates/web/default/admin/report_edit.html:37 +#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 #: templates/web/default/questionnaire/index.html:107 @@ -2869,14 +3092,16 @@ msgstr "" msgid "" "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" "reports\">show all councils</a>." -msgstr "Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a href=\"/reports\">se alle administrasjonene</a>." +msgstr "" +"Du kan <a href=\"%s\">se alle rapporter for administrasjonen</a> eller <a " +"href=\"/reports\">se alle administrasjonene</a>." #: templates/web/default/reports/council.html:73 msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." #: templates/web/default/report/new/councils_text_none.html:14 -#: templates/web/default/report/new/councils_text_none.html:3 +#: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 msgid "" @@ -2896,7 +3121,7 @@ msgstr "" "problem</a>.\n" #: templates/web/default/questionnaire/index.html:94 -#: templates/web/default/report/new/fill_in_details_form.html:89 +#: templates/web/default/report/new/fill_in_details_form.html:93 msgid "" "You have already attached a photo to this report, attaching another one will " "replace it." @@ -2904,7 +3129,7 @@ msgstr "" "Du har allerede lagt ved et bilde til dette problemet. Å legge ved et annet " "vil bytte ut dette." -#: templates/web/default/report/display.html:106 +#: templates/web/default/report/display.html:112 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -2939,7 +3164,9 @@ msgstr "Du har nå lykkes med å bekrefte ditt problem" msgid "" "You have successfully confirmed your update and you can now <a href=\"%s" "\">view it on the site</a>." -msgstr "Du har nå bekreftet din oppdatering <a href=\"%s\">og kan se den på dette nettstedet</a>." +msgstr "" +"Du har nå bekreftet din oppdatering <a href=\"%s\">og kan se den på dette " +"nettstedet</a>." #: templates/web/default/tokens/confirm_alert.html:11 msgid "You have successfully created your alert." @@ -2949,12 +3176,14 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:647 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" -msgstr "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:" +msgstr "" +"Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer " +"er korrekte:" #: templates/web/default/email_sent.html:26 msgid "" @@ -2964,7 +3193,7 @@ msgstr "" "Du må nå åpne lenken i e-posten vi akkurat sendte deg — dersom du ikke " "gjør det, %s" -#: templates/web/default/admin/report_edit.html:32 +#: templates/web/default/admin/report_edit.html:35 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -2978,15 +3207,15 @@ msgid "Your email address:" msgstr "Din e-postadresse:" #: templates/web/default/alert/list.html:122 -#: templates/web/default/report/display.html:128 -#: templates/web/default/report/new/fill_in_details_form.html:120 +#: templates/web/default/report/display.html:134 +#: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Din e-post" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:199 -#: templates/web/default/report/new/fill_in_details_form.html:194 +#: templates/web/default/report/display.html:210 +#: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Ditt navn:" @@ -2994,11 +3223,12 @@ msgstr "Ditt navn:" msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" -#: templates/web/default/footer.html:7 +#: templates/web/default/footer.html:7 templates/web/fiksgatami/footer.html:6 +#: templates/web/reading/footer.html:7 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/default/my/my.html:40 +#: templates/web/default/my/my.html:45 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3023,15 +3253,20 @@ msgstr "brukte ikke kart" msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:248 msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/default/report/updates.html:13 +#: templates/web/default/report/updates.html:18 +#, fuzzy +msgid "marked as %s" +msgstr "markert som fikset" + +#: templates/web/default/report/updates.html:16 msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:109 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" @@ -3049,7 +3284,7 @@ msgstr "søkte etter" msgid "other areas:" msgstr "andre områder:" -#: templates/web/default/report/updates.html:14 +#: templates/web/default/report/updates.html:17 msgid "reopened" msgstr "åpnet på nytt" @@ -3058,15 +3293,15 @@ msgstr "åpnet på nytt" msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:363 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "the map was not used so pin location may be inaccurate" msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" -#: bin/send-reports:172 +#: bin/send-reports:176 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:221 +#: perllib/Utils.pm:222 msgid "today" msgstr "idag" @@ -3074,6 +3309,15 @@ msgstr "idag" msgid "used map" msgstr "brukte kart" +#: templates/web/default/admin/update_edit.html:26 +msgid "user is from same council as problem - %d" +msgstr "" + +#: templates/web/default/admin/update_edit.html:29 +#, fuzzy +msgid "user is problem owner" +msgstr "Flere problemer i nærheten" + #: templates/web/default/reports/council.html:0 #: templates/web/default/reports/council.html:3 msgid "ward" @@ -3109,7 +3353,7 @@ msgstr "vil ditt problem ikke bli publisert" msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" -#: templates/web/default/front/stats.html:19 +#: templates/web/default/front/stats.html:17 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -3119,25 +3363,28 @@ msgstr[1] "<big>%s</big> rapportert<br>nylig" #: templates/web/default/report/new/councils_text_none.html:5 #, 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] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet." -msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." +msgid_plural "" +"We do not yet have details for the councils that cover this location." +msgstr[0] "" +"Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet." +msgstr[1] "" +"Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: templates/web/default/front/stats.html:14 +#: templates/web/default/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste uke" msgstr[1] "<big>%s</big> rapporter siste uke" -#: templates/web/default/front/stats.html:25 +#: templates/web/default/front/stats.html:23 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> fikset siste måned" msgstr[1] "<big>%s</big> fikset siste måned" -#: templates/web/default/front/stats.html:31 +#: templates/web/default/front/stats.html:29 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -3159,3 +3406,31 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." +#~ msgid "FixMyStreet updates" +#~ msgstr "Fiksgatami-oppdateringer" + +#~ msgid "" +#~ "Map contains Ordnance Survey data © Crown copyright and database " +#~ "right 2010." +#~ msgstr "" +#~ "Kartet inneholder data fra Ordnance Survey © Crown copyright og " +#~ "databaserettigheter 2010." + +#~ msgid "" +#~ "Map contains Ordnance Survey data © Crown copyright and database " +#~ "right 2010.<br>© 2011 <a href=\"http://www.bing.com/maps/" +#~ "\">Microsoft</a>. © AND, Navteq, Ordnance Survey." +#~ msgstr "" +#~ "Kartet inneholder data fra Ordnance Survey © Crown copyright og " +#~ "databaserettigheter 2010. <a href=\"http://www.bing.com/maps/" +#~ "\">Microsoft</a>. © AND, Navteq, Ordnance Survey." + +#~ msgid "Photos of recent reports" +#~ msgstr "Bilder av nylig meldte problemer" + +#~ msgid "" +#~ "We do not cover Northern Ireland, I'm afraid, as our licence doesn't " +#~ "include any maps for the region." +#~ msgstr "" +#~ "Vi dekker ikke nordlige Irland, er jeg redd, da vår lisens ikke " +#~ "inkluderer noen kart for den regionen." |