diff options
| -rw-r--r-- | locale/FixMyStreet.po | 542 | ||||
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 784 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 781 | ||||
| -rw-r--r-- | templates/web/fiksgatami/footer.html | 2 |
4 files changed, 1281 insertions, 828 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] "" diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index 7395ef230..e830ed18e 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-06-14 17:28+0100\n" +"POT-Creation-Date: 2011-07-01 20:12+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:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:376 msgid " and " msgstr "" @@ -53,12 +53,12 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:245 +#: perllib/Utils.pm:251 #, fuzzy msgid "%d day" msgstr "diwrnod" -#: perllib/Utils.pm:245 +#: perllib/Utils.pm:251 #, fuzzy msgid "%d days" msgstr "diwrnod" @@ -67,12 +67,12 @@ msgstr "diwrnod" msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:252 #, fuzzy msgid "%d hour" msgstr "awr" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:252 #, 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:247 +#: perllib/Utils.pm:253 #, fuzzy msgid "%d minute" msgstr "munud" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:253 #, fuzzy msgid "%d minutes" msgstr "munud" @@ -96,23 +96,23 @@ msgstr "munud" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 #, fuzzy msgid "%d week" msgstr "wythnos" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 #, fuzzy msgid "%d weeks" msgstr "wythnos" -#: 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 "%s - Adroddiadau cryno" -#: 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 "" @@ -124,21 +124,20 @@ msgstr "Rhoddodd %s wybod yn ddi-enw am %s" msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:794 -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" -#: 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 #, fuzzy msgid "" "© Crown copyright. All rights reserved. Ministry of Justice " "100037819 2008." msgstr "Hawlfraint y Goron. Cedwir pob hawl. Y Weinyddiaeth Amddiffyn" -#: templates/web/default/email_sent.html:32 +#: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "" @@ -159,38 +158,41 @@ msgstr "(wedi'i adfer i'w ddefnyddio)" msgid " " msgstr " " -#: templates/web/default/reports/council.html:90 +#: templates/web/default/reports/council.html:98 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: 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 "(dewisol)" -#: templates/web/default/reports/council.html:88 +#: templates/web/default/reports/council.html:96 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: 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 "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" +#: templates/web/default/report/display.html:206 +#, 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:259 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:475 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:503 #: perllib/FixMyStreet/DB/Result/Problem.pm:204 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 #: perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" @@ -210,7 +212,7 @@ msgstr "" "\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=" "\"logoie\"></span></a>" -#: templates/web/default/questionnaire/completed.html:21 +#: templates/web/default/questionnaire/completed.html:25 #, fuzzy msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -219,7 +221,7 @@ msgstr "" "<p style=\"font-size:150%\">Diolch yn fawr am lenwi'n holiadur; rydym yn " "falch o glywed ei fod wedi'i adfer i'w ddefnyddio.</p>\n" -#: templates/web/default/questionnaire/completed.html:11 +#: templates/web/default/questionnaire/completed.html:15 #, fuzzy msgid "" "<p style=\"font-size:150%%\">We’re sorry to hear that. We have two " @@ -307,7 +309,7 @@ msgstr "" "<a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www." "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" -#: templates/web/default/questionnaire/completed.html:5 +#: templates/web/default/questionnaire/completed.html:9 #, fuzzy msgid "" "<p>Thank you very much for filling in our questionnaire; if you\n" @@ -319,8 +321,8 @@ msgstr "" "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n" "a rhowch ddiweddariad yno.</p>\n" -#: 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 #, fuzzy msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " @@ -334,6 +336,27 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" +#: 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 +#, 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 +#, 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.html:157 +#, 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:34 @@ -346,7 +369,11 @@ msgstr "Amdanom ni" 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 "" @@ -358,7 +385,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 "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" @@ -366,7 +393,7 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" msgid "All confirmed" msgstr "" -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:31 #: templates/web/fiksgatami/footer.html:6 msgid "Reports" msgstr "Adroddiadau" @@ -424,38 +451,14 @@ msgstr "Di-enw" msgid "Anonymous:" msgstr "Di-enw" -#: templates/web/fiksgatami/footer.html:15 -#, fuzzy -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 "" -"Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan " -"ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?" -"d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/" -"fixmystreet\">clyfar</a> ." - #: 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>." +msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "" -"Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan " -"ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?" -"d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/" -"fixmystreet\">clyfar</a> ." -#: templates/web/default/report/new/fill_in_details.html:141 -msgid "Can we show your name on the site?" -msgstr "Allwn ni ddangos eich enw chi ar y safle?" - -#: 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 @@ -464,8 +467,8 @@ msgstr "" msgid "Category" msgstr "Categori:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:505 +#: 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 @@ -483,8 +486,8 @@ msgstr "Categori:" 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 empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -541,10 +544,15 @@ msgstr "Cadarnhau" msgid "Confirmed:" msgstr "Cadarnhau" -#: templates/web/default/footer.html:10 templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:9 msgid "Contact" msgstr "Cysylltu" +#: templates/web/default/footer.html:18 +#, fuzzy +msgid "Contact reportemptyhomes.com" +msgstr "Adroddiadau newydd ar reportemptyhomes.com" + #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 @@ -561,7 +569,7 @@ msgstr "Cysylltu â'r tîm" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:596 +#: perllib/FixMyStreet/App/Controller/Admin.pm:602 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -609,7 +617,7 @@ msgid "Deleted" msgstr "" #: templates/web/default/admin/report_edit.html:14 -#: templates/web/default/report/new/fill_in_details.html:100 +#: templates/web/default/report/new/fill_in_details.html:99 msgid "Details:" msgstr "Manylion:" @@ -617,6 +625,11 @@ msgstr "Manylion:" msgid "Diligency prize league table" msgstr "" +#: templates/web/default/auth/general.html:32 +#, fuzzy +msgid "Do you have a reportemptyhomes.com password?" +msgstr "Diweddariadau i reportemptyhomes.com" + #: templates/web/default/questionnaire/index.html:72 msgid "Don’t know" msgstr "Ddim yn gwybod" @@ -644,12 +657,11 @@ msgstr "" #: 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 #, fuzzy msgid "Email" msgstr "E-bost:" -#: templates/web/default/around/display_location.html:77 +#: templates/web/default/around/display_location.html:71 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" @@ -657,30 +669,24 @@ msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: 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 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:463 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -688,32 +694,39 @@ 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:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." #: 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/index.html:24 templates/web/default/index.html:27 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:26 #, fuzzy msgid "Enter a nearby postcode, or street name and area" msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" -#: 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 +#, fuzzy +msgid "Enter a new password:" +msgstr "Ychwanegwch neges" + +#: templates/web/default/index.html:45 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" #: templates/web/default/auth/token.html:5 -#: templates/web/default/questionnaire/error.html:1 -#: templates/web/default/questionnaire/error.html:3 +#: 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 @@ -739,7 +752,7 @@ msgstr "" msgid "First time" msgstr "Y tro cyntaf" -#: templates/web/default/header.html:16 +#: templates/web/default/header.html:20 #: templates/web/fiksgatami/header.html:14 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Trwsio<span id=\"my\">Fy</span>Stryd" @@ -791,7 +804,7 @@ 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 +#: templates/web/default/front/stats.html:7 msgid "reportemptyhomes.com updates" msgstr "Diweddariadau i reportemptyhomes.com" @@ -799,10 +812,19 @@ msgstr "Diweddariadau i reportemptyhomes.com" msgid "Fixed" msgstr "" +#: templates/web/default/my/my.html:24 +#, fuzzy +msgid "Fixed reports" +msgstr "Cuddio hen adroddiadau " + #: 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 #, fuzzy msgid "For council(s):" @@ -819,18 +841,13 @@ msgstr "Cwestiynau Cyffredin" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:26 -#, fuzzy -msgid "Get reportemptyhomes.com on your iPhone" -msgstr "Cael yr Asiantaeth Tai Gwag ar eich iPhone" - #: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "Rhowch borthiant RSS i mi" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:47 +#: templates/web/default/index.html:33 msgid "Go" msgstr "Ewch" @@ -860,7 +877,8 @@ msgstr "" "Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai " "dyma'ch tro cyntaf?" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:33 +#: templates/web/default/footer.html:10 +#: templates/web/emptyhomes/header.html:33 #: templates/web/fiksgatami/footer.html:8 msgid "FAQs" msgstr "Cwestiynau Cyffredin" @@ -876,11 +894,11 @@ msgstr "" msgid "Hidden" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:52 msgid "Hide pins" msgstr "Cuddio pinnau" -#: templates/web/default/around/display_location.html:59 +#: templates/web/default/around/display_location.html:57 msgid "Hide stale reports" msgstr "Cuddio hen adroddiadau " @@ -888,15 +906,15 @@ msgstr "Cuddio hen adroddiadau " msgid "History" msgstr "" -#: templates/web/default/index.html:54 +#: templates/web/default/index.html:40 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: 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 empty property in the database.\n" msgstr "" "Yn anffodus ni fu modd i ni ddod o hyd i'ch eiddo gwag yn y gronfa ddata.\n" @@ -936,7 +954,8 @@ msgstr "" "fel y gallwn\n" "ddangos i'r cyngor y gweithgarwch yn ei ardal." -#: 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 " @@ -960,11 +979,11 @@ msgstr "" msgid "Illegal ID" msgstr "ID Anghyfreithlon" -#: perllib/FixMyStreet/App/Controller/Alert.pm:105 +#: perllib/FixMyStreet/App/Controller/Alert.pm:102 msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" -#: templates/web/default/around/display_location.html:61 +#: templates/web/default/around/display_location.html:59 msgid "Include stale reports" msgstr "Cynnwys hen adroddiadau" @@ -992,6 +1011,12 @@ msgstr "" "yn gwneud unrhyw beth. Rydym yn annog cynghorau i ddiweddaru'r wefan \n" "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.html:164 +msgid "Keep me signed in on this computer" +msgstr "" + #: templates/web/default/admin/council_contacts.html:23 msgid "Last editor" msgstr "" @@ -1030,28 +1055,15 @@ 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:8 templates/web/emptyhomes/header.html:32 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:32 #: templates/web/fiksgatami/footer.html:7 msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:58 +#: templates/web/default/index.html:44 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" -#: 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/" @@ -1060,17 +1072,16 @@ msgid "" msgstr "" #: perllib/FixMyStreet/Map/OSM/StreetView.pm:27 -#: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:21 -#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " "2010." msgstr "" -#: perllib/FixMyStreet/Map/FMS.pm:27 +#: perllib/FixMyStreet/Map/FMS.pm:24 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " -"2010. Microsoft" +"2010.<br>© 2011 <a href=\"http://www.bing.com/maps/\">Microsoft</a>. " +"© AND, Navteq, Ordnance Survey." msgstr "" #: templates/web/default/contact/index.html:90 @@ -1081,11 +1092,6 @@ msgstr "Neges:" msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/default/my/my.html:1 -#, fuzzy -msgid "My Reports" -msgstr "Adroddiadau" - #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/reports/index.html:10 @@ -1096,8 +1102,6 @@ msgstr "Enw" #: 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 msgid "Name:" msgstr "Enw:" @@ -1105,7 +1109,7 @@ msgstr "Enw:" msgid "Navigation" msgstr "Mordwyo " -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" @@ -1122,8 +1126,8 @@ msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" msgid "New local reports on reportemptyhomes.com" msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com" -#: templates/web/default/reports/council.html:43 -#: templates/web/default/reports/council.html:44 +#: 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 @@ -1184,7 +1188,8 @@ msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com" -#: templates/web/default/index.html:27 +#: templates/web/default/front/news.html:8 +#: templates/web/fiksgatami/front/news.html:9 msgid "New!" msgstr "Newydd!" @@ -1249,18 +1254,30 @@ msgstr "Nac ydw" msgid "Note:" msgstr "Nac ydw" +#: templates/web/default/report/new/fill_in_details.html:148 +msgid "" +"Now to submit your report… do you have a reportemptyhomes.com " +"password?" +msgstr "" + +#: templates/web/default/report/display.html:133 +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 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" -#: 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 returned to use" msgstr "Hen wedi'i adfer i'w ddefnyddio" -#: 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 empty properties, state unknown" msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys" @@ -1275,10 +1292,10 @@ msgstr "Hen eiddo gwag,<br>cyflwr anhysbys" msgid "Older returned to use" msgstr "Wedi'u hadfer i'w defnyddio ers amser" -#: 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/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 @@ -1290,6 +1307,11 @@ msgstr "Adroddiadau hŷn o eiddo gwag" msgid "Open" msgstr "" +#: templates/web/default/my/my.html:19 +#, fuzzy +msgid "Open reports" +msgstr "Cuddio hen adroddiadau " + #: templates/web/default/alert/list.html:87 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" @@ -1303,9 +1325,9 @@ msgstr "" "byw ynddo:" #: 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/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 @@ -1322,19 +1344,18 @@ 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 +#: templates/web/default/report/new/fill_in_details.html:231 msgid "Phone:" msgstr "Rhif ffôn:" #: 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/report/display.html:109 +#: templates/web/default/report/new/fill_in_details.html:119 msgid "Photo:" msgstr "Ffotograff:" @@ -1342,7 +1363,7 @@ msgstr "Ffotograff:" msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" -#: templates/web/default/index.html:76 +#: templates/web/default/index.html:63 msgid "Photos of recent reports" msgstr "Ffotograffau o adroddiadau diweddar" @@ -1350,8 +1371,8 @@ msgstr "Ffotograffau o adroddiadau diweddar" 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 "" @@ -1366,9 +1387,9 @@ 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:639 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:659 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 +#: 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 "Dewiswch gategori" @@ -1398,12 +1419,12 @@ msgid "" "for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:108 +#: perllib/FixMyStreet/DB/Result/Comment.pm:111 msgid "Please enter a message" msgstr "Ychwanegwch neges" -#: 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 #, fuzzy msgid "Please enter a password" msgstr "Ychwanegwch neges" @@ -1413,11 +1434,11 @@ msgstr "Ychwanegwch neges" msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" -#: perllib/FixMyStreet/DB/Result/User.pm:91 +#: perllib/FixMyStreet/DB/Result/User.pm:92 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Alert.pm:123 +#: perllib/FixMyStreet/App/Controller/Alert.pm:345 #: perllib/FixMyStreet/App/Controller/Contact.pm:105 msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" @@ -1427,14 +1448,13 @@ msgid "Please enter some details" msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:94 -#: perllib/FixMyStreet/DB/Result/User.pm:88 +#: 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 "Cofnodwch eich cyfeiriad e-bost" #: perllib/FixMyStreet/DB/Result/Problem.pm:199 -#: perllib/FixMyStreet/DB/Result/User.pm:83 msgid "" "Please enter your full name - if you do not wish your name to be shown on " "the site, untick the box" @@ -1443,8 +1463,9 @@ msgstr "" "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: 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:76 +#: perllib/FixMyStreet/DB/Result/User.pm:85 msgid "Please enter your name" msgstr "Cofnodwch eich enw" @@ -1485,7 +1506,7 @@ msgid "" "photo of the empty property 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 #, fuzzy msgid "" "Please fill in the form below with details of the empty property, and " @@ -1494,7 +1515,7 @@ 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:242 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" @@ -1505,7 +1526,7 @@ msgid "" "<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." @@ -1515,16 +1536,16 @@ 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 "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" -#: 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 "Rhowch rywfaint o destun yn ogystal â ffotograff" -#: 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 an empty property to your council " "before" @@ -1532,15 +1553,15 @@ msgstr "" "Rhowch wybod a ydych chi wedi rhoi gwybod i'ch cyngor am eiddo gwag erioed " "o'r blaen" -#: perllib/FixMyStreet/App/Controller/Alert.pm:85 +#: perllib/FixMyStreet/App/Controller/Alert.pm:82 msgid "Please select the feed you want" msgstr "Dewiswch y porthiant rydych chi eisiau ei gael" -#: perllib/FixMyStreet/App/Controller/Alert.pm:125 +#: perllib/FixMyStreet/App/Controller/Alert.pm:120 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:234 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:227 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" @@ -1549,7 +1570,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:728 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." @@ -1558,7 +1579,9 @@ msgid "Please write a message" msgstr "Ysgrifennwch neges" #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:138 +#: templates/web/default/report/display.html:119 +#: templates/web/default/report/display.html:154 +#: templates/web/default/report/display.html:175 msgid "Post" msgstr "Postio" @@ -1570,9 +1593,9 @@ msgstr "Cofnodwyd yn ddi-enw am %s" msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" -#: 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 "Empty property" msgstr "Eiddo gwag" @@ -1596,12 +1619,12 @@ 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:743 +#: perllib/FixMyStreet/App/Controller/Admin.pm:749 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:67 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" @@ -1618,19 +1641,19 @@ msgstr "" msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: 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 "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: 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 "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" -#: 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 "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" @@ -1644,7 +1667,7 @@ 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:470 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:469 msgid "Property type:" msgstr "Math o eiddo:" @@ -1652,6 +1675,15 @@ msgstr "Math o eiddo:" msgid "Provide an update" msgstr "Rhowch ddiweddariad" +#: 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 empty properties, 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 @@ -1668,7 +1700,7 @@ 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:188 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" @@ -1676,33 +1708,33 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" #: 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/reports/council.html:34 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 -#: perllib/FixMyStreet/Cobrand/Default.pm:771 +#: perllib/FixMyStreet/Cobrand/Default.pm:750 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:764 -#: perllib/FixMyStreet/Cobrand/Default.pm:778 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: 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 "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 -#: perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" @@ -1711,19 +1743,19 @@ msgstr "Porthiant RSS %s" msgid "RSS feed of nearby empty properties" msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:34 msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: 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 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 #, fuzzy msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" @@ -1745,19 +1777,19 @@ msgstr "" "hwn." #: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:35 +#: templates/web/default/around/display_location.html:34 msgid "Recent local empty properties, reportemptyhomes.com" msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com" -#: templates/web/default/reports/council.html:68 -#: templates/web/default/reports/council.html:69 +#: 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 returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:85 +#: templates/web/default/index.html:72 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -1792,6 +1824,16 @@ msgstr "Adroddiadau" msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" +#: templates/web/default/my/my.html:63 +#, fuzzy +msgid "Reported %s" +msgstr "Adroddiadau" + +#: templates/web/default/my/my.html:61 +#, fuzzy +msgid "Reported %s, to %s" +msgstr "Adroddwyd gan %s am %s" + #: perllib/FixMyStreet/DB/Result/Problem.pm:331 #: templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" @@ -1833,12 +1875,12 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: 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 -#: templates/web/default/report/new/fill_in_details.html:30 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:97 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -1851,7 +1893,7 @@ msgstr "Cuddio hen adroddiadau " msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 +#: perllib/FixMyStreet/App/Controller/Admin.pm:603 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" @@ -1871,7 +1913,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:390 +#: perllib/FixMyStreet/DB/Result/Problem.pm:396 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -1924,10 +1966,37 @@ msgstr "" "cat=20'>Gwybodaeth\n" "bellach am ein gwaith ar gartrefi gwag</a>.\n" -#: 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 "Dangos pinnau" +#: 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 "Rhai ffotograffau o adroddiadau diweddar" @@ -1941,31 +2010,30 @@ 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 "" -"Sori, mae'n ymddangos bod y lleoliad hwnnw'n rhy gyffredinol; rhowch gynnig " -"arall arni." - #: templates/web/default/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: 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 "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." -#: 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 "" "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni." +#: 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 #, fuzzy @@ -1980,12 +2048,14 @@ msgstr "Diweddariad:" #: 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/report/new/fill_in_details.html:90 msgid "Subject:" msgstr "Pwnc:" #: templates/web/default/questionnaire/creator_fixed.html:19 -#: templates/web/default/report/new/fill_in_details.html:171 +#: 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 "Anfon" @@ -2004,11 +2074,11 @@ msgstr "Anfon yr holiadur" msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/list.html:124 +#: templates/web/default/alert/list.html:128 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:595 +#: perllib/FixMyStreet/App/Controller/Admin.pm:601 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2020,7 +2090,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2119,7 +2189,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:737 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" @@ -2134,17 +2204,17 @@ msgstr "" "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei " "fod ar y môr - chwiliwch am fan mwy penodol." -#: 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 "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Geocode.pm:165 +#: perllib/FixMyStreet/Geocode.pm:200 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:496 +#: perllib/FixMyStreet/App/Controller/Admin.pm:502 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -2199,7 +2269,8 @@ msgstr "" "rydym yn gweithio ledled Lloegr. Rydym hefyd yn gweithio mewn partneriaeth " "ag elusennau eraill ledled y DU.</p>\n" -#: 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." @@ -2280,8 +2351,8 @@ msgstr "" "Yr adroddiadau diweddaraf o fewn ffin {{NAME}} y mae defnyddwyr wedi rhoi " "gwybod amdanynt" -#: 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 "" @@ -2290,10 +2361,10 @@ 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 "" @@ -2317,11 +2388,33 @@ msgstr "" "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o " "gwmpas y lleoliad a gofnodwyd ganddynt " +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +msgid "" +"There was an empty property 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 an empty property 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 an empty property 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 "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod." -#: 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 "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -2347,11 +2440,11 @@ msgid "" "will be periodically deleted." msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd." -#: 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 "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s." -#: 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 "" @@ -2365,13 +2458,18 @@ 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:840 +#: perllib/FixMyStreet/Cobrand/Default.pm:833 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:111 +#: templates/web/default/report/display.html:96 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: templates/web/default/report/display.html:91 +#, 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:829 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." @@ -2392,7 +2490,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:598 +#: perllib/FixMyStreet/App/Controller/Admin.pm:604 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2411,7 +2509,7 @@ msgstr "" "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: templates/web/default/around/display_location.html:92 +#: templates/web/default/around/display_location.html:86 #, fuzzy msgid "" "To report an empty property, simply <strong>click on the map</strong> at the " @@ -2439,7 +2537,6 @@ msgid "Unknown alert type" msgstr "ID eiddo gwag anhysbys" #: perllib/FixMyStreet/App/Controller/Report.pm:70 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:24 msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" @@ -2470,12 +2567,12 @@ msgstr "Diweddariadau yn ôl {{name}}" msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:103 +#: templates/web/default/report/display.html:84 msgid "Update:" msgstr "Diweddariad:" -#: 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 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -2511,7 +2608,7 @@ msgid "View your report" msgstr "Gweld eich adroddiad" #: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:34 +#: templates/web/default/around/display_location.html:33 msgid "Viewing a location" msgstr "Gweld lleoliad" @@ -2519,7 +2616,12 @@ msgstr "Gweld lleoliad" msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: 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." @@ -2537,9 +2639,8 @@ msgstr "" "hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch " "lleoliad chi yno." -#: perllib/FixMyStreet/App/Controller/Around.pm:229 -msgid "" -"We had an empty property 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 @@ -2556,7 +2657,7 @@ msgid "" "appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:46 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -2599,7 +2700,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 "Bloc cyfan o fflatiau gwag" @@ -2643,28 +2744,18 @@ msgid "" "personal information, or similar:" msgstr "" -#: templates/web/default/reports/council.html:35 +#: templates/web/default/reports/council.html:43 +#, fuzzy msgid "" -"You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports" -"\">show all councils</a>." +"You can <a href=\"%s\">view all reports for the council</a> or <a href=\"/" +"reports\">show all councils</a>." msgstr "" "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/" "reports\">dangos pob cyngor</a>." -#: templates/web/default/reports/council.html:31 -msgid "You can <a href=\"%s\">see less detail</a>." -msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a>." - -#: 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 "" -"Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=\"/" -"reports\">dangos pob cyngor</a>." - -#: templates/web/default/reports/council.html:33 -msgid "You can <a href=\"%s\">see more details</a>." +#: templates/web/default/reports/council.html:45 +#, fuzzy +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/no_councils_text.html:14 @@ -2676,7 +2767,7 @@ msgid "" "properties 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 empty property</" @@ -2686,18 +2777,23 @@ 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/display.html:122 -#: templates/web/default/report/new/fill_in_details.html:111 +#: 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/report/new/fill_in_details.html:36 +#: templates/web/default/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "" + +#: templates/web/default/report/new/fill_in_details.html:35 #, fuzzy msgid "" "You have located the empty property at the point marked with a purple pin on " @@ -2734,7 +2830,15 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: templates/web/default/email_sent.html:30 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +#, fuzzy +msgid "" +"You have successfully signed in; please check and confirm your details are " +"accurate:" +msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." + +#: 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." @@ -2744,19 +2848,44 @@ msgstr "" msgid "You really want to resend?" msgstr "" +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 #: templates/web/default/my/my.html:3 #, fuzzy msgid "Your Reports" msgstr "Adroddiadau" -#: templates/web/default/alert/list.html:120 +#: templates/web/default/auth/general.html:27 +#, fuzzy +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.html:141 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.html:219 msgid "Your name:" msgstr "Eich enw:" +#: templates/web/default/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "" + +#: templates/web/default/footer.html:7 +#, fuzzy +msgid "Your reports" +msgstr "Adroddiadau" + +#: templates/web/default/my/my.html:37 +#, fuzzy +msgid "Your updates" +msgstr "Adroddiadau" + #: templates/web/default/contact/index.html:76 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" @@ -2774,7 +2903,7 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:247 msgid "less than a minute" msgstr "llai na munud" @@ -2814,7 +2943,7 @@ msgstr "" msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:217 +#: perllib/Utils.pm:221 msgid "today" msgstr "heddiw" @@ -2860,7 +2989,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:19 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -2875,20 +3004,27 @@ msgid_plural "" 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] "<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:25 #, 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 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" +msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" + #: templates/web/default/report/new/some_councils_text.html:14 #, perl-format msgid "" @@ -2900,12 +3036,56 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: templates/web/default/front_stats.html:31 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> diweddariad ar adroddiadau" -msgstr[1] "<big>%s</big> diweddariad ar adroddiadau" +#, fuzzy +#~ 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 "" +#~ "Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan " +#~ "ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?" +#~ "d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/" +#~ "fixmystreet\">clyfar</a> ." + +#~ 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 "" +#~ "Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan " +#~ "ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?" +#~ "d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/" +#~ "fixmystreet\">clyfar</a> ." + +#~ msgid "Can we show your name on the site?" +#~ msgstr "Allwn ni ddangos eich enw chi ar y safle?" + +#, fuzzy +#~ msgid "Get reportemptyhomes.com on your iPhone" +#~ msgstr "Cael yr Asiantaeth Tai Gwag ar eich iPhone" + +#, fuzzy +#~ msgid "My Reports" +#~ msgstr "Adroddiadau" + +#~ msgid "" +#~ "Sorry, that location appears to be too general; please be more specific." +#~ msgstr "" +#~ "Sori, mae'n ymddangos bod y lleoliad hwnnw'n rhy gyffredinol; rhowch " +#~ "gynnig arall arni." + +#~ msgid "You can <a href=\"%s\">see less detail</a>." +#~ msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a>." + +#~ msgid "" +#~ "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/" +#~ "reports\">show all councils</a>." +#~ msgstr "" +#~ "Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=" +#~ "\"/reports\">dangos pob cyngor</a>." #~ msgid "Sorry! Something's gone wrong." #~ msgstr "Ymddiheuriadau! Mae rhywbeth wedi mynd o'i le." diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 622cbbf2b..ef153cf80 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-06-14 17:28+0100\n" +"POT-Creation-Date: 2011-07-01 20:12+0100\n" "PO-Revision-Date: 2011-04-07 09:00MET\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:176 perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: bin/send-reports:176 perllib/FixMyStreet/DB/Result/Problem.pm:376 msgid " and " msgstr " og " @@ -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:245 +#: perllib/Utils.pm:251 msgid "%d day" msgstr "%d dag" -#: perllib/Utils.pm:245 +#: perllib/Utils.pm:251 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:246 +#: perllib/Utils.pm:252 msgid "%d hour" msgstr "%d time" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:252 msgid "%d hours" msgstr "%d timer" @@ -75,11 +75,11 @@ msgstr "%d timer" msgid "%d live updates" msgstr "%d aktive oppdateringer" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:253 msgid "%d minute" msgstr "%d minutt" -#: perllib/Utils.pm:247 +#: perllib/Utils.pm:253 msgid "%d minutes" msgstr "%d minutter" @@ -88,21 +88,21 @@ msgstr "%d minutter" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%d%%)" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 msgid "%d week" msgstr "%d uke" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:250 msgid "%d weeks" msgstr "%d uker" -#: 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 "%s - oppsummeringsrapporter" -#: 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 "" @@ -114,14 +114,13 @@ msgstr "%s, rapportert anonymt %s" msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:794 -#: perllib/FixMyStreet/Cobrand/Default.pm:808 +#: perllib/FixMyStreet/Cobrand/Default.pm:787 +#: perllib/FixMyStreet/Cobrand/Default.pm:801 #, fuzzy msgid "%s, within %s ward" msgstr "Problemer innenfor %s avdeling/etat" -#: 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." @@ -129,7 +128,7 @@ msgstr "" "© Crown copyright. Alle rettigheter reservert. Justisdepartementet " "100037819 2008." -#: templates/web/default/email_sent.html:32 +#: templates/web/default/email_sent.html:28 msgid "(Don't worry — %s)" msgstr "" @@ -150,35 +149,38 @@ msgstr "(løst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller manglende gatelys)" -#: templates/web/default/reports/council.html:90 +#: templates/web/default/reports/council.html:98 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: 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 "(valgfritt)" -#: templates/web/default/reports/council.html:88 +#: templates/web/default/reports/council.html:96 msgid "(sent to both)" msgstr "(sent til begge)" -#: 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 "(vi viser aldri din epostadresse eller telefonnummer)" +#: templates/web/default/report/display.html:206 +#, fuzzy +msgid "(we never show your email)" +msgstr "(vi viser aldri din epostadresse eller telefonnummer)" + #: perllib/FixMyStreet/App/Controller/Admin.pm:259 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:476 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:504 +#: 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 "-- velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:462 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:461 #: perllib/FixMyStreet/DB/Result/Problem.pm:210 msgid "-- Pick a property type --" msgstr "-- velg en eiendomsstype --" @@ -197,7 +199,7 @@ msgstr "" "<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">Foreningen " "NUUG</a></div>" -#: templates/web/default/questionnaire/completed.html:21 +#: templates/web/default/questionnaire/completed.html:25 #, fuzzy msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -207,7 +209,7 @@ msgstr "" "spørreskjema.\n" "Veldig glad for å høre at det er blitt fikset.</p>\n" -#: templates/web/default/questionnaire/completed.html:11 +#: templates/web/default/questionnaire/completed.html:15 #, fuzzy msgid "" "<p style=\"font-size:150%%\">We’re sorry to hear that. We have two " @@ -261,7 +263,7 @@ msgid "" "www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n" msgstr "" -#: templates/web/default/questionnaire/completed.html:5 +#: templates/web/default/questionnaire/completed.html:9 #, fuzzy msgid "" "<p>Thank you very much for filling in our questionnaire; if you\n" @@ -274,8 +276,8 @@ msgstr "" "hit til\n" "nettstedet og legg igjen en oppdatering.</p>\n" -#: 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 #, fuzzy msgid "" "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this " @@ -289,6 +291,25 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" +#: 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 +#, fuzzy +msgid "<strong>Yes</strong>, I have a password:" +msgstr "<strong>%d</strong> aktive problemer" + #: templates/web/default/static/about.html:1 #: templates/web/default/static/about.html:3 #: templates/web/emptyhomes/header.html:34 @@ -301,7 +322,11 @@ msgstr "Om oss" msgid "Add new category" msgstr "Legg til ny kategori" -#: 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 "" @@ -313,7 +338,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:133 +#: templates/web/default/report/display.html:211 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -321,7 +346,7 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" msgid "All confirmed" msgstr "Alle bekreftet" -#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 +#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:31 #: templates/web/fiksgatami/footer.html:6 msgid "All reports" msgstr "Alle rapporter" @@ -376,47 +401,23 @@ msgstr "Anonym" msgid "Anonymous:" msgstr "Anonym:" -#: 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>." +#: templates/web/default/footer.html:16 +msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>" msgstr "" -"Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a> og " -"vedlikeholdt av <a href=\"http://www.nuug.no/\">NUUG</a>, ved hjelp av <a " -"href=\"http://github.com/mysociety/fixmystreet\">snedig</a> <a href=" -"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa" -"\">kode</a>." -#: templates/web/default/footer.html:16 +#: templates/web/fiksgatami/footer.html:15 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>." +"Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained " +"by <a href=\"http://www.nuug.no/\">NUUG</a>" msgstr "" -"Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>, ved hjelp av " -"<a href=\"http://github.com/mysociety/fixmystreet\">smart</a> <a href=" -"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa" -"\">kode</a>." - -#: templates/web/default/report/new/fill_in_details.html:141 -msgid "Can we show your name on the site?" -msgstr "Kan vi vise ditt navn her på nettstedet?" - -#: templates/web/default/report/display.html:87 -#: templates/web/default/report/new/fill_in_details.html:143 -msgid "Can we show your name publicly?" -msgstr "Kan vi vise ditt navn offentlig?" #: templates/web/default/admin/council_contacts.html:19 #: templates/web/default/admin/search_reports.html:17 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:479 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:505 +#: 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 @@ -433,8 +434,8 @@ msgstr "Kategori: %s" 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 "De nærmeste sakene <small>(innenfor %skm)</small>" @@ -488,10 +489,15 @@ msgstr "Bekreftet" msgid "Confirmed:" msgstr "Bekreftet:" -#: templates/web/default/footer.html:10 templates/web/fiksgatami/footer.html:9 +#: templates/web/fiksgatami/footer.html:9 msgid "Contact" msgstr "Kontakt" +#: templates/web/default/footer.html:18 +#, fuzzy +msgid "Contact FixMyStreet" +msgstr "FiksGataMi" + #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 @@ -507,7 +513,7 @@ msgstr "Kontakt prosjektgruppen" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:596 +#: perllib/FixMyStreet/App/Controller/Admin.pm:602 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -552,7 +558,7 @@ msgid "Deleted" msgstr "Slettet" #: templates/web/default/admin/report_edit.html:14 -#: templates/web/default/report/new/fill_in_details.html:100 +#: templates/web/default/report/new/fill_in_details.html:99 msgid "Details:" msgstr "Detaljer:" @@ -560,6 +566,10 @@ msgstr "Detaljer:" msgid "Diligency prize league table" msgstr "Hvem har endret kontaktlista" +#: 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 "Vet ikke" @@ -585,11 +595,10 @@ msgstr "Oppdatert av" #: 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 msgid "Email" msgstr "Epost" -#: templates/web/default/around/display_location.html:77 +#: templates/web/default/around/display_location.html:71 msgid "Email me new local problems" msgstr "Send meg epost om lokale problemer" @@ -597,30 +606,24 @@ msgstr "Send meg epost om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: 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 msgid "Email:" msgstr "Epost:" -#: 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 "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -628,31 +631,38 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:466 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:468 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:467 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." #: 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/index.html:24 templates/web/default/index.html:27 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:24 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:26 msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" -#: 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 +#, fuzzy +msgid "Enter a new password:" +msgstr "Legg til en melding" + +#: templates/web/default/index.html:45 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" #: templates/web/default/auth/token.html:5 -#: templates/web/default/questionnaire/error.html:1 -#: templates/web/default/questionnaire/error.html:3 +#: 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 @@ -678,7 +688,7 @@ msgstr "" msgid "First time" msgstr "Første gang" -#: templates/web/default/header.html:16 +#: templates/web/default/header.html:20 #: templates/web/fiksgatami/header.html:14 msgid "Fix<span id=\"my\">My</span>Street" msgstr "Fiks<span id=\"my\">Gata</span>Mi" @@ -721,7 +731,7 @@ msgstr "" "administrasjoner, problemer som gjelder flere administrasjoner blir sendt " "til alle de det gjelder." -#: templates/web/default/front_stats.html:7 +#: templates/web/default/front/stats.html:7 msgid "FixMyStreet updates" msgstr "Fiksgatami-oppdateringer" @@ -729,10 +739,19 @@ msgstr "Fiksgatami-oppdateringer" msgid "Fixed" msgstr "Løst" +#: templates/web/default/my/my.html:24 +#, fuzzy +msgid "Fixed reports" +msgstr "Send rapport på nytt" + #: templates/web/default/admin/search_reports.html:48 msgid "Fixed:" msgstr "Løst:" +#: 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 "For administrasjon(er):" @@ -748,18 +767,13 @@ msgstr "Ofte spurte spørsmål" msgid "Further information about our work on empty homes." msgstr "" -#: templates/web/default/index.html:26 -#, fuzzy -msgid "Get FixMyStreet on your iPhone" -msgstr "Fiksgatami-administrasjon" - #: templates/web/default/alert/list.html:112 msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" #: templates/web/default/alert/index.html:24 #: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:47 +#: templates/web/default/index.html:33 msgid "Go" msgstr "Fortsett" @@ -788,7 +802,8 @@ msgid "" msgstr "" "Har du sendt en sak til en administrasjon før, eller er dette første gangen?" -#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:33 +#: templates/web/default/footer.html:10 +#: templates/web/emptyhomes/header.html:33 #: templates/web/fiksgatami/footer.html:8 msgid "Help" msgstr "Hjelp" @@ -802,11 +817,11 @@ msgstr "Her er typene lokale problemvarsler for ‘%s’." msgid "Hidden" msgstr "Gjemt" -#: templates/web/default/around/display_location.html:54 +#: templates/web/default/around/display_location.html:52 msgid "Hide pins" msgstr "Gjem nåler" -#: templates/web/default/around/display_location.html:59 +#: templates/web/default/around/display_location.html:57 msgid "Hide stale reports" msgstr "Gjem utdaterte rapporter" @@ -814,15 +829,15 @@ msgstr "Gjem utdaterte rapporter" msgid "History" msgstr "Historie" -#: templates/web/default/index.html:54 +#: templates/web/default/index.html:40 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:514 +#: perllib/FixMyStreet/App/Controller/Admin.pm:520 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#: 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 "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" @@ -860,7 +875,8 @@ msgstr "" "inn din rapport, slik at vi kan vise administrasjonen aktiviteten i deres " "område." -#: 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 " @@ -882,11 +898,11 @@ msgstr "" msgid "Illegal ID" msgstr "Ugyldig ID" -#: perllib/FixMyStreet/App/Controller/Alert.pm:105 +#: perllib/FixMyStreet/App/Controller/Alert.pm:102 msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" -#: templates/web/default/around/display_location.html:61 +#: templates/web/default/around/display_location.html:59 msgid "Include stale reports" msgstr "Inkludert utdaterte rapporter" @@ -903,6 +919,12 @@ msgid "" "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 "Sist redigert av" @@ -940,28 +962,15 @@ msgstr "Lokal RSS-strøm og epostvarsel" msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og epostvarsel" -#: templates/web/default/footer.html:8 templates/web/emptyhomes/header.html:32 +#: templates/web/default/footer.html:9 templates/web/emptyhomes/header.html:32 #: templates/web/fiksgatami/footer.html:7 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:58 +#: templates/web/default/index.html:44 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: 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/" @@ -973,8 +982,6 @@ msgstr "" "licenses/by-sa/2.0/\">CC-BY-SA</a>" #: perllib/FixMyStreet/Map/OSM/StreetView.pm:27 -#: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:21 -#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:21 msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " "2010." @@ -982,10 +989,12 @@ msgstr "" "Kartet inneholder data fra Ordnance Survey © Crown copyright og " "databaserettigheter 2010." -#: perllib/FixMyStreet/Map/FMS.pm:27 +#: perllib/FixMyStreet/Map/FMS.pm:24 +#, fuzzy msgid "" "Map contains Ordnance Survey data © Crown copyright and database right " -"2010. Microsoft" +"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. Microsoft" @@ -998,11 +1007,6 @@ msgstr "Melding:" msgid "More problems nearby" msgstr "Flere saker i nærheten" -#: templates/web/default/my/my.html:1 -#, fuzzy -msgid "My Reports" -msgstr "Alle rapporter" - #: templates/web/default/admin/list_updates.html:7 #: templates/web/default/admin/search_reports.html:14 #: templates/web/default/reports/index.html:10 @@ -1013,8 +1017,6 @@ msgstr "Navn" #: 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 msgid "Name:" msgstr "Navn:" @@ -1022,7 +1024,7 @@ msgstr "Navn:" msgid "Navigation" msgstr "Navigasjon" -#: templates/web/default/email_sent.html:24 +#: templates/web/default/email_sent.html:20 msgid "Nearly Done! Now check your email..." msgstr "" @@ -1038,8 +1040,8 @@ msgstr "Nye lokale problemer på FiksGataMi" msgid "New local reports on reportemptyhomes.com" msgstr "Nye lokale rapporter på reportemptyhomes.com" -#: templates/web/default/reports/council.html:43 -#: templates/web/default/reports/council.html:44 +#: 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 @@ -1090,7 +1092,8 @@ msgstr "Nye rapporter til {{COUNCIL}} på reportemptyhomes.com" msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com" -#: templates/web/default/index.html:27 +#: templates/web/default/front/news.html:8 +#: templates/web/fiksgatami/front/news.html:9 msgid "New!" msgstr "" @@ -1153,18 +1156,26 @@ msgstr "Merk" msgid "Note:" msgstr "Merk: " +#: 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 "Støtende? Upassende? Gi oss beskjed" -#: 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 "Eldre saker som er løst" -#: 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 "Eldre saker med ukjent status" @@ -1179,10 +1190,10 @@ msgstr "Eldre saker, <br>ukjent status" msgid "Older fixed" msgstr "Eldre løste" -#: 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/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 @@ -1194,6 +1205,11 @@ msgstr "Eldre saker" msgid "Open" msgstr "Åpen" +#: templates/web/default/my/my.html:19 +#, fuzzy +msgid "Open reports" +msgstr "Send rapport på nytt" + #: templates/web/default/alert/list.html:87 msgid "Or problems reported to:" msgstr "Eller problemer meldt til:" @@ -1207,9 +1223,9 @@ msgstr "" "hører inn under:" #: 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/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 @@ -1226,19 +1242,18 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: 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 +#: templates/web/default/report/new/fill_in_details.html:231 msgid "Phone:" msgstr "Telefon:" #: 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/report/display.html:109 +#: templates/web/default/report/new/fill_in_details.html:119 msgid "Photo:" msgstr "Bilde:" @@ -1246,7 +1261,7 @@ msgstr "Bilde:" msgid "Photos of recent nearby reports" msgstr "Bilder av nye saker i nærheten" -#: templates/web/default/index.html:76 +#: templates/web/default/index.html:63 msgid "Photos of recent reports" msgstr "Bilder av nylig meldte saker" @@ -1254,8 +1269,8 @@ msgstr "Bilder av nylig meldte saker" msgid "Please be polite, concise and to the point." msgstr "Vær høflig, poengtert og kortfattet." -#: 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 "" @@ -1270,9 +1285,9 @@ msgstr "Skriv din epost" msgid "Please check your email address is correct" msgstr "Skriv en gyldig epostadresse" -#: 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/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 "Velg en kategori" @@ -1302,12 +1317,12 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." -#: perllib/FixMyStreet/DB/Result/Comment.pm:108 +#: perllib/FixMyStreet/DB/Result/Comment.pm:111 msgid "Please enter a message" msgstr "Legg til en melding" -#: 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 #, fuzzy msgid "Please enter a password" msgstr "Legg til en melding" @@ -1317,11 +1332,11 @@ msgstr "Legg til en melding" msgid "Please enter a subject" msgstr "Legg inn et tema" -#: perllib/FixMyStreet/DB/Result/User.pm:91 +#: perllib/FixMyStreet/DB/Result/User.pm:92 msgid "Please enter a valid email" msgstr "Legg til en gyldig epost" -#: perllib/FixMyStreet/App/Controller/Alert.pm:123 +#: perllib/FixMyStreet/App/Controller/Alert.pm:345 #: perllib/FixMyStreet/App/Controller/Contact.pm:105 msgid "Please enter a valid email address" msgstr "Legg inn din epost" @@ -1331,14 +1346,13 @@ msgid "Please enter some details" msgstr "Legg inn opplysninger om saken" #: perllib/FixMyStreet/App/Controller/Contact.pm:94 -#: perllib/FixMyStreet/DB/Result/User.pm:88 +#: 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 "Legg inn din epost" #: perllib/FixMyStreet/DB/Result/Problem.pm:199 -#: perllib/FixMyStreet/DB/Result/User.pm:83 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" @@ -1347,8 +1361,9 @@ msgstr "" "hvis du ikke ønsker at ditt navn skal vises, kryss av her" #: 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:76 +#: perllib/FixMyStreet/DB/Result/User.pm:85 msgid "Please enter your name" msgstr "Legg inn ditt navn" @@ -1387,7 +1402,7 @@ msgstr "" "det har\n" "vært der, en beskrivelse (og et bilde av problemet hvis du har et), etc." -#: templates/web/default/report/new/fill_in_details.html:49 +#: templates/web/default/report/new/fill_in_details.html:48 #, fuzzy msgid "" "Please fill in the form below with details of the problem, and describe the " @@ -1396,7 +1411,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv stedet så nøyaktig som mulig i boksen for detaljer." -#: 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 "Vennligst indiker om du ønsker å motta et annet spørreskjema" @@ -1411,7 +1426,7 @@ msgstr "" "informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy" "\">personvernpolicy</a>" -#: 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." @@ -1421,33 +1436,33 @@ msgstr "" msgid "Please note:" msgstr "Vennligst merk deg:" -#: 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 "" "Vennligst bidra med en forklaring for hvorfor du åpner denne rapporten på " "nytt" -#: 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 "Vennligst bidra med litt tekst i tilegg til et bilde" -#: 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 "" "Gi oss informasjon om du har rapportert en sak til din administrasjon " "tidligere" -#: perllib/FixMyStreet/App/Controller/Alert.pm:85 +#: perllib/FixMyStreet/App/Controller/Alert.pm:82 msgid "Please select the feed you want" msgstr "Velg den feed du ønsker" -#: perllib/FixMyStreet/App/Controller/Alert.pm:125 +#: perllib/FixMyStreet/App/Controller/Alert.pm:120 msgid "Please select the type of alert you want" msgstr "Velg vilken type varsel du ønsker" -#: 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 "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -1455,7 +1470,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 "Vær sa snill å ta en titt på oppdateringene som har blitt igjen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:728 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:738 msgid "Please upload a JPEG image only" msgstr "Vennligst last kun opp et JPEG-bilde" @@ -1464,7 +1479,9 @@ msgid "Please write a message" msgstr "Skriv inn en melding" #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:138 +#: templates/web/default/report/display.html:119 +#: templates/web/default/report/display.html:154 +#: templates/web/default/report/display.html:175 msgid "Post" msgstr "Send inn" @@ -1476,9 +1493,9 @@ msgstr "Publisert anonymt %s" msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: 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 "Problem" @@ -1498,11 +1515,11 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling for problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:743 +#: perllib/FixMyStreet/App/Controller/Admin.pm:749 msgid "Problem marked as open." msgstr "Problem markert som åpent." -#: templates/web/default/around/display_location.html:73 +#: templates/web/default/around/display_location.html:67 msgid "Problems in this area" msgstr "Saker i dette område" @@ -1515,19 +1532,19 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Saker innen %skm av dette punktet" -#: 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 "Problemer innenfor %s" -#: 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 "Problemer innenfor %s avdeling/etat" -#: 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 "Problemer innenfor %s, Fiksgatami" @@ -1539,7 +1556,7 @@ msgstr "Problemer innenfor grensene av:" 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 "Type egenskap:" @@ -1547,6 +1564,15 @@ msgstr "Type egenskap:" msgid "Provide an update" msgstr "Bidra med oppdatering" +#: 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 @@ -1561,7 +1587,7 @@ 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:188 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:181 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -1569,33 +1595,33 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" #: 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/reports/council.html:34 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 -#: perllib/FixMyStreet/Cobrand/Default.pm:771 +#: perllib/FixMyStreet/Cobrand/Default.pm:750 +#: perllib/FixMyStreet/Cobrand/Default.pm:764 #, fuzzy msgid "RSS feed for %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:764 -#: perllib/FixMyStreet/Cobrand/Default.pm:778 +#: perllib/FixMyStreet/Cobrand/Default.pm:757 +#: perllib/FixMyStreet/Cobrand/Default.pm:771 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm fra %s" -#: 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 "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 -#: perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/Default.pm:786 +#: perllib/FixMyStreet/Cobrand/Default.pm:800 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm for problemer i denne %s" @@ -1604,19 +1630,19 @@ msgstr "RSS-strøm for problemer i denne %s" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:34 msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: 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 #, fuzzy msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:168 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 #, fuzzy msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer i denne %s" @@ -1636,19 +1662,19 @@ msgid "Receive email when updates are left on this problem." msgstr "Motta epost når det er uppdateringer på denne saken" #: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:35 +#: templates/web/default/around/display_location.html:34 msgid "Recent local problems, FixMyStreet" msgstr "Nylig lokalt problem, FiksGataMi." -#: templates/web/default/reports/council.html:68 -#: templates/web/default/reports/council.html:69 +#: 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 "Nylig løste saker" -#: templates/web/default/index.html:85 +#: templates/web/default/index.html:72 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -1686,6 +1712,16 @@ msgstr "Rapport på %s" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" +#: templates/web/default/my/my.html:63 +#, fuzzy +msgid "Reported %s" +msgstr "Rapport på %s" + +#: templates/web/default/my/my.html:61 +#, fuzzy +msgid "Reported %s, to %s" +msgstr "Publisert av %s %s" + #: perllib/FixMyStreet/DB/Result/Problem.pm:331 #: templates/web/default/contact/index.html:45 msgid "Reported anonymously at %s" @@ -1727,12 +1763,12 @@ msgstr "Rapportert i kategorien %s av %s %s" #: 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 -#: templates/web/default/report/new/fill_in_details.html:30 msgid "Reporting a problem" msgstr "Legger til en sak" -#: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:97 msgid "Reports on and around the map" msgstr "Saker i og rundt kartet" @@ -1744,7 +1780,7 @@ msgstr "Send rapport på nytt" msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:597 +#: perllib/FixMyStreet/App/Controller/Admin.pm:603 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" @@ -1762,7 +1798,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-strøm, " "eller skriv inn din epostadresse for å abonnere på et epostvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:390 +#: perllib/FixMyStreet/DB/Result/Problem.pm:396 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -1795,10 +1831,38 @@ 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 +#, fuzzy +msgid "Show my name publicly" +msgstr "Kan vi vise ditt navn offentlig?" + +#: templates/web/default/around/display_location.html:50 msgid "Show pins" msgstr "Vis nåler" +#: 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 "Noen bilder av nylig meldte saker" @@ -1812,32 +1876,31 @@ msgstr "" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: 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 "" "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi " "ikke dekker." -#: perllib/FixMyStreet/Geocode.pm:71 -msgid "" -"Sorry, that location appears to be too general; please be more specific." -msgstr "" -"Beklager, den plasserigen ser ut til å være for generell. Forsøk å være mer " -"spesifikk." - #: templates/web/default/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, det har oppstått problemer når vi under lagringen av saken" -#: 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 "Beklager, vi kunne ikke finne det stedet." -#: 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 "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." +#: 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" @@ -1850,12 +1913,14 @@ msgstr "Tilstand:" #: 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/report/new/fill_in_details.html:90 msgid "Subject:" msgstr "Tema:" #: templates/web/default/questionnaire/creator_fixed.html:19 -#: templates/web/default/report/new/fill_in_details.html:171 +#: 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 "Send inn" @@ -1873,11 +1938,11 @@ msgstr "Lever spørreskjema" msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:124 +#: templates/web/default/alert/list.html:128 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på epostvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:595 +#: perllib/FixMyStreet/App/Controller/Admin.pm:601 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -1888,7 +1953,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:599 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -1976,7 +2041,7 @@ 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?" -#: 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 "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." @@ -1989,15 +2054,15 @@ msgstr "" "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs - " "vennligst forsøk et mer spesifikt sted." -#: 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 "Det stedet virker ikke å være i storbritannia. Vennligst prøv igjen." -#: perllib/FixMyStreet/Geocode.pm:165 +#: perllib/FixMyStreet/Geocode.pm:200 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:496 +#: perllib/FixMyStreet/App/Controller/Admin.pm:502 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -2037,7 +2102,8 @@ 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." @@ -2102,8 +2168,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: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 "" @@ -2112,10 +2178,10 @@ 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 "" @@ -2141,11 +2207,33 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" +#: perllib/FixMyStreet/App/Controller/Reports.pm:64 +#, fuzzy +msgid "" +"There was a problem showing the All Reports page. Please try again later." +msgstr "Det var problemer med din rapport. Vennligst se under." + +#: 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 +#, fuzzy +msgid "" +"There was a problem with your email/password combination. Please try again." +msgstr "Det var problemer med din rapport. Vennligst se under." + #: perllib/FixMyStreet/App/Controller/Contact.pm:115 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:202 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:211 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -2183,11 +2271,11 @@ msgstr "" "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil " "bli periodisk slettet." -#: 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 "Dette er en oppsummering av alle rapporter for en %s." -#: 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 "Dette er en oppsummering for alle rapporter for denne %s." @@ -2201,13 +2289,18 @@ msgstr "" "Dette er en opplisting av alle sakene i denne tjenesten; velg en bestemt " "administrasjon for å se saker som er sendt dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:840 +#: perllib/FixMyStreet/Cobrand/Default.pm:833 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:111 +#: templates/web/default/report/display.html:96 msgid "This problem has been fixed" msgstr "Denne saken er løst" -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: templates/web/default/report/display.html:91 +#, fuzzy +msgid "This problem has not been fixed" +msgstr "Denne saken er løst" + +#: perllib/FixMyStreet/Cobrand/Default.pm:829 msgid "This problem is old and of unknown status." msgstr "Denne saken er gammel og med ukjent status." @@ -2225,7 +2318,7 @@ msgid "" msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:598 +#: perllib/FixMyStreet/App/Controller/Admin.pm:604 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -2241,7 +2334,7 @@ msgid "" msgstr "" "Du finner lokale saker ved å søke på ditt postnummer, veinavn eller sted:" -#: templates/web/default/around/display_location.html:92 +#: templates/web/default/around/display_location.html:86 #, fuzzy msgid "" "To report a problem, simply <strong>click on the map</strong> at the correct " @@ -2269,7 +2362,6 @@ msgid "Unknown alert type" msgstr "Ukjent problem-Id" #: perllib/FixMyStreet/App/Controller/Report.pm:70 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:24 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" @@ -2299,12 +2391,12 @@ msgstr "Oppdatert av {{name}}" msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:103 +#: templates/web/default/report/display.html:84 msgid "Update:" msgstr "Oppdatering:" -#: 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 "Oppdatert!" @@ -2337,7 +2429,7 @@ msgid "View your report" msgstr "Vis din rapport" #: templates/web/default/around/display_location.html:0 -#: templates/web/default/around/display_location.html:34 +#: templates/web/default/around/display_location.html:33 msgid "Viewing a location" msgstr "Ser på et sted" @@ -2345,7 +2437,12 @@ msgstr "Ser på et sted" msgid "Viewing a problem" msgstr "Ser på en sak" -#: 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." @@ -2362,8 +2459,8 @@ msgstr "" "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så " "forsøk et annet søk hvis din plass ikke er her." -#: 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 @@ -2386,7 +2483,7 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:60 +#: templates/web/default/index.html:46 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" @@ -2427,7 +2524,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:465 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:464 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -2477,28 +2574,18 @@ msgstr "" "Du rapporterer at følgende oppdatering er støtende, inneholder personlig " "informasjon, eller lignende:" -#: templates/web/default/reports/council.html:35 +#: templates/web/default/reports/council.html:43 +#, fuzzy msgid "" -"You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports" -"\">show all councils</a>." +"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 mindre detaljer</a> eller gå tilbake og <a href=\"/" "reports\">se alle administrasjonene</a>." -#: templates/web/default/reports/council.html:31 -msgid "You can <a href=\"%s\">see less detail</a>." -msgstr "Du kan <a href=\"%s\">se mindre detaljer</a>." - -#: 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 "" -"Du kan <a href=\"%s\">se flere detaljer</a> eller gå tilbake og <a href=\"/" -"reports\">se alle administrasjonene</a>." - -#: templates/web/default/reports/council.html:33 -msgid "You can <a href=\"%s\">see more details</a>." +#: templates/web/default/reports/council.html:45 +#, fuzzy +msgid "You can <a href=\"/reports\">show all councils</a>." msgstr "Du kan <a href=\"%s\">se flere detaljer</a>." #: templates/web/default/report/new/no_councils_text.html:14 @@ -2512,7 +2599,7 @@ msgstr "" "Du kan hjelpe oss ved å finne en kontakt-epostadresse for lokale problemer i " "%s, og sende den via epost til oss på <a href='mailto:%s'>%s</a>." -#: 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" @@ -2522,18 +2609,23 @@ msgstr "" "problem</a>.\n" #: 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/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 #, fuzzy msgid "" "You have located the problem at the point marked with a purple pin on the " @@ -2570,7 +2662,15 @@ msgstr "Sletting av ditt varsel var vellykket." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: templates/web/default/email_sent.html:30 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:123 +#, fuzzy +msgid "" +"You have successfully signed in; please check and confirm your details are " +"accurate:" +msgstr "Du har nå lykkes med å bekrefte ditt varsel." + +#: 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." @@ -2580,19 +2680,44 @@ msgstr "" msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" +#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14 #: templates/web/default/my/my.html:3 #, fuzzy msgid "Your Reports" msgstr "Søk i rapporter" -#: templates/web/default/alert/list.html:120 +#: templates/web/default/auth/general.html:27 +#, fuzzy +msgid "Your email address:" +msgstr "Din epost" + +#: 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 "Din epost" +#: 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 "Ditt navn:" +#: templates/web/default/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "" + +#: templates/web/default/footer.html:7 +#, fuzzy +msgid "Your reports" +msgstr "Søk i rapporter" + +#: templates/web/default/my/my.html:37 +#, fuzzy +msgid "Your updates" +msgstr "Søk i rapporter" + #: templates/web/default/contact/index.html:76 msgid "Your email:" msgstr "Din epost:" @@ -2610,7 +2735,7 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikke kart" -#: perllib/Utils.pm:241 +#: perllib/Utils.pm:247 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -2648,7 +2773,7 @@ msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:217 +#: perllib/Utils.pm:221 msgid "today" msgstr "idag" @@ -2691,7 +2816,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:19 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -2708,20 +2833,27 @@ msgstr[0] "" 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:14 #, 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:25 #, 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 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapport-<br>oppdatering" +msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" + #: templates/web/default/report/new/some_councils_text.html:14 #, perl-format msgid "" @@ -2737,12 +2869,56 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." -#: templates/web/default/front_stats.html:31 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapport-<br>oppdatering" -msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" +#~ 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 "" +#~ "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a> og " +#~ "vedlikeholdt av <a href=\"http://www.nuug.no/\">NUUG</a>, ved hjelp av <a " +#~ "href=\"http://github.com/mysociety/fixmystreet\">snedig</a> <a href=" +#~ "\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa" +#~ "\">kode</a>." + +#~ 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 "" +#~ "Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>, ved hjelp " +#~ "av <a href=\"http://github.com/mysociety/fixmystreet\">smart</a> <a " +#~ "href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa" +#~ "\">kode</a>." + +#~ msgid "Can we show your name on the site?" +#~ msgstr "Kan vi vise ditt navn her på nettstedet?" + +#, fuzzy +#~ msgid "Get FixMyStreet on your iPhone" +#~ msgstr "Fiksgatami-administrasjon" + +#, fuzzy +#~ msgid "My Reports" +#~ msgstr "Alle rapporter" + +#~ msgid "" +#~ "Sorry, that location appears to be too general; please be more specific." +#~ msgstr "" +#~ "Beklager, den plasserigen ser ut til å være for generell. Forsøk å være " +#~ "mer spesifikk." + +#~ msgid "You can <a href=\"%s\">see less detail</a>." +#~ msgstr "Du kan <a href=\"%s\">se mindre detaljer</a>." + +#~ msgid "" +#~ "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/" +#~ "reports\">show all councils</a>." +#~ msgstr "" +#~ "Du kan <a href=\"%s\">se flere detaljer</a> eller gå tilbake og <a href=" +#~ "\"/reports\">se alle administrasjonene</a>." #~ msgid "Sorry! Something's gone wrong." #~ msgstr "Beklager! Noe har gått galt." @@ -2750,9 +2926,6 @@ msgstr[1] "<big>%s</big> rapport-<br>oppdateringer" #~ msgid "The text of the error was:" #~ msgstr "Teksten i feilmeldingen var:" -#~ msgid "FixMyStreet" -#~ msgstr "FiksGataMi" - #~ msgid "" #~ "<h1>Nearly Done! Now check your email...</h1>\n" #~ "<p>The confirmation email <strong>may</strong> take a few minutes to " diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index a7f899af4..7ad580fa0 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -12,7 +12,7 @@ <div id="logo" align="center"><a href="http://www.nuug.no/">Foreningen NUUG</a></div> <p id="footer"> - [% loc('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>.') %] + [% loc('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>') %] | <a href="http://github.com/mysociety/fixmystreet">[% loc('Source code') %]</a> </p> [% INCLUDE 'tracking_code.html' %] |