diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 20:15:15 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2011-07-01 20:15:15 +0100 |
| commit | a12543b270eeeb7b2f4f8218f0101f7373e20cfc (patch) | |
| tree | 1ed74e5dd523fb2550c24fe22456fdb85af51f59 /locale/FixMyStreet.po | |
| parent | 6e0192caf51ed558fd58c74ab9edb2ef566a0ed3 (diff) | |
Update .po files.
Diffstat (limited to 'locale/FixMyStreet.po')
| -rw-r--r-- | locale/FixMyStreet.po | 542 |
1 files changed, 321 insertions, 221 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 92c377365..66d405c70 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-06-14 17:28+0100\n" +"POT-Creation-Date: 2011-07-01 20:12+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:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:376 msgid " and " msgstr "" @@ -41,11 +41,11 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:245 +#: perllib/Utils.pm:251 msgid "%d day" msgstr "" -#: perllib/Utils.pm:245 +#: perllib/Utils.pm:251 msgid "%d days" msgstr "" @@ -53,11 +53,11 @@ msgstr "" msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:252 msgid "%d hour" msgstr "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:252 msgid "%d hours" msgstr "" @@ -65,11 +65,11 @@ msgstr "" msgid "%d live updates" msgstr "" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:253 msgid "%d minute" msgstr "" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:253 msgid "%d minutes" msgstr "" @@ -77,19 +77,19 @@ msgstr "" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 msgid "%d week" msgstr "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 msgid "%d weeks" msgstr "" -#: templates/web/default/reports/council.html:11 templates/web/default/reports/council.html:12 +#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:14 msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:763 perllib/FixMyStreet/Cobrand/Default.pm:777 +#: perllib/FixMyStreet/Cobrand/Default.pm:756 perllib/FixMyStreet/Cobrand/Default.pm:770 msgid "%s ward, %s" msgstr "" @@ -101,15 +101,15 @@ msgstr "" msgid "%s, reported by %s at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:794 perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 perllib/FixMyStreet/Cobrand/Default.pm:801 msgid "%s, within %s ward" msgstr "" -#: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:21 perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:21 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:82 msgid "© Crown copyright. All rights reserved. Ministry of Justice 100037819 2008." msgstr "" -#: templates/web/default/email_sent.html:32 +#: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "" @@ -129,31 +129,35 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/default/reports/council.html:90 +#: templates/web/default/reports/council.html:98 msgid "(not sent to council)" msgstr "" -#: templates/web/default/report/display.html:82 templates/web/default/report/new/fill_in_details.html:160 +#: templates/web/default/report/new/fill_in_details.html:233 msgid "(optional)" msgstr "" -#: templates/web/default/reports/council.html:88 +#: templates/web/default/reports/council.html:96 msgid "(sent to both)" msgstr "" -#: templates/web/default/report/display.html:88 templates/web/default/report/new/fill_in_details.html:145 +#: templates/web/default/report/new/fill_in_details.html:227 msgid "(we never show your email address or phone number)" msgstr "" +#: templates/web/default/report/display.html:206 +msgid "(we never show your email)" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Admin.pm:259 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 perllib/FixMyStreet/App/Controller/Report/New.pm:504 perllib/FixMyStreet/DB/Result/Problem.pm:204 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:475 perllib/FixMyStreet/App/Controller/Report/New.pm:503 perllib/FixMyStreet/DB/Result/Problem.pm:204 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 perllib/FixMyStreet/DB/Result/Problem.pm:210 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "" @@ -165,11 +169,11 @@ msgstr "" 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 "" -#: templates/web/default/questionnaire/completed.html:21 +#: templates/web/default/questionnaire/completed.html:25 msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" msgstr "" -#: templates/web/default/questionnaire/completed.html:11 +#: templates/web/default/questionnaire/completed.html:15 msgid "" "<p style=\"font-size:150%%\">We’re sorry to hear that. We have two suggestions: why not try\n" "<a href=\"%s\">writing direct to your councillor(s)</a>\n" @@ -202,14 +206,14 @@ msgid "" "go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" -#: templates/web/default/questionnaire/completed.html:5 +#: templates/web/default/questionnaire/completed.html:9 msgid "" "<p>Thank you very much for filling in our questionnaire; if you\n" "get some more information about the status of your problem, please come back to the\n" "site and leave an update.</p>" msgstr "" -#: templates/web/default/around/display_location.html:93 templates/web/default/around/display_location.html:95 +#: templates/web/default/around/display_location.html:87 templates/web/default/around/display_location.html:89 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -217,6 +221,22 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "" +#: templates/web/default/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "" + +#: templates/web/default/report/new/fill_in_details.html:175 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "" + +#: templates/web/default/report/display.html:160 +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.html:157 +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:34 templates/web/emptyhomes/static/about.html:1 templates/web/emptyhomes/static/about.html:3 msgid "About us" msgstr "" @@ -225,7 +245,11 @@ msgstr "" msgid "Add new category" msgstr "" -#: templates/web/default/auth/change_password.html:30 +#: templates/web/default/my/my.html:45 +msgid "Added %s" +msgstr "" + +#: templates/web/default/auth/change_password.html:31 msgid "Again:" msgstr "" @@ -237,7 +261,7 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:133 +#: templates/web/default/report/display.html:211 msgid "Alert me to future updates" msgstr "" @@ -245,7 +269,7 @@ msgstr "" msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 templates/web/fiksgatami/footer.html:6 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:31 templates/web/fiksgatami/footer.html:6 msgid "All reports" msgstr "" @@ -277,27 +301,19 @@ msgstr "" msgid "Anonymous:" msgstr "" -#: templates/web/fiksgatami/footer.html:15 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>, using some <a href=\"http://github.com/mysociety/fixmystreet\">clever</a> <a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>." -msgstr "" - #: templates/web/default/footer.html:16 -msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a href=\"http://github.com/mysociety/fixmystreet\">clever</a> <a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>." -msgstr "" - -#: templates/web/default/report/new/fill_in_details.html:141 -msgid "Can we show your name on the site?" +msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "" -#: templates/web/default/report/display.html:87 templates/web/default/report/new/fill_in_details.html:143 -msgid "Can we show your name publicly?" +#: templates/web/fiksgatami/footer.html:15 +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/search_reports.html:17 msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 perllib/FixMyStreet/App/Controller/Report/New.pm:505 templates/web/default/admin/council_contacts.html:56 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:478 perllib/FixMyStreet/App/Controller/Report/New.pm:504 templates/web/default/admin/council_contacts.html:56 templates/web/default/admin/council_edit.html:23 templates/web/default/admin/report_edit.html:26 msgid "Category:" msgstr "" @@ -309,7 +325,7 @@ msgstr "" msgid "Change Password" msgstr "" -#: templates/web/default/around/display_location.html:111 templates/web/default/around/display_location.html:113 +#: templates/web/default/around/display_location.html:105 templates/web/default/around/display_location.html:107 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -349,10 +365,14 @@ msgstr "" msgid "Confirmed:" msgstr "" -#: templates/web/default/footer.html:10 templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:9 msgid "Contact" msgstr "" +#: templates/web/default/footer.html:18 +msgid "Contact FixMyStreet" +msgstr "" + #: templates/web/default/contact/index.html:1 templates/web/default/contact/index.html:2 templates/web/default/contact/submit.html:1 msgid "Contact Us" msgstr "" @@ -365,7 +385,7 @@ msgstr "" msgid "Council" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:596 templates/web/default/admin/council_list.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:602 templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "" @@ -401,7 +421,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details.html:100 +#: templates/web/default/admin/report_edit.html:14 templates/web/default/report/new/fill_in_details.html:99 msgid "Details:" msgstr "" @@ -409,6 +429,10 @@ msgstr "" msgid "Diligency prize league table" msgstr "" +#: templates/web/default/auth/general.html:32 +msgid "Do you have a FixMyStreet password?" +msgstr "" + #: templates/web/default/questionnaire/index.html:72 msgid "Don’t know" msgstr "" @@ -429,11 +453,11 @@ msgstr "" msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:20 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_reports.html:15 templates/web/default/report/display.html:95 +#: templates/web/default/admin/council_contacts.html:20 templates/web/default/admin/council_edit.html:42 templates/web/default/admin/list_updates.html:8 templates/web/default/admin/search_reports.html:15 msgid "Email" msgstr "" -#: templates/web/default/around/display_location.html:77 +#: templates/web/default/around/display_location.html:71 msgid "Email me new local problems" msgstr "" @@ -441,23 +465,19 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/default/auth/general.html:47 -msgid "Email the details I need to the address I entered above" -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/auth/general.html:29 templates/web/default/report/display.html:46 templates/web/default/report/new/fill_in_details.html:153 +#: 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 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Empty office or other commercial" msgstr "" @@ -465,27 +485,31 @@ msgstr "" msgid "Empty property details form" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:38 templates/web/default/index.html:41 +#: templates/web/default/around/around_index.html:10 templates/web/default/around/around_index.html:13 templates/web/default/index.html:24 templates/web/default/index.html:27 msgid "Enter a nearby GB postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:26 msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/default/index.html:59 +#: templates/web/default/auth/general.html:64 templates/web/default/report/display.html:167 templates/web/default/report/new/fill_in_details.html:182 +msgid "Enter a new password:" +msgstr "" + +#: templates/web/default/index.html:45 msgid "Enter details of the problem" msgstr "" -#: templates/web/default/auth/token.html:5 templates/web/default/questionnaire/error.html:1 templates/web/default/questionnaire/error.html:3 templates/web/default/tokens/abuse.html:1 templates/web/default/tokens/abuse.html:3 templates/web/default/tokens/error.html:1 templates/web/default/tokens/error.html:3 +#: templates/web/default/auth/token.html:5 templates/web/default/errors/generic.html:1 templates/web/default/errors/generic.html:3 templates/web/default/tokens/abuse.html:1 templates/web/default/tokens/abuse.html:3 templates/web/default/tokens/error.html:1 templates/web/default/tokens/error.html:3 msgid "Error" msgstr "" @@ -501,7 +525,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/default/header.html:16 templates/web/fiksgatami/header.html:14 +#: templates/web/default/header.html:20 templates/web/fiksgatami/header.html:14 msgid "Fix<span id=\"my\">My</span>Street" msgstr "" @@ -530,7 +554,7 @@ msgid "" "for the county council." msgstr "" -#: templates/web/default/front_stats.html:7 +#: templates/web/default/front/stats.html:7 msgid "FixMyStreet updates" msgstr "" @@ -538,10 +562,18 @@ msgstr "" msgid "Fixed" msgstr "" +#: templates/web/default/my/my.html:24 +msgid "Fixed reports" +msgstr "" + #: templates/web/default/admin/search_reports.html:48 msgid "Fixed:" msgstr "" +#: templates/web/default/reports/council.html:23 +msgid "Follow a ward link to view only reports within that ward." +msgstr "" + #: templates/web/default/admin/report_edit.html:16 msgid "For council(s):" msgstr "" @@ -554,15 +586,11 @@ msgstr "" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:26 -msgid "Get FixMyStreet on your iPhone" -msgstr "" - #: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "" -#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:47 +#: templates/web/default/alert/index.html:24 templates/web/default/around/around_index.html:17 templates/web/default/index.html:33 msgid "Go" msgstr "" @@ -586,7 +614,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:9 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:8 +#: templates/web/default/footer.html:10 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:8 msgid "Help" msgstr "" @@ -598,11 +626,11 @@ msgstr "" msgid "Hidden" msgstr "" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:52 msgid "Hide pins" msgstr "" -#: templates/web/default/around/display_location.html:59 +#: templates/web/default/around/display_location.html:57 msgid "Hide stale reports" msgstr "" @@ -610,15 +638,15 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/default/index.html:54 +#: templates/web/default/index.html:40 msgid "How to report a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:514 +#: perllib/FixMyStreet/App/Controller/Admin.pm:520 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" @@ -638,7 +666,7 @@ msgstr "" msgid "If you submit a report here it will be left on the site, but not reported to the council – please still leave your report, so that we can show to the council the activity in their area." msgstr "" -#: templates/web/default/email_sent.html:28 +#: templates/web/default/auth/token.html:23 templates/web/default/email_sent.html:24 msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." msgstr "" @@ -653,11 +681,11 @@ msgstr "" msgid "Illegal ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:105 +#: perllib/FixMyStreet/App/Controller/Alert.pm:102 msgid "Illegal feed selection" msgstr "" -#: templates/web/default/around/display_location.html:61 +#: templates/web/default/around/display_location.html:59 msgid "Include stale reports" msgstr "" @@ -665,6 +693,10 @@ msgstr "" 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.html:164 +msgid "Keep me signed in on this computer" +msgstr "" + #: templates/web/default/admin/council_contacts.html:23 msgid "Last editor" msgstr "" @@ -689,36 +721,24 @@ msgstr "" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 msgid "Local alerts" msgstr "" -#: templates/web/default/index.html:58 +#: templates/web/default/index.html:44 msgid "Locate the problem on a map of the area" msgstr "" -#: templates/web/default/auth/general.html:43 -msgid "Log me in" -msgstr "" - -#: templates/web/default/auth/general.html:1 templates/web/default/auth/general.html:3 -msgid "Login or create an account" -msgstr "" - -#: templates/web/default/auth/logout.html:1 -msgid "Logout" -msgstr "" - #: perllib/FixMyStreet/Map/OSM.pm:43 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 perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:21 perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 +#: 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:27 -msgid "Map contains Ordnance Survey data © Crown copyright and database right 2010. Microsoft" +#: 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 @@ -729,15 +749,11 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/default/my/my.html:1 -msgid "My Reports" -msgstr "" - #: 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 msgid "Name" msgstr "" -#: templates/web/default/admin/report_edit.html:27 templates/web/default/admin/update_edit.html:23 templates/web/default/report/display.html:81 templates/web/default/report/new/fill_in_details.html:130 +#: templates/web/default/admin/report_edit.html:27 templates/web/default/admin/update_edit.html:23 msgid "Name:" msgstr "" @@ -745,7 +761,7 @@ msgstr "" msgid "Navigation" msgstr "" -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" @@ -761,7 +777,7 @@ msgstr "" msgid "New local reports on reportemptyhomes.com" msgstr "" -#: templates/web/default/reports/council.html:43 templates/web/default/reports/council.html:44 templates/web/default/reports/index.html:11 templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/reports/index.html:10 +#: templates/web/default/reports/council.html:57 templates/web/default/reports/council.html:58 templates/web/default/reports/index.html:11 templates/web/emptyhomes/reports/index.html:11 templates/web/fiksgatami/reports/index.html:10 msgid "New problems" msgstr "" @@ -805,7 +821,7 @@ msgstr "" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "" -#: templates/web/default/index.html:27 +#: templates/web/default/front/news.html:8 templates/web/fiksgatami/front/news.html:9 msgid "New!" msgstr "" @@ -853,15 +869,23 @@ msgstr "" msgid "Note:" msgstr "" +#: templates/web/default/report/new/fill_in_details.html:148 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "" + +#: templates/web/default/report/display.html:133 +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 msgid "Offensive? Unsuitable? Tell us" msgstr "" -#: templates/web/default/reports/council.html:72 templates/web/default/reports/council.html:73 +#: templates/web/default/reports/council.html:80 templates/web/default/reports/council.html:81 msgid "Old fixed" msgstr "" -#: templates/web/default/reports/council.html:60 templates/web/default/reports/council.html:61 +#: templates/web/default/reports/council.html:74 templates/web/default/reports/council.html:75 msgid "Old problems, state unknown" msgstr "" @@ -873,7 +897,7 @@ msgstr "" msgid "Older fixed" msgstr "" -#: templates/web/default/reports/council.html:50 templates/web/default/reports/council.html:52 templates/web/default/reports/council.html:56 templates/web/default/reports/council.html:57 templates/web/default/reports/index.html:12 templates/web/emptyhomes/reports/index.html:12 templates/web/fiksgatami/reports/index.html:11 +#: templates/web/default/reports/council.html:64 templates/web/default/reports/council.html:66 templates/web/default/reports/council.html:70 templates/web/default/reports/council.html:71 templates/web/default/reports/index.html:12 templates/web/emptyhomes/reports/index.html:12 templates/web/fiksgatami/reports/index.html:11 msgid "Older problems" msgstr "" @@ -881,6 +905,10 @@ msgstr "" msgid "Open" msgstr "" +#: templates/web/default/my/my.html:19 +msgid "Open reports" +msgstr "" + #: templates/web/default/alert/list.html:87 msgid "Or problems reported to:" msgstr "" @@ -889,7 +917,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "" -#: bin/send-reports:168 bin/send-reports:177 perllib/FixMyStreet/App/Controller/Report/New.pm:495 perllib/FixMyStreet/App/Controller/Report/New.pm:504 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/DB/Result/Problem.pm:316 perllib/FixMyStreet/DB/Result/Problem.pm:326 perllib/FixMyStreet/DB/Result/Problem.pm:336 perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: bin/send-reports:168 bin/send-reports:177 perllib/FixMyStreet/App/Controller/Report/New.pm:494 perllib/FixMyStreet/App/Controller/Report/New.pm:503 perllib/FixMyStreet/App/Controller/Report/New.pm:863 perllib/FixMyStreet/DB/Result/Problem.pm:316 perllib/FixMyStreet/DB/Result/Problem.pm:326 perllib/FixMyStreet/DB/Result/Problem.pm:336 perllib/FixMyStreet/DB/Result/Problem.pm:348 msgid "Other" msgstr "" @@ -901,15 +929,15 @@ msgstr "" msgid "Partial" msgstr "" -#: templates/web/default/auth/change_password.html:26 templates/web/default/auth/general.html:33 +#: templates/web/default/auth/change_password.html:27 msgid "Password:" msgstr "" -#: bin/send-reports:68 templates/web/default/admin/report_edit.html:29 templates/web/default/report/new/fill_in_details.html:158 +#: bin/send-reports:68 templates/web/default/admin/report_edit.html:29 templates/web/default/report/new/fill_in_details.html:231 msgid "Phone:" msgstr "" -#: templates/web/default/questionnaire/index.html:97 templates/web/default/report/display.html:125 templates/web/default/report/new/fill_in_details.html:120 +#: templates/web/default/questionnaire/index.html:97 templates/web/default/report/display.html:109 templates/web/default/report/new/fill_in_details.html:119 msgid "Photo:" msgstr "" @@ -917,7 +945,7 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/default/index.html:76 +#: templates/web/default/index.html:63 msgid "Photos of recent reports" msgstr "" @@ -925,7 +953,7 @@ msgstr "" msgid "Please be polite, concise and to the point." msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:17 +#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:19 msgid "Please check the passwords and try again" msgstr "" @@ -937,7 +965,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 perllib/FixMyStreet/App/Controller/Report/New.pm:659 perllib/FixMyStreet/App/Controller/Report/New.pm:675 perllib/FixMyStreet/DB/Result/Problem.pm:206 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:650 perllib/FixMyStreet/App/Controller/Report/New.pm:669 perllib/FixMyStreet/App/Controller/Report/New.pm:686 perllib/FixMyStreet/DB/Result/Problem.pm:206 msgid "Please choose a category" msgstr "" @@ -956,11 +984,11 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:108 +#: perllib/FixMyStreet/DB/Result/Comment.pm:111 msgid "Please enter a message" msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:15 +#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:17 msgid "Please enter a password" msgstr "" @@ -968,11 +996,11 @@ msgstr "" msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/DB/Result/User.pm:91 +#: perllib/FixMyStreet/DB/Result/User.pm:92 msgid "Please enter a valid email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:123 perllib/FixMyStreet/App/Controller/Contact.pm:105 +#: perllib/FixMyStreet/App/Controller/Alert.pm:345 perllib/FixMyStreet/App/Controller/Contact.pm:105 msgid "Please enter a valid email address" msgstr "" @@ -980,15 +1008,15 @@ msgstr "" msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 perllib/FixMyStreet/DB/Result/User.pm:88 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:94 perllib/FixMyStreet/DB/Result/User.pm:89 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:199 perllib/FixMyStreet/DB/Result/User.pm:83 +#: perllib/FixMyStreet/DB/Result/Problem.pm:199 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:93 perllib/FixMyStreet/DB/Result/Problem.pm:192 perllib/FixMyStreet/DB/Result/User.pm:76 +#: perllib/FixMyStreet/App/Controller/Contact.pm:93 perllib/FixMyStreet/DB/Result/Comment.pm:108 perllib/FixMyStreet/DB/Result/Problem.pm:192 perllib/FixMyStreet/DB/Result/User.pm:85 msgid "Please enter your name" msgstr "" @@ -1014,11 +1042,11 @@ msgid "" "photo of the problem if you have one), etc." msgstr "" -#: templates/web/default/report/new/fill_in_details.html:49 +#: templates/web/default/report/new/fill_in_details.html:48 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:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1026,7 +1054,7 @@ msgstr "" 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 "" -#: templates/web/default/report/new/fill_in_details.html:34 +#: templates/web/default/report/new/fill_in_details.html:33 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "" @@ -1034,27 +1062,27 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:252 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:245 msgid "Please provide some text as well as a photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:122 perllib/FixMyStreet/App/Controller/Questionnaire.pm:238 +#: 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 "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:85 +#: perllib/FixMyStreet/App/Controller/Alert.pm:82 msgid "Please select the feed you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:125 +#: perllib/FixMyStreet/App/Controller/Alert.pm:120 msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:234 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:227 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1062,7 +1090,7 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:728 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 msgid "Please upload a JPEG image only" msgstr "" @@ -1070,7 +1098,7 @@ msgstr "" msgid "Please write a message" msgstr "" -#: templates/web/default/contact/index.html:93 templates/web/default/report/display.html:138 +#: 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 msgid "Post" msgstr "" @@ -1082,7 +1110,7 @@ msgstr "" msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/Map/Tilma/Original.pm:90 templates/web/default/maps/openlayers.html:81 templates/web/default/maps/tilma/original.html:62 +#: perllib/FixMyStreet/Map/Tilma/Original.pm:92 templates/web/default/maps/openlayers.html:89 templates/web/default/maps/tilma/original.html:63 msgid "Problem" msgstr "" @@ -1102,11 +1130,11 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:743 +#: perllib/FixMyStreet/App/Controller/Admin.pm:749 msgid "Problem marked as open." msgstr "" -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:67 msgid "Problems in this area" msgstr "" @@ -1118,15 +1146,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:127 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:129 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 msgid "Problems within %s ward" msgstr "" -#: templates/web/default/reports/council.html:11 templates/web/default/reports/council.html:14 +#: templates/web/default/reports/council.html:0 templates/web/default/reports/council.html:16 msgid "Problems within %s, FixMyStreet" msgstr "" @@ -1138,7 +1166,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:470 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:469 msgid "Property type:" msgstr "" @@ -1146,7 +1174,11 @@ msgstr "" msgid "Provide an update" msgstr "" -#: templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 +#: templates/web/default/report/display.html:172 templates/web/default/report/new/fill_in_details.html:187 +msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "" + +#: templates/web/default/questionnaire/completed.html:1 templates/web/default/questionnaire/completed.html:2 templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 msgid "Questionnaire" msgstr "" @@ -1158,27 +1190,27 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:188 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 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:17 +#: 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:34 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 perllib/FixMyStreet/Cobrand/Default.pm:771 +#: perllib/FixMyStreet/Cobrand/Default.pm:750 perllib/FixMyStreet/Cobrand/Default.pm:764 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:764 perllib/FixMyStreet/Cobrand/Default.pm:778 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 perllib/FixMyStreet/Cobrand/Default.pm:771 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:787 perllib/FixMyStreet/Cobrand/Default.pm:801 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:143 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:151 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:169 +#: perllib/FixMyStreet/Cobrand/Default.pm:780 perllib/FixMyStreet/Cobrand/Default.pm:794 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:145 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:153 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 perllib/FixMyStreet/Cobrand/Default.pm:800 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1186,15 +1218,15 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:34 msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:126 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:128 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 msgid "RSS feed of problems within %s ward" msgstr "" @@ -1210,15 +1242,15 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:35 +#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "" -#: templates/web/default/reports/council.html:68 templates/web/default/reports/council.html:69 templates/web/default/reports/index.html:14 templates/web/emptyhomes/reports/index.html:13 templates/web/fiksgatami/reports/index.html:13 +#: templates/web/default/reports/council.html:52 templates/web/default/reports/council.html:53 templates/web/default/reports/index.html:14 templates/web/emptyhomes/reports/index.html:13 templates/web/fiksgatami/reports/index.html:13 msgid "Recently fixed" msgstr "" -#: templates/web/default/index.html:85 +#: templates/web/default/index.html:72 msgid "Recently reported problems" msgstr "" @@ -1246,6 +1278,14 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" +#: templates/web/default/my/my.html:63 +msgid "Reported %s" +msgstr "" + +#: templates/web/default/my/my.html:61 +msgid "Reported %s, to %s" +msgstr "" + #: perllib/FixMyStreet/DB/Result/Problem.pm:331 templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" msgstr "" @@ -1282,11 +1322,11 @@ msgstr "" msgid "Reported in the %s category by %s at %s" msgstr "" -#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details.html:30 +#: templates/web/default/around/around_index.html:1 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:29 templates/web/default/report/new/fill_in_details.html:3 msgid "Reporting a problem" msgstr "" -#: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:97 msgid "Reports on and around the map" msgstr "" @@ -1298,7 +1338,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 templates/web/default/admin/search_reports.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:603 templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "" @@ -1310,7 +1350,7 @@ 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:390 +#: perllib/FixMyStreet/DB/Result/Problem.pm:396 msgid "Sent to %s %s later" msgstr "" @@ -1339,10 +1379,34 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/around/display_location.html:52 +#: templates/web/default/report/display.html:205 templates/web/default/report/new/fill_in_details.html:226 +msgid "Show my name publicly" +msgstr "" + +#: templates/web/default/around/display_location.html:50 msgid "Show pins" msgstr "" +#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 +msgid "Sign in" +msgstr "" + +#: templates/web/default/auth/general.html:74 +msgid "Sign in by email" +msgstr "" + +#: templates/web/default/auth/general.html:1 +msgid "Sign in or create an account" +msgstr "" + +#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:26 +msgid "Sign out" +msgstr "" + +#: templates/web/default/header.html:25 +msgid "Signed in as %s" +msgstr "" + #: templates/web/default/alert/index.html:31 msgid "Some photos of recent reports" msgstr "" @@ -1355,26 +1419,26 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Geocode.pm:171 +#: perllib/FixMyStreet/Geocode.pm:206 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:71 -msgid "Sorry, that location appears to be too general; please be more specific." -msgstr "" - #: templates/web/default/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:103 perllib/FixMyStreet/Geocode.pm:150 +#: perllib/FixMyStreet/Geocode.pm:131 perllib/FixMyStreet/Geocode.pm:181 perllib/FixMyStreet/Geocode.pm:56 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:148 +#: perllib/FixMyStreet/Geocode.pm:123 perllib/FixMyStreet/Geocode.pm:174 msgid "Sorry, we could not parse that location. Please try again." msgstr "" +#: templates/web/default/footer.html:17 templates/web/fiksgatami/footer.html:15 +msgid "Source code" +msgstr "" + #: templates/web/default/admin/list_updates.html:6 templates/web/default/admin/search_reports.html:21 msgid "State" msgstr "" @@ -1383,11 +1447,11 @@ msgstr "" msgid "State:" msgstr "" -#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details.html:91 +#: templates/web/default/admin/report_edit.html:13 templates/web/default/contact/index.html:83 templates/web/default/report/new/fill_in_details.html:90 msgid "Subject:" msgstr "" -#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details.html:171 +#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details.html:131 templates/web/default/report/new/fill_in_details.html:169 templates/web/default/report/new/fill_in_details.html:190 msgid "Submit" msgstr "" @@ -1403,11 +1467,11 @@ msgstr "" msgid "Subscribe" msgstr "" -#: templates/web/default/alert/list.html:124 +#: templates/web/default/alert/list.html:128 msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:595 templates/web/default/admin/index.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:601 templates/web/default/admin/index.html:1 msgid "Summary" msgstr "" @@ -1415,7 +1479,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 templates/web/default/admin/questionnaire.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -1467,7 +1531,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:737 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -1475,15 +1539,15 @@ msgstr "" msgid "That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:81 +#: perllib/FixMyStreet/App/Controller/Location.pm:107 msgid "That location does not appear to be in Britain; please try again." msgstr "" -#: perllib/FixMyStreet/Geocode.pm:165 +#: perllib/FixMyStreet/Geocode.pm:200 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:496 +#: perllib/FixMyStreet/App/Controller/Admin.pm:502 msgid "That problem will now be resent." msgstr "" @@ -1510,7 +1574,7 @@ msgid "" " the UK." msgstr "" -#: templates/web/default/email_sent.html:26 +#: templates/web/default/auth/token.html:21 templates/web/default/email_sent.html:22 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" @@ -1562,7 +1626,7 @@ msgstr "" msgid "The latest reports within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/default/auth/change_password.html:12 templates/web/default/auth/change_password.html:16 +#: templates/web/default/auth/change_password.html:14 templates/web/default/auth/change_password.html:18 msgid "The passwords do not match" msgstr "" @@ -1570,7 +1634,7 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:477 perllib/FixMyStreet/App/Controller/Admin.pm:647 perllib/FixMyStreet/App/Controller/Admin.pm:686 perllib/FixMyStreet/App/Controller/Admin.pm:771 +#: perllib/FixMyStreet/App/Controller/Admin.pm:483 perllib/FixMyStreet/App/Controller/Admin.pm:653 perllib/FixMyStreet/App/Controller/Admin.pm:692 perllib/FixMyStreet/App/Controller/Admin.pm:777 msgid "The requested URL was not found on this server." msgstr "" @@ -1586,11 +1650,23 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:576 perllib/FixMyStreet/App/Controller/Report/Update.pm:117 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 "" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:354 +msgid "There was a problem with your email/password combination. Please try again." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:115 msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:202 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:211 msgid "There were problems with your update. Please see below." msgstr "" @@ -1606,11 +1682,11 @@ msgstr "" msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" -#: templates/web/default/reports/council.html:20 +#: templates/web/default/reports/council.html:37 msgid "This is a summary of all reports for one %s." msgstr "" -#: templates/web/default/reports/council.html:22 +#: templates/web/default/reports/council.html:39 msgid "This is a summary of all reports for this %s." msgstr "" @@ -1618,11 +1694,15 @@ 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:840 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:111 +#: perllib/FixMyStreet/Cobrand/Default.pm:833 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 templates/web/default/report/display.html:96 msgid "This problem has been fixed" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: templates/web/default/report/display.html:91 +msgid "This problem has not been fixed" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:829 msgid "This problem is old and of unknown status." msgstr "" @@ -1638,7 +1718,7 @@ msgstr "" msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:598 templates/web/default/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:604 templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -1652,7 +1732,7 @@ msgid "" "postcode or street name and area:" msgstr "" -#: templates/web/default/around/display_location.html:92 +#: templates/web/default/around/display_location.html:86 msgid "To report a problem, simply <strong>click on the map</strong> at the correct location." msgstr "" @@ -1672,7 +1752,7 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:70 perllib/FixMyStreet/App/Controller/Report/Update.pm:24 +#: perllib/FixMyStreet/App/Controller/Report.pm:70 msgid "Unknown problem ID" msgstr "" @@ -1700,11 +1780,11 @@ msgstr "" msgid "Update statuses" msgstr "" -#: templates/web/default/report/display.html:103 +#: templates/web/default/report/display.html:84 msgid "Update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:570 perllib/FixMyStreet/App/Controller/Admin.pm:733 +#: perllib/FixMyStreet/App/Controller/Admin.pm:576 perllib/FixMyStreet/App/Controller/Admin.pm:739 msgid "Updated!" msgstr "" @@ -1732,7 +1812,7 @@ msgstr "" msgid "View your report" msgstr "" -#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34 +#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:33 msgid "Viewing a location" msgstr "" @@ -1740,7 +1820,11 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#: perllib/FixMyStreet/Geocode.pm:155 perllib/FixMyStreet/Geocode.pm:174 +#: templates/web/default/reports/council.html:22 +msgid "Wards of this council" +msgstr "" + +#: perllib/FixMyStreet/Geocode.pm:126 perllib/FixMyStreet/Geocode.pm:176 perllib/FixMyStreet/Geocode.pm:209 msgid "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region." msgstr "" @@ -1748,8 +1832,8 @@ msgstr "" msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "" -#: perllib/FixMyStreet/App/Controller/Around.pm:229 -msgid "We had a problem with the supplied co-ordinates - outside the UK?" +#: templates/web/default/auth/token.html:19 +msgid "We have sent you an email containing a link to confirm your account." msgstr "" #: templates/web/emptyhomes/tokens/confirm_problem.html:18 templates/web/emptyhomes/tokens/confirm_problem.html:20 @@ -1760,7 +1844,7 @@ msgstr "" 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 "" -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:46 msgid "We send it to the council on your behalf" msgstr "" @@ -1784,7 +1868,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 msgid "Whole block of empty flats" msgstr "" @@ -1808,39 +1892,35 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/default/reports/council.html:35 -msgid "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports\">show all councils</a>." +#: templates/web/default/reports/council.html:43 +msgid "You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/reports\">show all councils</a>." msgstr "" -#: templates/web/default/reports/council.html:31 -msgid "You can <a href=\"%s\">see less detail</a>." -msgstr "" - -#: templates/web/default/reports/council.html:37 -msgid "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports\">show all councils</a>." -msgstr "" - -#: templates/web/default/reports/council.html:33 -msgid "You can <a href=\"%s\">see more details</a>." +#: templates/web/default/reports/council.html:45 +msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "" #: templates/web/default/report/new/no_councils_text.html:14 templates/web/default/report/new/no_councils_text.html:3 templates/web/default/report/new/some_councils_text.html:20 templates/web/default/report/new/some_councils_text.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 "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:45 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 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/display.html:122 templates/web/default/report/new/fill_in_details.html:111 +#: templates/web/default/questionnaire/index.html:94 templates/web/default/report/new/fill_in_details.html:110 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" -#: templates/web/default/auth/logout.html:3 -msgid "You have been logged out" +#: templates/web/default/report/display.html:106 +msgid "You have already attached a photo to this update, attaching another one will replace it." +msgstr "" + +#: templates/web/default/auth/sign_out.html:3 +msgid "You have been signed out" msgstr "" -#: templates/web/default/report/new/fill_in_details.html:36 +#: templates/web/default/report/new/fill_in_details.html:35 msgid "You have located the problem at the point marked with a purple pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" @@ -1864,7 +1944,11 @@ msgstr "" msgid "You have successfully deleted your alert." msgstr "" -#: templates/web/default/email_sent.html:30 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "" + +#: templates/web/default/email_sent.html:26 msgid "You must now click the link in the email we've just sent you — if you do not, %s." msgstr "" @@ -1872,18 +1956,34 @@ msgstr "" msgid "You really want to resend?" msgstr "" -#: templates/web/default/my/my.html:3 +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 templates/web/default/my/my.html:3 msgid "Your Reports" msgstr "" -#: templates/web/default/alert/list.html:120 +#: templates/web/default/auth/general.html:27 +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.html:141 msgid "Your email:" msgstr "" -#: templates/web/default/contact/index.html:68 +#: 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.html:219 msgid "Your name:" msgstr "" +#: templates/web/default/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "" + +#: templates/web/default/footer.html:7 +msgid "Your reports" +msgstr "" + +#: templates/web/default/my/my.html:37 +msgid "Your updates" +msgstr "" + #: templates/web/default/contact/index.html:76 msgid "Your email:" msgstr "" @@ -1900,7 +2000,7 @@ msgstr "" msgid "didn't use map" msgstr "" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:247 msgid "less than a minute" msgstr "" @@ -1936,7 +2036,7 @@ msgstr "" msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:217 +#: perllib/Utils.pm:221 msgid "today" msgstr "" @@ -1972,7 +2072,7 @@ msgstr "" msgid "your update will not be posted" msgstr "" -#: templates/web/default/front_stats.html:19 +#: templates/web/default/front/stats.html:19 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -1986,30 +2086,30 @@ 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:14 #, 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:25 #, 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/report/new/some_councils_text.html:14 +#: templates/web/default/front/stats.html:31 #, perl-format -msgid "We do <strong>not</strong> yet have details for the other council that covers this location." -msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front_stats.html:31 +#: templates/web/default/report/new/some_councils_text.html:14 #, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" +msgid "We do <strong>not</strong> yet have details for the other council that covers this location." +msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "" msgstr[1] "" |