diff options
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po | 1411 | ||||
| -rw-r--r-- | locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1415 | ||||
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1417 |
3 files changed, 2480 insertions, 1763 deletions
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po index a021bf46c..be85a97c5 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: 2012-03-28 19:23+0100\n" +"POT-Creation-Date: 2012-08-21 09:54+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" @@ -20,16 +20,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid " and " msgstr "" -#: templates/web/default/tokens/confirm_problem.html:10 -#: templates/web/default/tokens/confirm_problem.html:6 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:18 msgid " and <strong>we will now send it to the council</strong>" msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" #: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:17 #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_none.html:14 #: templates/web/default/report/new/councils_text_none.html:17 @@ -37,13 +39,6 @@ msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>" #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 #: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:15 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:23 -#: templates/web/fixmystreet/report/new/councils_text_some.html:5 #, fuzzy msgid " or " msgstr "neu" @@ -61,12 +56,12 @@ msgstr "" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:293 #, fuzzy msgid "%d day" msgstr "diwrnod" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:293 #, fuzzy msgid "%d days" msgstr "diwrnod" @@ -75,12 +70,12 @@ msgstr "diwrnod" msgid "%d edits by %s" msgstr "" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 #, fuzzy msgid "%d hour" msgstr "awr" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 #, fuzzy msgid "%d hours" msgstr "awr" @@ -90,12 +85,12 @@ msgstr "awr" msgid "%d live updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 #, fuzzy msgid "%d minute" msgstr "munud" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 #, fuzzy msgid "%d minutes" msgstr "munud" @@ -104,38 +99,40 @@ msgstr "munud" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 #, fuzzy msgid "%d week" msgstr "wythnos" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 #, fuzzy msgid "%d weeks" msgstr "wythnos" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:14 +#: templates/web/default/reports/council.html:26 #: templates/web/emptyhomes/reports/council.html:11 #: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s - Adroddiadau cryno" -#: perllib/FixMyStreet/Cobrand/Default.pm:792 -#: perllib/FixMyStreet/Cobrand/Default.pm:806 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +msgid "%s ref: %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:480 +#: perllib/FixMyStreet/DB/Result/Problem.pm:488 msgid "%s, reported anonymously at %s" msgstr "Rhoddodd %s wybod yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 msgid "%s, reported by %s at %s" msgstr "Adroddwyd am %s gan %s am %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:823 -#: perllib/FixMyStreet/Cobrand/Default.pm:837 +#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 #, fuzzy msgid "%s, within %s ward" msgstr "Eiddo gwag yn ward %s" @@ -153,31 +150,35 @@ msgstr "" msgid "(Email in abuse table)" msgstr "" -#: templates/web/default/alert/list.html:51 +#: templates/web/default/alert/_list.html:20 #: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)" -#: templates/web/default/alert/list.html:56 +#: templates/web/default/alert/_list.html:25 #: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn" +#: templates/web/default/around/around_map_list_items.html:12 +#: templates/web/default/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:23 +msgid "(closed)" +msgstr "" + #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/default/reports/council.html:134 -#: templates/web/fixmystreet/around/around_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:21 msgid "(returned to use)" msgstr "(wedi'i adfer i'w ddefnyddio)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/index.html:30 +#: templates/web/fixmystreet/around/postcode_form.html:7 msgid " " msgstr " " -#: templates/web/default/reports/council.html:131 -#: templates/web/default/reports/council.html:152 +#: templates/web/default/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:17 #, fuzzy msgid "(not sent to council)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -186,8 +187,8 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/default/reports/council.html:130 -#: templates/web/default/reports/council.html:150 +#: templates/web/default/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:16 #, fuzzy msgid "(sent to both)" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -196,33 +197,34 @@ msgstr "Ni roddwyd gwybod i'r cyngor am hyn" 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:214 +#: templates/web/default/report/display.html:209 #, 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:281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 msgid "*unknown*" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/DB/Result/Problem.pm:337 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 #, fuzzy msgid "-- Pick a category --" msgstr "-- Dewiswch fath o eiddo --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 msgid "-- Pick a property type --" msgstr "-- Dewiswch fath o eiddo --" #: templates/web/default/tokens/confirm_problem.html:14 -#: templates/web/default/tokens/confirm_problem.html:6 -msgid ". You can <a href=\"%s\">view the empty property on this site</a>." +#: templates/web/default/tokens/confirm_problem.html:22 +#, fuzzy +msgid ". You can <a href=\"%s%s\">view the empty property on this site</a>." msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>." -#: templates/web/default/questionnaire/completed.html:25 +#: templates/web/default/questionnaire/completed.html:20 #, fuzzy msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " @@ -231,16 +233,59 @@ 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:15 +#: templates/web/fiksgatami/questionnaire/completed-open.html:1 #, fuzzy 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" -"or, if it’s an empty property that could be returned to use by local " -"people working together,\n" -"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a " -"pledge</a>?\n" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/" +"\">writing\n" +"direct to your councillor(s)</a> or, if it’s an empty property that " +"could be\n" +"returned to use by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%\">Mae'n flin gennym glywed hynny. Mae gennym ddau " +"awgrym: beth am roi cynnig ar\n" +"<a href=\"http://www.writetothem.com/\">ysgrifennu'n uniongyrchol at eich " +"cynghorwr(wyr)</a>\n" +"neu, os yw'n eiddo gwag y gallai pobl leol gydweithio er mwyn ei adfer i'w " +"ddefnyddio,\n" +"beth am <a href=\"http://www.pledgebank.com/new\">wneud adduned a'i " +"chyhoeddi</a>?\n" +"</p>\n" + +#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " +"direct\n" +"to your councillor(s)</a> or, if it’s an empty property that could be " +"returned to use by\n" +"local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%\">Mae'n flin gennym glywed hynny. Mae gennym ddau " +"awgrym: beth am roi cynnig ar\n" +"<a href=\"http://www.writetothem.com/\">ysgrifennu'n uniongyrchol at eich " +"cynghorwr(wyr)</a>\n" +"neu, os yw'n eiddo gwag y gallai pobl leol gydweithio er mwyn ei adfer i'w " +"ddefnyddio,\n" +"beth am <a href=\"http://www.pledgebank.com/new\">wneud adduned a'i " +"chyhoeddi</a>?\n" +"</p>\n" + +#: templates/web/default/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try writing to your local representative or, if " +"it’s\n" +"an empty property that could be returned to use by local people working " +"together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" msgstr "" "<p style=\"font-size:150%\">Mae'n flin gennym glywed hynny. Mae gennym ddau " @@ -348,12 +393,12 @@ msgstr "" msgid "<strong>%d</strong> live empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:148 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -372,18 +417,18 @@ msgstr "" 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:169 +#: templates/web/default/report/display.html:164 #, 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:147 +#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 #: templates/web/fixmystreet/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:136 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -396,7 +441,7 @@ msgstr "Adrodd am eiddo gwag a gweld y rhain" msgid "About us" msgstr "Amdanom ni" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:66 msgid "Add new category" msgstr "" @@ -405,7 +450,6 @@ msgid "Added %s" msgstr "" #: templates/web/default/auth/change_password.html:29 -#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "" @@ -417,8 +461,9 @@ msgstr "" msgid "Alert %d disabled (created %s)" msgstr "" -#: templates/web/default/report/display.html:219 -#: templates/web/fixmystreet/report/display.html:193 +#: templates/web/bromley/report/display.html:207 +#: templates/web/default/report/display.html:214 +#: templates/web/fixmystreet/report/display.html:189 msgid "Alert me to future updates" msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol" @@ -435,7 +480,8 @@ msgstr "Adroddiadau" msgid "All confirmed" msgstr "" -#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 +#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 #: templates/web/fixmystreet/footer.html:49 @@ -444,14 +490,23 @@ msgid "Reports" msgstr "Adroddiadau" #: templates/web/default/report/new/councils_text_some.html:2 -#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "" +#: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:12 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>%s</strong> or " +"<strong>Roads Service</strong>." +msgstr "" +"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>" +"%s</strong>.\n" +"Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" +"ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." + #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_all.html:5 #, fuzzy msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " @@ -463,12 +518,12 @@ msgstr "" "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n" "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni." -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:6 +#: templates/web/default/report/new/councils_text_all.html:17 +#: templates/web/default/report/new/councils_text_all.html:19 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:12 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" @@ -513,11 +568,11 @@ msgid "" "reportemptyhomes.com?" msgstr "" -#: templates/web/fixmystreet/footer.html:18 +#: templates/web/fixmystreet/footer.html:17 msgid "Are you a developer?" msgstr "" -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/footer.html:21 #, fuzzy msgid "Are you from a council?" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -549,15 +604,18 @@ msgstr "" msgid "By Date" msgstr "" -#: templates/web/fixmystreet/around/display_location.html:75 -#: templates/web/fixmystreet/around/display_location.html:77 +#: templates/web/fixmystreet/around/display_location.html:80 +#: templates/web/fixmystreet/around/display_location.html:82 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n" " i'r cam hwn</a>.</small>" -#: templates/web/default/admin/council_contacts.html:31 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: templates/web/bromley/report/new/fill_in_details_form.html:68 +#: templates/web/default/admin/council_contacts.html:35 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 @@ -570,16 +628,14 @@ msgstr "Categori:" msgid "Category fix rate for empty properties > 4 weeks old" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:72 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Categori:" -#: bin/send-reports:181 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 #, fuzzy msgid "Category: %s" msgstr "Categori:" @@ -587,28 +643,30 @@ msgstr "Categori:" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 -#: templates/web/fixmystreet/auth/change_password.html:1 -#: templates/web/fixmystreet/auth/change_password.html:3 -#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "" #: templates/web/fixmystreet/around/display_location.html:72 +#: templates/web/fixmystreet/around/display_location.html:73 #, fuzzy msgid "Click map to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:641 +#: perllib/FixMyStreet/DB/Result/Problem.pm:690 #, fuzzy msgid "Closed by council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" @@ -622,8 +680,8 @@ msgstr "Cuddio hen adroddiadau " msgid "Closed:" msgstr "" -#: templates/web/default/around/display_location.html:101 #: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:105 msgid "Closest nearby empty properties <small>(within %skm)</small>" msgstr "Yr eiddo gwag cyfagos agosaf <small>(within %skm)</small>" @@ -647,30 +705,29 @@ msgstr "" msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:358 #, fuzzy msgid "Configuration updated" msgstr "Cadarnhau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:361 +#: perllib/FixMyStreet/App/Controller/Admin.pm:372 msgid "Configuration updated - contacts will be generated automatically later" msgstr "" -#: templates/web/default/admin/council_contacts.html:124 +#: templates/web/default/admin/council_contacts.html:153 msgid "Configure Open311" msgstr "" -#: templates/web/default/admin/council_contacts.html:101 +#: templates/web/default/admin/council_contacts.html:105 msgid "Configure Open311 integration" msgstr "" -#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:42 #, fuzzy msgid "Confirm" msgstr "Cadarnhau" #: templates/web/default/auth/token.html:1 -#: templates/web/fixmystreet/auth/token.html:1 #, fuzzy msgid "Confirm account" msgstr "Cadarnhau" @@ -685,8 +742,8 @@ msgstr "Cadarnhau" msgid "Confirmation" msgstr "Cadarnhau" -#: templates/web/default/admin/council_contacts.html:33 -#: templates/web/default/admin/council_contacts.html:78 +#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:82 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -710,6 +767,7 @@ msgstr "Cysylltu" msgid "Contact reportemptyhomes.com" msgstr "Adroddiadau newydd ar reportemptyhomes.com" +#: templates/web/bromley/contact/submit.html:1 #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 @@ -718,14 +776,15 @@ msgstr "Adroddiadau newydd ar reportemptyhomes.com" msgid "Contact Us" msgstr "Cysylltwch â Ni" +#: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Cysylltu â'r tîm" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 msgid "Could not find user" msgstr "" @@ -737,7 +796,7 @@ msgstr "" msgid "Council" msgstr "cyngor" -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 #, fuzzy msgid "Council contacts" @@ -770,7 +829,7 @@ msgstr "Cysylltu" msgid "Create a report" msgstr "Categori:" -#: templates/web/default/admin/council_contacts.html:92 +#: templates/web/default/admin/council_contacts.html:96 #, fuzzy msgid "Create category" msgstr "Categori:" @@ -794,13 +853,19 @@ msgstr "" msgid "Currently has 1+ deleted" msgstr "" -#: templates/web/default/admin/council_contacts.html:34 -#: templates/web/default/admin/council_contacts.html:81 +#: templates/web/default/dashboard/index.html:5 +#: templates/web/default/dashboard/index.html:7 +msgid "Dashboard" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "" +#: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Details" @@ -817,8 +882,8 @@ msgstr "" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 +#: templates/web/fixmystreet/report/display.html:128 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 #, fuzzy msgid "Do you have a reportemptyhomes.com password?" msgstr "Diweddariadau i reportemptyhomes.com" @@ -853,7 +918,8 @@ msgstr "Cyflwyno'ch diweddariad" msgid "Editor" msgstr "" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -862,46 +928,46 @@ msgstr "" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:125 +#: templates/web/fixmystreet/report/display.html:120 #, fuzzy msgid "Email" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 msgid "Email added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 msgid "Email already in abuse list" msgstr "" -#: templates/web/default/around/display_location.html:83 +#: templates/web/default/around/display_location.html:85 msgid "Email me new local empty properties" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: templates/web/default/report/display.html:35 +#: templates/web/default/report/display.html:30 msgid "Email me updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:77 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:39 +#: templates/web/default/report/display.html:34 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Empty flat or maisonette" msgstr "Fflat neu fflat deulawr gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty house or bungalow" msgstr "Tŷ neu fyngalo gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty office or other commercial" msgstr "Swyddfa wag neu fan masnachol gwag arall" @@ -909,11 +975,11 @@ 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:540 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty pub or bar" msgstr "Tafarn neu far gwag" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 msgid "Empty public building - school, hospital, etc." msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati." @@ -930,39 +996,47 @@ msgstr "diwrnod" msgid "End month:" msgstr "" -#: 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 #: templates/web/emptyhomes/index.html:40 -#: templates/web/emptyhomes/index.html:43 -#: templates/web/fixmystreet/around/around_index.html:10 -#: templates/web/fixmystreet/around/around_index.html:13 -#: templates/web/fixmystreet/index.html:32 -#: templates/web/fixmystreet/index.html:35 +#: templates/web/emptyhomes/index.html:41 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:32 +#: perllib/FixMyStreet/Cobrand/UK.pm:18 +#, fuzzy +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 #, 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/around/postcode_form.html:1 +#: templates/web/default/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +#, fuzzy +msgid "Enter a nearby street name and area" +msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:" + #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:176 +#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 #, fuzzy msgid "Enter a new password:" msgstr "Ychwanegwch neges" +#: templates/web/bromley/report/display.html:148 +#: templates/web/bromley/report/new/fill_in_details_form.html:189 #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:165 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 #, fuzzy msgid "Enter a password" msgstr "Ychwanegwch neges" -#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 -#: templates/web/fixmystreet/index.html:55 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 +#: templates/web/fixmystreet/index.html:41 msgid "Enter details of the empty property" msgstr "Rhowch fanylion yr eiddo gwag" @@ -973,7 +1047,6 @@ msgstr "Rhowch fanylion yr eiddo gwag" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 -#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Gwall" @@ -986,6 +1059,11 @@ msgstr "" msgid "Examples:" msgstr "" +#: templates/web/default/admin/report_edit.html:40 +msgid "Extra data:" +msgstr "" + +#: templates/web/bromley/contact/submit.html:14 #: templates/web/default/contact/submit.html:15 #, fuzzy msgid "" @@ -995,6 +1073,13 @@ msgstr "" "Rhowch gynnig eto'n ddiweddarach, neu <a href=\"mailto:%s\">anfonwch neges e-" "bost atom</a>i roi gwybod inni." +#: templates/web/bromley/report/display.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:113 +#: templates/web/bromley/report/new/fill_in_details_form.html:160 +#, fuzzy +msgid "First Name" +msgstr "Y tro cyntaf" + #: templates/web/default/questionnaire/index.html:79 #: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" @@ -1020,13 +1105,7 @@ msgstr "reportemptyhomes.com" msgid "reportemptyhomes.com administration" msgstr "Diweddariadau i reportemptyhomes.com" -#: templates/web/fixmystreet/static/for_councils.html:1 -#, fuzzy -msgid "reportemptyhomes.com for Councils" -msgstr "Adroddiadau newydd ar reportemptyhomes.com" - -#: templates/web/default/alert/index.html:6 -#: templates/web/fixmystreet/alert/index.html:6 +#: templates/web/default/alert/index.html:11 msgid "" "reportemptyhomes.com has a variety of RSS feeds and email alerts for local " "empty properties, including\n" @@ -1040,8 +1119,8 @@ msgstr "" "bob eiddo gwag\n" "o fewn pellter penodol o leoliad penodol." -#: templates/web/default/alert/list.html:98 -#: templates/web/fixmystreet/alert/_list.html:69 +#: templates/web/default/alert/_list.html:71 +#: templates/web/fixmystreet/alert/_list.html:73 msgid "" "reportemptyhomes.com sends different categories of empty property\n" "to the appropriate council, so empty properties within the boundary of a " @@ -1064,14 +1143,18 @@ 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." -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:12 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Fixed" msgstr "" @@ -1104,14 +1187,14 @@ msgstr "" msgid "Flagged" msgstr "" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "" -#: templates/web/default/reports/council.html:24 -#: templates/web/default/reports/council.html:87 +#: templates/web/default/reports/_ward-list.html:3 #: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "" @@ -1126,6 +1209,8 @@ msgstr "cyngor" #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 +#: templates/web/fixmystreet/static/privacy.html:1 +#: templates/web/zurich/faq/faq-de.html:1 msgid "Frequently Asked Questions" msgstr "Cwestiynau Cyffredin" @@ -1137,31 +1222,37 @@ msgstr "" msgid "GeoRSS on Google Maps" msgstr "" -#: templates/web/fixmystreet/report/display.html:28 +#: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:23 #, fuzzy msgid "Get updates" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" -#: templates/web/default/reports/council.html:72 +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +#, fuzzy +msgid "Get updates of %s empty properties" +msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 #, fuzzy msgid "Get updates of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: templates/web/default/alert/list.html:110 -#: templates/web/fixmystreet/alert/_list.html:78 +#: templates/web/default/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 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:33 templates/web/emptyhomes/index.html:49 -#: templates/web/fixmystreet/alert/index.html:25 -#: templates/web/fixmystreet/around/around_index.html:20 -#: templates/web/fixmystreet/index.html:42 +#: templates/web/default/alert/index.html:34 +#: templates/web/default/around/postcode_form.html:8 +#: templates/web/emptyhomes/index.html:47 +#: templates/web/fixmystreet/around/postcode_form.html:18 msgid "Go" msgstr "Ewch" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #, fuzzy msgid "Going to send questionnaire?" msgstr "Anfon yr holiadur" @@ -1189,7 +1280,8 @@ msgstr "" "Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai " "dyma'ch tro cyntaf?" -#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 +#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 @@ -1198,14 +1290,17 @@ msgstr "" msgid "FAQs" msgstr "Cwestiynau Cyffredin" -#: templates/web/default/alert/list.html:37 +#: templates/web/default/alert/_list.html:6 #: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local empty property alerts for ‘%s’." msgstr "" "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer ‘%s’." -#: templates/web/bromley/header.html:46 -#: templates/web/fixmystreet/header.html:46 +#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 +#: templates/web/bromley/header.html:99 +#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmystreet/header.html:47 +#: templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "" @@ -1230,12 +1325,12 @@ msgstr "Cuddio pinnau" msgid "History" msgstr "" -#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 -#: templates/web/fixmystreet/index.html:50 +#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 +#: templates/web/fixmystreet/index.html:36 msgid "How to report an empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:592 +#: perllib/FixMyStreet/App/Controller/Admin.pm:637 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "" @@ -1244,7 +1339,7 @@ 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" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:43 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:44 #, fuzzy msgid "" "I'm afraid we couldn't validate that token, as the report was made too long " @@ -1253,7 +1348,7 @@ msgstr "" "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r " "URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" @@ -1269,8 +1364,6 @@ msgstr "" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:10 -#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit an empty property here the subject and details of the empty " "property will be public, but the empty property will <strong>not</strong> be " @@ -1293,7 +1386,6 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 -#: templates/web/fixmystreet/auth/token.html:23 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 " @@ -1322,12 +1414,16 @@ msgstr "ID Anghyfreithlon" msgid "Illegal feed selection" msgstr "Dewis porthiant annilys" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "In Progress" msgstr "" @@ -1339,7 +1435,7 @@ msgid "" "present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +#: templates/web/fixmystreet/report/banner.html:19 msgid "In progress" msgstr "" @@ -1348,33 +1444,37 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Cynnwys hen adroddiadau" -#: perllib/FixMyStreet/App/Controller/Open311.pm:358 +#: perllib/FixMyStreet/App/Controller/Open311.pm:356 msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:343 +#: perllib/FixMyStreet/App/Controller/Open311.pm:341 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 #, fuzzy msgid "Invalid end date" msgstr "Rhowch ddiweddariad" -#: perllib/FixMyStreet/App/Controller/Open311.pm:426 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:932 msgid "Invalid start date" msgstr "" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 #, fuzzy msgid "Investigating" msgstr "Mordwyo " @@ -1403,16 +1503,25 @@ msgstr "" "yn gwneud unrhyw beth. Rydym yn annog cynghorau i ddiweddaru'r wefan \n" "fel y gallwch weld beth sy'n digwydd." +#: templates/web/bromley/report/display.html:166 +#: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/bromley/report/display.html:195 +#: templates/web/bromley/report/new/fill_in_details_form.html:119 +#: templates/web/bromley/report/new/fill_in_details_form.html:166 +#, fuzzy +msgid "Last Name" +msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" + +#: templates/web/default/admin/council_contacts.html:39 msgid "Last editor" msgstr "" @@ -1425,15 +1534,17 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "Last update:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:985 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 msgid "List Flagged" msgstr "" -#: templates/web/default/admin/council_contacts.html:13 +#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:16 #, fuzzy msgid "List all reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" +#: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." @@ -1450,12 +1561,6 @@ msgstr "" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 -#: templates/web/fixmystreet/alert/choose.html:1 -#: templates/web/fixmystreet/alert/choose.html:3 -#: templates/web/fixmystreet/alert/index.html:1 -#: templates/web/fixmystreet/alert/index.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:5 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" @@ -1464,15 +1569,12 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:12 -#: templates/web/fixmystreet/alert/list.html:14 -#: templates/web/fixmystreet/alert/list.html:3 #, fuzzy msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" -#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 +#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 #: templates/web/fixmystreet/footer.html:51 @@ -1480,12 +1582,12 @@ msgstr "Porthiannau RSS a hysbysiadau e-bost lleol" msgid "Get local reports" msgstr "Gweld adroddiadau lleol" -#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:54 +#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 +#: templates/web/fixmystreet/index.html:40 msgid "Locate the empty property on a map of the area" msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal" -#: perllib/FixMyStreet/Map/OSM.pm:43 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" "\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/" @@ -1501,7 +1603,7 @@ msgstr "Neges:" msgid "Message:" msgstr "Neges:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "" @@ -1510,7 +1612,7 @@ msgstr "" msgid "Month" msgstr "Cysylltu" -#: templates/web/default/report/display.html:31 +#: templates/web/default/report/display.html:26 msgid "More empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" @@ -1524,9 +1626,9 @@ msgstr "Mwy o eiddo gwag cyfagos" #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/display.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 msgid "Name" msgstr "Enw" @@ -1542,26 +1644,26 @@ msgstr "Enw:" msgid "Navigation" msgstr "Mordwyo " -#: perllib/FixMyStreet/Geocode/OSM.pm:100 +#: perllib/FixMyStreet/Geocode/OSM.pm:159 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:480 +#: perllib/FixMyStreet/Cobrand/UK.pm:161 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:469 -#: perllib/FixMyStreet/Cobrand/Default.pm:520 +#: perllib/FixMyStreet/Cobrand/Default.pm:404 +#: perllib/FixMyStreet/Cobrand/Default.pm:444 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1577,7 +1679,7 @@ msgstr "" msgid "New <br>empty properties" msgstr "Adroddiadau newydd am eiddo gwag" -#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/App/Controller/Admin.pm:314 msgid "New category contact added" msgstr "" @@ -1660,15 +1762,15 @@ msgstr "" msgid "New!" msgstr "Newydd!" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1684,7 +1786,7 @@ msgstr "Nac ydw" msgid "No council" msgstr "cyngor" -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/DB/Result/Problem.pm:328 msgid "No council selected" msgstr "Ni ddewiswyd cyngor" @@ -1705,13 +1807,13 @@ msgstr "" msgid "No info at all" msgstr "" -#: templates/web/default/around/around_map_list_items.html:15 -#: templates/web/fixmystreet/around/around_map_list_items.html:24 +#: templates/web/default/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No empty properties found." msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag." -#: templates/web/default/around/on_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:21 +#: templates/web/default/around/on_map_list_items.html:14 +#: templates/web/fixmystreet/around/on_map_list_items.html:6 msgid "No empty properties have been reported yet." msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag." @@ -1726,13 +1828,13 @@ msgstr "Nac ydw" msgid "Not reported before" msgstr "Wedi adrodd o'r blaen" -#: templates/web/default/report/_main.html:9 +#: templates/web/default/report/_main.html:11 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:11 +#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: templates/web/default/admin/council_contacts.html:36 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:46 #, fuzzy msgid "Note" @@ -1745,7 +1847,7 @@ msgid "" "numbers may jump about a little" msgstr "" -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:89 #: templates/web/default/admin/council_edit.html:31 #, fuzzy msgid "Note:" @@ -1755,7 +1857,7 @@ msgstr "Nac ydw" msgid "Note: <strong>%s</strong>" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 msgid "Now to submit your report…" msgstr "" @@ -1765,17 +1867,17 @@ msgid "" "password?" msgstr "" -#: templates/web/fixmystreet/report/display.html:132 +#: templates/web/fixmystreet/report/display.html:127 msgid "Now to submit your update…" msgstr "" -#: templates/web/default/report/display.html:138 +#: 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:26 +#: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Sarhaus? Anaddas? Rhowch wybod i ni" @@ -1816,10 +1918,12 @@ msgstr "Wedi'u hadfer i'w defnyddio ers amser" msgid "Older empty property reports" msgstr "Adroddiadau hŷn o eiddo gwag" +#: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:74 msgid "Open" msgstr "" @@ -1841,13 +1945,13 @@ msgstr "" msgid "Open311 specification" msgstr "" -#: templates/web/default/alert/list.html:85 -#: templates/web/fixmystreet/alert/_list.html:56 +#: templates/web/default/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 msgid "Or empty properties reported to:" msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:" -#: templates/web/default/alert/list.html:61 -#: templates/web/fixmystreet/alert/_list.html:33 +#: templates/web/default/alert/_list.html:33 +#: templates/web/fixmystreet/alert/_list.html:36 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1855,14 +1959,15 @@ msgstr "" "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn " "byw ynddo:" -#: bin/send-reports:176 bin/send-reports:185 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/DB/Result/Problem.pm:489 -#: perllib/FixMyStreet/DB/Result/Problem.pm:499 -#: perllib/FixMyStreet/DB/Result/Problem.pm:509 -#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 +#: perllib/FixMyStreet/DB/Result/Problem.pm:497 +#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: perllib/FixMyStreet/DB/Result/Problem.pm:517 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 msgid "Other" msgstr "Arall" @@ -1887,53 +1992,62 @@ msgstr "" msgid "Partial" msgstr "" +#: templates/web/bromley/report/display.html:145 +#: templates/web/bromley/report/new/fill_in_details_form.html:186 #: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:157 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #, fuzzy msgid "Password (optional)" msgstr "(dewisol)" #: templates/web/default/auth/change_password.html:25 -#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 +#: templates/web/bromley/report/new/fill_in_details_form.html:183 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 #, fuzzy msgid "Phone number (optional)" msgstr "(dewisol)" -#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Rhif ffôn:" -#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/bromley/report/display.html:109 +#: templates/web/bromley/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/report/display.html:103 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 #, fuzzy msgid "Photo" msgstr "Ffotograff:" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:114 +#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Ffotograff:" -#: templates/web/default/alert/list.html:27 -#: templates/web/fixmystreet/alert/list.html:27 +#: templates/web/default/alert/list.html:26 msgid "Photos of recent nearby reports" msgstr "Ffotograffau o adroddiadau cyfagos diweddar" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 msgid "Planned" msgstr "" @@ -1951,13 +2065,10 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "" #: templates/web/default/auth/token.html:17 -#: templates/web/fixmystreet/auth/token.html:17 #, fuzzy msgid "Please check your email" msgstr "Rhowch eich cyfeiriad e-bost" @@ -1970,18 +2081,25 @@ 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:739 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 +#: perllib/FixMyStreet/DB/Result/Problem.pm:347 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Dewiswch gategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "Please choose a property type" msgstr "Dewiswch fath o eiddo" +#: templates/web/bromley/report/new/fill_in_details_form.html:64 +msgid "" +"Please describe the exact location of the report. Example: “2 dumped " +"mattresses outside Number 19 Stockwell Close”" +msgstr "" + #: templates/web/default/contact/blurb.html:2 msgid "" "Please do <strong>not</strong> report empty properties through this form; " @@ -2004,43 +2122,41 @@ msgid "" "for all users." msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 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/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:15 #, fuzzy msgid "Please enter a password" msgstr "Ychwanegwch neges" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Rhowch enw'r pwnc" -#: perllib/FixMyStreet/DB/Result/User.pm:96 +#: perllib/FixMyStreet/DB/Result/User.pm:104 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Alert.pm:342 +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Cofnodwch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Cofnodwch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:93 +#: perllib/FixMyStreet/DB/Result/User.pm:101 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 #: templates/web/default/js/validation_strings.html:11 @@ -2050,12 +2166,18 @@ msgstr "Cofnodwch fanylion" msgid "Please enter your email" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 #, fuzzy msgid "Please enter your email address" msgstr "Cofnodwch eich cyfeiriad e-bost" -#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:19 +#, fuzzy +msgid "Please enter your first name" +msgstr "Cofnodwch eich enw" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:340 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -2066,13 +2188,23 @@ msgstr "" "ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 -#: perllib/FixMyStreet/DB/Result/User.pm:89 +#: perllib/FixMyStreet/DB/Result/Comment.pm:143 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Cofnodwch eich enw" +#: templates/web/default/js/validation_strings.html:20 +#, fuzzy +msgid "Please enter your second name" +msgstr "Cofnodwch eich enw" + +#: templates/web/default/js/validation_strings.html:18 +#, fuzzy +msgid "Please enter your title" +msgstr "Cofnodwch eich cyfeiriad e-bost" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 #, fuzzy msgid "" @@ -2117,6 +2249,7 @@ msgstr "" msgid "Please fill in details of the empty property." msgstr "Llenwch fanylion yr eiddo gwag isod." +#: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 #, fuzzy @@ -2131,14 +2264,25 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall" -#: templates/web/default/report/display.html:61 -#: templates/web/fixmystreet/report/display.html:59 +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3 +msgid "Please note that updates are not sent to the council." +msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor." + +#: templates/web/default/report/display.html:56 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/barnet/report/updates-sidebar-notes.html:1 +msgid "" +"Please note that updates are not sent to the relevant department. 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/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" @@ -2159,7 +2303,7 @@ msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn" msgid "Please provide some text as well as a photo" msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported an empty property to your council " @@ -2185,27 +2329,36 @@ 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:843 +#: perllib/FixMyStreet/App/Controller/Photo.pm:176 msgid "Please upload a JPEG image only" msgstr "Dim ond llun JPEG y dylech lwytho i fyny." +#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#, fuzzy +msgid "Please upload a JPEG image only\n" +msgstr "Dim ond llun JPEG y dylech lwytho i fyny." + #: perllib/FixMyStreet/App/Controller/Contact.pm:98 msgid "Please write a message" msgstr "Ysgrifennwch neges" -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/bromley/report/display.html:70 +#: templates/web/fixmystreet/report/display.html:69 #, fuzzy msgid "Please write your update here" msgstr "Rhowch eich enw" +#: templates/web/bromley/report/display.html:121 +#: templates/web/bromley/report/display.html:149 +#: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:124 -#: templates/web/default/report/display.html:161 -#: templates/web/default/report/display.html:183 +#: templates/web/default/report/display.html:119 +#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:120 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/display.html:166 +#: templates/web/fixmystreet/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:161 msgid "Post" msgstr "Postio" @@ -2213,12 +2366,12 @@ msgstr "Postio" msgid "Posted anonymously at %s" msgstr "Cofnodwyd yn ddi-enw am %s" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:21 #, fuzzy msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Cofnodwyd gan %s am %s" -#: templates/web/default/report/updates.html:19 +#: templates/web/default/report/updates.html:23 msgid "Posted by %s at %s" msgstr "Cofnodwyd gan %s am %s" @@ -2246,7 +2399,7 @@ msgstr "Eiddo gwag yn %s" msgid "Empty property breakdown by state" msgstr "ni fydd eich eiddo gwag yn cael ei bostio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:776 +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 #, fuzzy msgid "Empty property marked as open." msgstr "Ffurflen manylion eiddo gwag" @@ -2260,17 +2413,18 @@ msgstr "" msgid "Empty properties" msgstr "Eiddo gwag" -#: templates/web/default/around/display_location.html:79 +#: templates/web/default/around/display_location.html:81 msgid "Empty properties in this area" msgstr "Eiddo gwag yn yr ardal hon" -#: templates/web/fixmystreet/around/display_location.html:93 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/bromley/report/display.html:31 +#: templates/web/fixmystreet/around/display_location.html:98 +#: templates/web/fixmystreet/report/display.html:24 #, fuzzy msgid "Empty properties nearby" msgstr "Mwy o eiddo gwag cyfagos" -#: templates/web/fixmystreet/around/display_location.html:92 +#: templates/web/fixmystreet/around/display_location.html:97 #, fuzzy msgid "Empty properties on the map" msgstr "Eiddo gwag yn yr ardal hon" @@ -2283,30 +2437,31 @@ msgstr "" "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael " "eu hadfer i'w defnyddio" -#: templates/web/default/alert/list.html:50 +#: templates/web/default/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 #, fuzzy msgid "Empty properties within %.1fkm of this location" msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:748 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 +#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "Empty properties within %s" msgstr "Eiddo gwag yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 +#: perllib/FixMyStreet/Cobrand/UK.pm:254 msgid "Empty properties within %s ward" msgstr "Eiddo gwag yn ward %s" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:29 msgid "Empty properties within %s, reportemptyhomes.com" msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com" -#: templates/web/default/alert/list.html:67 -#: templates/web/fixmystreet/alert/_list.html:38 +#: templates/web/default/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 msgid "Empty properties within the boundary of:" msgstr "Eiddo gwag o fewn ffiniau:" @@ -2316,24 +2471,33 @@ 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:543 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Property type:" msgstr "Math o eiddo:" +#: templates/web/bromley/report/new/fill_in_details_form.html:52 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 #, fuzzy msgid "Provide a title" msgstr "Rhowch ddiweddariad" -#: templates/web/default/report/display.html:56 -#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/bromley/report/display.html:57 +#: templates/web/default/report/display.html:51 +#: templates/web/fixmystreet/report/display.html:50 msgid "Provide an update" msgstr "Rhowch ddiweddariad" -#: templates/web/default/report/display.html:180 +#: templates/web/bromley/report/new/fill_in_details_form.html:180 +msgid "" +"Providing a password is optional, but doing so will allow you to more easily " +"report future empty properties, leave updates and manage your reports." +msgstr "" + +#: templates/web/bromley/report/display.html:142 +#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report empty properties, leave updates and manage your reports." @@ -2345,9 +2509,9 @@ msgstr "" #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 #: templates/web/fixmystreet/questionnaire/index.html:0 -#: templates/web/fixmystreet/questionnaire/index.html:15 -#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:14 #: templates/web/fixmystreet/questionnaire/index.html:32 +#: templates/web/fixmystreet/questionnaire/index.html:4 msgid "Questionnaire" msgstr "Holiadur" @@ -2365,69 +2529,62 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" msgid "Questionnaire filled in by empty property reporter" msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag" -#: templates/web/fixmystreet/static/for_councils_faq.html:1 -#, fuzzy -msgid "Questions and Answers :: reportemptyhomes.com for Councils" -msgstr "Adroddiadau newydd ar reportemptyhomes.com" - -#: templates/web/default/alert/list.html:52 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/alert/_list.html:21 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:47 -#: templates/web/default/reports/council.html:79 +#: templates/web/default/report/display.html:42 +#: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 #: templates/web/fixmystreet/around/display_location.html:1 #: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed" msgstr "Porthiant RSS" -#: perllib/FixMyStreet/Cobrand/Default.pm:786 -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 #, fuzzy msgid "RSS feed for %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 -#: perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 #, fuzzy msgid "RSS feed for %s ward, %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:816 -#: perllib/FixMyStreet/Cobrand/Default.pm:830 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 +#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 msgid "RSS feed of %s" msgstr "Porthiant RSS %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:822 -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 #, fuzzy msgid "RSS feed of %s, within %s ward" msgstr "Porthiant RSS %s" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/_list.html:21 #: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby empty properties" msgstr "Porthiant RSS o eiddo gwag sydd gerllaw" -#: templates/web/default/reports/council.html:79 +#: templates/web/default/reports/_rss.html:1 msgid "RSS feed of empty properties in this %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:749 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 +#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:247 #, fuzzy msgid "RSS feed of empty properties within %s" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" -#: perllib/FixMyStreet/Cobrand/Default.pm:756 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 +#: perllib/FixMyStreet/Cobrand/UK.pm:253 #, fuzzy msgid "RSS feed of empty properties within %s ward" msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" @@ -2439,16 +2596,18 @@ msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn" msgid "RSS feed of recent local empty properties" msgstr "Porthiant RSS o eiddo gwag lleol diweddar" -#: templates/web/default/report/display.html:47 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed of updates to this empty property" msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn" +#: templates/web/bromley/report/display.html:39 #: templates/web/default/alert/updates.html:9 -#: templates/web/default/report/display.html:38 +#: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:32 msgid "Receive email when updates are left on this empty property." msgstr "" "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag " @@ -2472,7 +2631,7 @@ msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" msgid "Recently returned to use" msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar" -#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 +#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 msgid "Recently reported empty properties" msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar" @@ -2489,17 +2648,17 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:77 +#: templates/web/emptyhomes/header.html:10 msgid "Report Empty Homes" msgstr "Adrodd am Eiddo Gwag" -#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 -#: templates/web/emptyhomes/header.html:27 +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 +#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 @@ -2507,7 +2666,8 @@ msgstr "Adrodd am Eiddo Gwag" msgid "Report a property" msgstr "Rhoi gwybod am eiddo" -#: templates/web/fixmystreet/report/display.html:27 +#: templates/web/bromley/report/display.html:28 +#: templates/web/fixmystreet/report/display.html:22 #, fuzzy msgid "Report abuse" msgstr "Adroddiadau" @@ -2517,26 +2677,27 @@ msgstr "Adroddiadau" msgid "Report empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: perllib/FixMyStreet/App/Controller/Rss.pm:281 +#: perllib/FixMyStreet/App/Controller/Rss.pm:277 #, fuzzy msgid "Report on %s" msgstr "Adroddiadau" -#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 +#: templates/web/default/index.html:15 +#: templates/web/fixmystreet/around/postcode_form.html:6 msgid "Report and view empty properties" msgstr "Adrodd am eiddo gwag a gweld y rhain" -#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 +#: templates/web/default/my/my.html:74 #, fuzzy msgid "Reported %s" msgstr "Adroddiadau" -#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 +#: templates/web/default/my/my.html:72 #, fuzzy msgid "Reported %s, to %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2548,33 +2709,33 @@ msgstr "Adroddwyd yn ddi-enw am %s" msgid "Reported before" msgstr "Wedi adrodd o'r blaen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s anonymously at %s" msgstr "Adroddwyd gan %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:527 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported by %s by %s at %s" msgstr "Adroddwyd gan %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:492 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported by %s in the %s category by %s at %s" msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s gan %s am %s" @@ -2582,14 +2743,14 @@ msgstr "Adroddwyd yn y categori %s gan %s am %s" #: 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_form.html:1 -#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/around/around_index.html:2 #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting an empty property" msgstr "Adrodd am eiddo gwag" -#: templates/web/default/around/display_location.html:93 +#: templates/web/default/around/display_location.html:95 msgid "Reports on and around the map" msgstr "Adroddiadau ar ac yng nghyffiniau'r map" @@ -2598,13 +2759,13 @@ msgstr "Adroddiadau ar ac yng nghyffiniau'r map" msgid "Resend report" msgstr "Cuddio hen adroddiadau " -#: perllib/FixMyStreet/Geocode/OSM.pm:107 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:104 +#: perllib/FixMyStreet/Geocode/OSM.pm:163 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" @@ -2612,7 +2773,7 @@ msgstr "" msgid "Save changes" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 #, fuzzy msgid "Search Abuse" msgstr "Adroddiadau cryno" @@ -2621,14 +2782,14 @@ msgstr "Adroddiadau cryno" msgid "Search Abuse Table" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 #, fuzzy msgid "Search Reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 #, fuzzy msgid "Search Users" @@ -2640,7 +2801,7 @@ msgstr "Adroddiadau cryno" msgid "Search:" msgstr "" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 #, fuzzy msgid "" @@ -2651,7 +2812,7 @@ msgstr "" "porthiant RSS,\n" "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 msgid "Sent to %s %s later" msgstr "Anfonwyd at %s %s yn ddiweddarach" @@ -2704,11 +2865,14 @@ msgstr "" "cat=20'>Gwybodaeth\n" "bellach am ein gwaith ar gartrefi gwag</a>.\n" -#: templates/web/default/report/display.html:213 +#: templates/web/bromley/report/display.html:203 +#: templates/web/bromley/report/new/fill_in_details_form.html:129 +#: templates/web/bromley/report/new/fill_in_details_form.html:175 +#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:189 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 msgid "Show my name publicly" msgstr "" @@ -2722,13 +2886,14 @@ msgstr "" msgid "Show pins" msgstr "Dangos pinnau" -#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmybarangay/header.html.orig:46 #: templates/web/fixmystreet/auth/general.html:3 #: templates/web/fixmystreet/auth/general.html:38 #: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:50 +#: templates/web/fixmystreet/header.html:51 +#: templates/web/zurich/header.html:51 msgid "Sign in" msgstr "" @@ -2741,12 +2906,12 @@ msgstr "" msgid "Sign in or create an account" msgstr "" +#: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2766,8 +2931,7 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/default/alert/index.html:30 -#: templates/web/fixmystreet/alert/index.html:33 +#: templates/web/default/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Rhai ffotograffau o adroddiadau diweddar" @@ -2780,7 +2944,7 @@ msgstr "" msgid "Some unconfirmeds" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:428 +#: perllib/FixMyStreet/Cobrand/UK.pm:97 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2789,14 +2953,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your empty property." msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 -#: perllib/FixMyStreet/Geocode/Google.pm:68 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 +#: perllib/FixMyStreet/Geocode/Google.pm:69 msgid "Sorry, we could not find that location." msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw." #: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:60 +#: perllib/FixMyStreet/Geocode/Google.pm:64 +#: perllib/FixMyStreet/Geocode/OSM.pm:59 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." @@ -2820,22 +2985,23 @@ msgstr "Diweddariad:" msgid "Start month:" msgstr "" +#: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:77 +#: templates/web/fixmystreet/report/display.html:72 #, fuzzy msgid "State" msgstr "Diweddariad:" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:82 +#: templates/web/default/report/display.html:77 #, fuzzy msgid "State:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:986 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 #: templates/web/default/admin/stats.html:1 #, fuzzy msgid "Stats" @@ -2846,6 +3012,7 @@ msgstr "Diweddariad:" msgid "Still open, via questionnaire, %s" msgstr "Anfon yr holiadur" +#: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 #, fuzzy @@ -2858,17 +3025,20 @@ msgstr "Pwnc:" msgid "Subject:" msgstr "Pwnc:" +#: templates/web/bromley/report/new/fill_in_details_form.html:140 +#: templates/web/bromley/report/new/fill_in_details_form.html:190 +#: templates/web/bromley/report/new/fill_in_details_form.html:204 #: templates/web/default/questionnaire/creator_fixed.html:19 #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 msgid "Submit" msgstr "Anfon" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:56 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 #, fuzzy @@ -2880,19 +3050,20 @@ msgstr "Anfon" msgid "Submit questionnaire" msgstr "Anfon yr holiadur" +#: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:43 +#: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:42 +#: templates/web/fixmystreet/report/display.html:37 msgid "Subscribe" msgstr "Tanysgrifio" -#: templates/web/default/alert/list.html:126 -#: templates/web/fixmystreet/alert/_list.html:88 +#: templates/web/default/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 #: templates/web/default/admin/index.html:1 #, fuzzy msgid "Summary" @@ -2905,7 +3076,7 @@ msgstr "Adroddiadau cryno" msgid "Summary reports" msgstr "Adroddiadau cryno" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -2914,7 +3085,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:18 msgid "Text only version" msgstr "" @@ -2982,8 +3153,17 @@ msgstr "" "helpu i \n" "ddatrys argyfwng tai gwag y DU." -#: templates/web/default/around/around_index.html:43 -#: templates/web/fixmystreet/around/around_index.html:46 +#: templates/web/fixmystreet/around/around_index.html:27 +#, fuzzy +msgid "" +"Thanks for uploading your photo. We now need to locate your empty property, " +"so please enter a nearby street name or postcode in the box above :" +msgstr "" +"Diolch am lwytho'ch ffotograff i fyny. Nawr mae angen i ni ddod o hyd i " +"leoliad eich eiddo gwag, felly rhowch enw stryd gerllaw neu god post yn y " +"blwch isod :" + +#: templates/web/default/around/around_index.html:28 msgid "" "Thanks for uploading your photo. We now need to locate your empty property, " "so please enter a nearby street name or postcode in the box below :" @@ -3005,34 +3185,35 @@ 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:856 +#: perllib/FixMyStreet/App/Controller/Photo.pm:190 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), " "rhowch gynnig arni eto." -#: templates/web/default/alert/index.html:12 -#: templates/web/fixmystreet/alert/index.html:12 +#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#, fuzzy msgid "" -"That location does not appear to be covered by a council, perhaps it is " -"offshore - please try somewhere more specific." +"That location does not appear to be covered by a council; perhaps it is " +"offshore or outside the country. Please try again." 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/App/Controller/Location.pm:107 -msgid "That location does not appear to be in Britain; please try again." +#, fuzzy +msgid "That location does not appear to be in the UK; please try again." msgstr "" "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall " "arni." -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:90 msgid "That postcode was not recognised, sorry." msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori." -#: perllib/FixMyStreet/App/Controller/Admin.pm:560 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 #, fuzzy msgid "That empty property will now be resent." msgstr "ni fydd eich eiddo gwag yn cael ei bostio" @@ -3041,18 +3222,6 @@ msgstr "ni fydd eich eiddo gwag yn cael ei bostio" msgid "That report has been removed from reportemptyhomes.com." msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com" -#: templates/web/default/around/around_index.html:26 -#: templates/web/fixmystreet/around/around_index.html:29 -#, fuzzy -msgid "" -"That spot does not appear to be covered by a council. If you have tried to " -"report an issue past the shoreline, for example, please specify the closest " -"point on land." -msgstr "" -"Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw.\n" -"Os ydych wedi ceisio adrodd am broblem oddi ar y lân, er enghraifft,\n" -"dylech nodi'r pwynt agosaf ar y tir." - #: templates/web/emptyhomes/static/about.html:7 #, fuzzy msgid "The Empty Homes Agency" @@ -3097,7 +3266,6 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 -#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -3126,8 +3294,9 @@ msgid "" "this page." msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon." +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 #: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 #, fuzzy msgid "The error was: %s" msgstr "Testun y gwall oedd:" @@ -3139,7 +3308,7 @@ msgid "" "requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/OSM.pm:99 +#: perllib/FixMyStreet/Geocode/OSM.pm:158 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the empty property is close to several roads or close to a " @@ -3217,8 +3386,6 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "" @@ -3227,32 +3394,23 @@ msgstr "" msgid "The requested URL '%s' was not found on this server" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 -#: perllib/FixMyStreet/App/Controller/Admin.pm:540 -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 -msgid "The requested URL was not found on this server." -msgstr "" - -#: templates/web/default/alert/list.html:45 +#: templates/web/default/alert/_list.html:14 #: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:" -#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/barnet/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_extra_text.html:1 #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 -#: templates/web/fixmystreet/report/new/councils_text_all.html:18 -#: templates/web/fixmystreet/report/new/councils_text_some.html:10 -#: templates/web/fixmystreet/report/new/councils_text_some.html:11 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the empty property will be public, plus your name " "if you give us permission." msgstr "" -#: bin/send-reports:79 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 msgid "" "The user could not locate the empty property on a map, but to see the area " "around the location they entered" @@ -3260,14 +3418,19 @@ 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:70 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "" "There was an empty property showing the All Reports page. Please try again " "later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#, fuzzy +msgid "There was an empty property showing this page. Please try again later." +msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3276,13 +3439,13 @@ msgid "" "sign in by email’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:351 +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "" "There was an empty property with your email/password combination. Please try " "again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 #, fuzzy msgid "There was an empty property with your update. Please try again." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3291,7 +3454,7 @@ msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" 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:242 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 msgid "There were problems with your update. Please see below." msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod" @@ -3301,7 +3464,7 @@ msgid "" "change without warnings in the future." msgstr "" -#: bin/send-reports:186 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid "" "This email has been sent to both councils covering the location of the empty " "property, as the user did not categorise it; please ignore it if you're not " @@ -3309,14 +3472,15 @@ msgid "" "empty property this is so we can add it to our system." msgstr "" -#: bin/send-reports:189 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to several councils covering the location of the " "empty property, as the category selected is provided for all of them; please " "ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 +#: perllib/FixMyStreet/Cobrand/UK.pm:62 msgid "This information is required" msgstr "" @@ -3346,48 +3510,50 @@ 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:874 +#: templates/web/default/report/banner.html:15 #, fuzzy msgid "This empty property has been closed" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:870 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:100 -#: templates/web/fixmystreet/report/display.html:95 +#: templates/web/bromley/report/display.html:96 +#: templates/web/default/report/banner.html:12 +#: templates/web/default/report/display.html:95 +#: templates/web/emptyhomes/report/display.html:12 +#: templates/web/fixmystreet/report/display.html:90 msgid "This empty property has been returned to use" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: templates/web/default/report/display.html:95 -#: templates/web/fixmystreet/report/display.html:89 +#: templates/web/bromley/report/display.html:90 +#: templates/web/default/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:84 #, 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:879 +#: templates/web/default/report/banner.html:19 #, fuzzy msgid "This empty property is in progress" msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/Cobrand/Default.pm:866 +#: templates/web/default/report/banner.html:9 msgid "This empty property is old and of unknown status." msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 #, fuzzy msgid "This report is currently marked as closed." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 #, fuzzy msgid "This report is currently marked as returned to use." msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 msgid "This report is currently marked as open." msgstr "" -#: bin/send-reports:72 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 msgid "" "This web page also contains a photo of the empty property, provided by the " "user." @@ -3395,7 +3561,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:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3423,28 +3589,17 @@ msgstr "" "Er mwyn rhoi gwybod am eiddo gwag\n" " <strong>cliciwch ar y map</strong> wrth y lleoliad cywir." -#: templates/web/fixmystreet/alert/index.html:19 +#: templates/web/default/alert/index.html:27 #, fuzzy msgid "" "To find out what local alerts we have in your area, council or ward, please " -"enter your GB\n" -" postcode or street name and area" -msgstr "" -"I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu " -"ward chi,\n" -"cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" - -#: templates/web/default/alert/index.html:21 -msgid "" -"To find out what local alerts we have in your area, council or ward, please " -"enter your GB\n" -"postcode or street name and area:" +"enter your postcode or street name and area" msgstr "" "I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu " "ward chi,\n" "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" -#: bin/send-reports:78 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 msgid "To view a map of the precise location of this issue" msgstr "Gweld map o union leoliad y broblem hon" @@ -3465,7 +3620,7 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +#: templates/web/fixmystreet/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3478,7 +3633,8 @@ msgstr "ID eiddo gwag anhysbys" msgid "Unknown empty property ID" msgstr "ID eiddo gwag anhysbys" -#: templates/web/fixmystreet/report/display.html:70 +#: templates/web/bromley/report/display.html:66 +#: templates/web/fixmystreet/report/display.html:65 #, fuzzy msgid "Update" msgstr "Diweddariad:" @@ -3526,18 +3682,18 @@ msgstr "" msgid "Update reopened empty property" msgstr "Sut i roi gwybod am eiddo gwag" -#: templates/web/default/admin/council_contacts.html:58 +#: templates/web/default/admin/council_contacts.html:62 #, fuzzy msgid "Update statuses" msgstr "Diweddariadau" -#: templates/web/default/report/display.html:76 +#: templates/web/default/report/display.html:71 msgid "Update:" msgstr "Diweddariad:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:766 -#: perllib/FixMyStreet/App/Controller/Admin.pm:846 +#: perllib/FixMyStreet/App/Controller/Admin.pm:694 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 #, fuzzy msgid "Updated!" msgstr "Diweddariadau" @@ -3552,18 +3708,20 @@ msgstr "Diweddariadau" msgid "Updates on {{title}}" msgstr "Diweddariadau am {{title}}" +#: templates/web/bromley/report/display.html:0 +#: templates/web/bromley/report/display.html:8 #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 #: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:8 msgid "Updates to this empty property, reportemptyhomes.com" msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 msgid "User flagged" msgstr "" @@ -3571,8 +3729,8 @@ msgstr "" msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:306 -#: perllib/FixMyStreet/App/Controller/Admin.pm:336 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: perllib/FixMyStreet/App/Controller/Admin.pm:339 #, fuzzy msgid "Values updated" msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" @@ -3583,6 +3741,11 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost" msgid "View report on site" msgstr "Adroddiadau" +#: templates/web/default/reports/council.html:18 +#, fuzzy +msgid "View reports by ward" +msgstr "Adroddiadau" + #: templates/web/emptyhomes/tokens/confirm_problem.html:39 msgid "View your report" msgstr "Gweld eich adroddiad" @@ -3596,30 +3759,21 @@ msgstr "Gweld eich adroddiad" msgid "Viewing a location" msgstr "Gweld lleoliad" +#: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 -#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing an empty property" msgstr "Gweld eiddo gwag" -#: templates/web/default/reports/council.html:23 -#: templates/web/default/reports/council.html:74 -#: templates/web/default/reports/council.html:86 +#: templates/web/default/reports/council.html:20 #: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:432 -#: perllib/FixMyStreet/Geocode/Bing.pm:48 -#: perllib/FixMyStreet/Geocode/Google.pm:63 -msgid "We do not currently cover Northern Ireland, I'm afraid." -msgstr "" - #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:32 -#: templates/web/fixmystreet/alert/choose.html:6 -#: templates/web/fixmystreet/around/around_index.html:35 +#: templates/web/default/around/around_index.html:17 +#: templates/web/fixmystreet/around/around_index.html:16 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." @@ -3629,7 +3783,6 @@ msgstr "" "lleoliad chi yno." #: templates/web/default/auth/token.html:19 -#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" @@ -3640,26 +3793,29 @@ msgid "" "property you reported." msgstr "" -#: templates/web/fixmystreet/report/display.html:158 +#: templates/web/bromley/report/display.html:141 +#: templates/web/fixmystreet/report/display.html:153 #, fuzzy msgid "We never show your email" msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 +#: templates/web/bromley/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 #, fuzzy 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)" -#: bin/send-reports:196 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 msgid "" "We realise this empty property might be the responsibility of %s; however, " "we don't currently have any contact details for them. If you know of an " "appropriate contact address, please do get in touch." msgstr "" -#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 -#: templates/web/fixmystreet/index.html:56 +#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:45 msgid "" "The details will be sent directly to the right person in the local council " "for them to take action" @@ -3667,13 +3823,19 @@ msgstr "" "Caiff y manylion eu hanfon yn uniongyrchol at yr unigolyn cywir yn y cyngor " "lleol er mwyn iddynt weithredu" +#: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 -#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" msgstr "" +#: templates/web/fixmystreet/report/new/notes.html:4 +msgid "" +"We will only use your personal information in accordance with our <a href=\"/" +"privacy\">privacy policy.</a>" +msgstr "" + #: templates/web/emptyhomes/contact/blurb.html:2 #, fuzzy msgid "" @@ -3694,7 +3856,7 @@ msgstr "" "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu " "anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:41 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "" @@ -3704,7 +3866,7 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Whole block of empty flats" msgstr "Bloc cyfan o fflatiau gwag" @@ -3715,13 +3877,14 @@ msgid "" "term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "" -#: templates/web/fixmystreet/footer.html:23 +#: templates/web/fixmystreet/footer.html:22 msgid "" -"Would you like better integration with reportemptyhomes.com? <a href=\"/for-" -"councils\">Find out about reportemptyhomes.com for councils</a>." +"Would you like better integration with reportemptyhomes.com? <a href=" +"\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about " +"reportemptyhomes.com for councils</a>." msgstr "" -#: templates/web/fixmystreet/footer.html:19 +#: templates/web/fixmystreet/footer.html:18 msgid "" "Would you like to contribute to reportemptyhomes.com? Our code is open " "source and <a href=\"http://github.com/mysociety/fixmystreet\">available on " @@ -3746,15 +3909,15 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -3765,8 +3928,10 @@ msgstr "" msgid "Yes" msgstr "Ydw" -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/bromley/report/display.html:155 +#: templates/web/bromley/report/new/fill_in_details_form.html:198 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 #, fuzzy msgid "Yes I have a password" msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -3805,10 +3970,6 @@ msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:14 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local empty " "properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3824,6 +3985,7 @@ msgstr "" "href='%s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</" "a>.\n" +#: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 @@ -3833,18 +3995,19 @@ msgid "" "replace it." msgstr "" -#: templates/web/default/report/display.html:111 -#: templates/web/fixmystreet/report/display.html:105 +#: templates/web/bromley/report/display.html:106 +#: templates/web/default/report/display.html:106 +#: templates/web/fixmystreet/report/display.html:100 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 -#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" +#: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 #, fuzzy @@ -3860,8 +4023,8 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus." -#: templates/web/default/tokens/confirm_problem.html:6 -#: templates/web/default/tokens/confirm_problem.html:7 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your empty property" msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus" @@ -3883,8 +4046,8 @@ msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." msgid "You have successfully deleted your alert." msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 #, fuzzy msgid "" "You have successfully signed in; please check and confirm your details are " @@ -3909,19 +4072,23 @@ msgstr "" msgid "Your Reports" msgstr "Adroddiadau" -#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/bromley/report/display.html:41 +#: templates/web/bromley/report/display.html:43 +#: templates/web/bromley/report/new/fill_in_details_form.html:145 +#: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:39 -#: templates/web/fixmystreet/report/display.html:41 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/display.html:34 +#: templates/web/fixmystreet/report/display.html:36 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 #, fuzzy msgid "Your email" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:129 +#: templates/web/fixmystreet/report/display.html:124 #, fuzzy msgid "Your email address" msgstr "Eich cyfeiriad e-bost:" @@ -3931,51 +4098,75 @@ msgstr "Eich cyfeiriad e-bost:" msgid "Your email address:" msgstr "Eich cyfeiriad e-bost:" -#: templates/web/default/alert/list.html:120 -#: templates/web/default/report/display.html:133 +#: templates/web/default/alert/_list.html:92 +#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Eich cyfeiriad e-bost:" +#: templates/web/bromley/report/display.html:193 +#: templates/web/bromley/report/new/fill_in_details_form.html:117 +#: templates/web/bromley/report/new/fill_in_details_form.html:164 +#, fuzzy +msgid "Your first name" +msgstr "Eich enw:" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5 +msgid "" +"Your information will only be used in accordance with our <a href=\"/privacy" +"\">privacy policy</a>" +msgstr "" + +#: templates/web/bromley/report/display.html:199 +#: templates/web/bromley/report/new/fill_in_details_form.html:123 +#: templates/web/bromley/report/new/fill_in_details_form.html:170 +#, fuzzy +msgid "Your last name" +msgstr "Eich enw:" + #: templates/web/fixmystreet/auth/general.html:53 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 #, fuzzy msgid "Your name" msgstr "Eich enw:" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:207 +#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Eich enw:" +#: templates/web/bromley/report/display.html:160 +#: templates/web/bromley/report/new/fill_in_details_form.html:203 #: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:143 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 #, fuzzy msgid "Your password" msgstr "Adroddiadau" #: templates/web/default/auth/change_password.html:6 -#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 +#: templates/web/bromley/report/new/fill_in_details_form.html:184 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Your phone number" msgstr "" -#: templates/web/fixmystreet/questionnaire/index.html:16 +#: templates/web/fixmystreet/questionnaire/index.html:15 #, fuzzy msgid "Your report" msgstr "Adroddiadau" -#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 +#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9 #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 @@ -3997,8 +4188,8 @@ msgstr "Eich cyfeiriad e-bost:" msgid "by %s" msgstr "" -#: templates/web/default/reports/council.html:6 -#: templates/web/default/reports/council.html:7 +#: templates/web/default/reports/council.html:12 +#: templates/web/default/reports/council.html:13 #: templates/web/emptyhomes/reports/council.html:6 #: templates/web/emptyhomes/reports/council.html:7 msgid "council" @@ -4008,8 +4199,8 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" -#: templates/web/fixmystreet/alert/index.html:24 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:17 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4017,26 +4208,26 @@ msgstr "" msgid "from %d different users" msgstr "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:289 msgid "less than a minute" msgstr "llai na munud" -#: templates/web/default/report/updates.html:24 +#: templates/web/default/report/updates.html:27 msgid "marked as %s" msgstr "" -#: templates/web/default/report/updates.html:22 +#: templates/web/default/report/updates.html:25 msgid "marked as returned to use" msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:112 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/default/alert/list.html:114 -#: templates/web/fixmystreet/alert/_list.html:81 +#: templates/web/default/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "neu" @@ -4048,15 +4239,20 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/updates.html:26 msgid "reopened" msgstr "wedi'i ailagor" -#: templates/web/bromley/header.html:47 -#: templates/web/fixmystreet/header.html:47 +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 +#: templates/web/bromley/header.html:65 +#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmystreet/header.html:48 +#: templates/web/zurich/header.html:48 msgid "sign out" msgstr "" +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:7 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 @@ -4065,17 +4261,21 @@ msgstr "" msgid "the local council" msgstr "Ni roddwyd gwybod i'r cyngor am hyn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 msgid "the map was not used so pin location may be inaccurate" msgstr "" "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir" -#: bin/send-reports:177 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +msgid "their ref: %s" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 #, fuzzy msgid "this type of local empty property" msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost" -#: perllib/Utils.pm:222 +#: perllib/Utils.pm:263 msgid "today" msgstr "heddiw" @@ -4093,7 +4293,7 @@ msgid "user is empty property owner" msgstr "Adroddiadau hŷn o eiddo gwag" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:3 +#: templates/web/default/reports/council.html:9 #: templates/web/emptyhomes/reports/council.html:0 #: templates/web/emptyhomes/reports/council.html:3 msgid "ward" @@ -4132,13 +4332,6 @@ 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/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" -msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" - #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -4147,6 +4340,13 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> adroddiad yn ddiweddar" +msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar" + #: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" @@ -4161,14 +4361,7 @@ 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:29 -#, 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/fixmystreet/report/new/councils_text_some.html:14 +#: templates/web/default/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -4179,6 +4372,41 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" +#: templates/web/default/front/stats.html:29 +#, 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 "reportemptyhomes.com for Councils" +#~ msgstr "Adroddiadau newydd ar reportemptyhomes.com" + +#, fuzzy +#~ msgid "Questions and Answers :: reportemptyhomes.com for Councils" +#~ msgstr "Adroddiadau newydd ar reportemptyhomes.com" + +#, fuzzy +#~ msgid "" +#~ "That spot does not appear to be covered by a council. If you have tried " +#~ "to report an issue past the shoreline, for example, please specify the " +#~ "closest point on land." +#~ msgstr "" +#~ "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw.\n" +#~ "Os ydych wedi ceisio adrodd am broblem oddi ar y lân, er enghraifft,\n" +#~ "dylech nodi'r pwynt agosaf ar y tir." + +#, fuzzy +#~ msgid "" +#~ "To find out what local alerts we have in your area, council or ward, " +#~ "please enter your GB\n" +#~ " postcode or street name and area" +#~ msgstr "" +#~ "I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu " +#~ "ward chi,\n" +#~ "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:" + #, fuzzy #~ msgid "<strong>Yes</strong>, I have a password" #~ msgstr "Adrodd am eiddo gwag a gweld y rhain" @@ -4381,9 +4609,6 @@ msgstr[1] "" #~ "hynny,\n" #~ "ond os nad ydyw, gallwn gynnig cyngor ar yr beth y gallwch ei wneud nesaf." -#~ msgid "Please note that updates are not sent to the council." -#~ msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor." - #~ msgid "" #~ "The closest address, as the crow flies, to the location of this empty " #~ "property, %.0fm away, is: %s - please note that this is automatically " diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index c2971e964..58b307d58 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,26 +9,29 @@ msgid "" msgstr "" "Project-Id-Version: FixMyStreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-03-28 19:23+0100\n" +"POT-Creation-Date: 2012-08-21 09:54+0100\n" "PO-Revision-Date: 2012-08-07 01:09+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.4\n" -#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid " and " msgstr " og " -#: templates/web/default/tokens/confirm_problem.html:10 -#: templates/web/default/tokens/confirm_problem.html:6 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:18 msgid " and <strong>we will now send it to the council</strong>" msgstr " og <strong>vi sender det nå til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:17 #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_none.html:14 #: templates/web/default/report/new/councils_text_none.html:17 @@ -36,13 +39,6 @@ msgstr " og <strong>vi sender det nå til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 #: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:15 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:23 -#: templates/web/fixmystreet/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " @@ -58,11 +54,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:252 +#: perllib/Utils.pm:293 msgid "%d day" msgstr "%d dag" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:293 msgid "%d days" msgstr "%d dager" @@ -70,11 +66,11 @@ msgstr "%d dager" msgid "%d edits by %s" msgstr "%d redigeringer av %s" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 msgid "%d hour" msgstr "%d time" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 msgid "%d hours" msgstr "%d timer" @@ -82,11 +78,11 @@ msgstr "%d timer" msgid "%d live updates" msgstr "%d aktive oppdateringer" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 msgid "%d minute" msgstr "%d minutt" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 msgid "%d minutes" msgstr "%d minutter" @@ -94,36 +90,38 @@ msgstr "%d minutter" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørreskjema sendt – %d besvart (%s%%)" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 msgid "%d week" msgstr "%d uke" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 msgid "%d weeks" msgstr "%d uker" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:14 +#: templates/web/default/reports/council.html:26 #: templates/web/emptyhomes/reports/council.html:11 #: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:792 -#: perllib/FixMyStreet/Cobrand/Default.pm:806 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +msgid "%s ref: %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:480 +#: perllib/FixMyStreet/DB/Result/Problem.pm:488 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:823 -#: perllib/FixMyStreet/Cobrand/Default.pm:837 +#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" @@ -139,31 +137,36 @@ msgstr "(Ingen grunn til bekymring — %s)" msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" -#: templates/web/default/alert/list.html:51 +#: templates/web/default/alert/_list.html:20 #: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(en standardavstand som dekker en befolkning på omtrent 200 000)" -#: templates/web/default/alert/list.html:56 +#: templates/web/default/alert/_list.html:25 #: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor" +#: templates/web/default/around/around_map_list_items.html:12 +#: templates/web/default/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:23 +#, fuzzy +msgid "(closed)" +msgstr "Lukket" + #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/default/reports/council.html:134 -#: templates/web/fixmystreet/around/around_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:21 msgid "(fixed)" msgstr "(løst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/index.html:30 +#: templates/web/fixmystreet/around/postcode_form.html:7 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" -#: templates/web/default/reports/council.html:131 -#: templates/web/default/reports/council.html:152 +#: templates/web/default/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:17 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -172,8 +175,8 @@ msgid "(optional)" msgstr "(valgfritt)" # Denne teksten er lite forklarende -#: templates/web/default/reports/council.html:130 -#: templates/web/default/reports/council.html:150 +#: templates/web/default/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:16 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -181,32 +184,33 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" -#: templates/web/default/report/display.html:214 +#: templates/web/default/report/display.html:209 msgid "(we never show your email)" msgstr "(vi viser aldri din e-postadresse)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/DB/Result/Problem.pm:337 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" # Bør "portalen" byttes ut med et annet ord? (trenger kontekst) #: templates/web/default/tokens/confirm_problem.html:14 -#: templates/web/default/tokens/confirm_problem.html:6 -msgid ". You can <a href=\"%s\">view the problem on this site</a>." +#: templates/web/default/tokens/confirm_problem.html:22 +#, fuzzy +msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lese om problemet på portalen </a>." -#: templates/web/default/questionnaire/completed.html:25 +#: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " "questionnaire; glad to hear it’s been fixed.</p>" @@ -214,15 +218,51 @@ msgstr "" "<p style=\"font-size:150%\">Tusen takk for at du fylte ut vårt spørreskjema. " "Vi er glad for å høre at ditt problem er blitt fikset.</p>" -#: templates/web/default/questionnaire/completed.html:15 +#: templates/web/fiksgatami/questionnaire/completed-open.html:1 +#, fuzzy 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" -"or, if it’s a problem that could be fixed by local people working " -"together,\n" -"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a " -"pledge</a>?\n" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/" +"\">writing\n" +"direct to your councillor(s)</a> or, if it’s a problem that could be\n" +"fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: " +"hva med å forsøke\n" +"<a href=\"%s\">å skrive direkte til dine representanter</a>, eller hvis det " +"er et problem som kan fikses\n" +"av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." +"pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" + +#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " +"direct\n" +"to your councillor(s)</a> or, if it’s a problem that could be fixed " +"by\n" +"local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: " +"hva med å forsøke\n" +"<a href=\"%s\">å skrive direkte til dine representanter</a>, eller hvis det " +"er et problem som kan fikses\n" +"av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www." +"pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>" + +#: templates/web/default/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try writing to your local representative or, if " +"it’s\n" +"a problem that could be fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" msgstr "" "<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: " @@ -294,11 +334,11 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong> La meg bekrefte min rapport med e-post" -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:148 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post" @@ -314,17 +354,17 @@ msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" -#: templates/web/default/report/display.html:169 +#: templates/web/default/report/display.html:164 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:147 +#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 #: templates/web/fixmystreet/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:136 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong> Jeg har et passord" @@ -336,7 +376,7 @@ msgstr "<strong>Ja</strong> Jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:66 msgid "Add new category" msgstr "Legg til ny kategori" @@ -345,7 +385,6 @@ msgid "Added %s" msgstr "La til %s" #: templates/web/default/auth/change_password.html:29 -#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "Gjenta:" @@ -357,8 +396,9 @@ 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:219 -#: templates/web/fixmystreet/report/display.html:193 +#: templates/web/bromley/report/display.html:207 +#: templates/web/default/report/display.html:214 +#: templates/web/fixmystreet/report/display.html:189 msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" @@ -374,7 +414,8 @@ msgstr "Alle rapporter" msgid "All confirmed" msgstr "Alle bekreftet" -#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 +#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 #: templates/web/fixmystreet/footer.html:49 @@ -383,14 +424,20 @@ msgid "All reports" msgstr "Alle rapporter" #: templates/web/default/report/new/councils_text_some.html:2 -#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil bli sendt til" +#: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:12 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>%s</strong> or " +"<strong>Roads Service</strong>." +msgstr "" +"All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>." + #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_all.html:5 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -400,12 +447,12 @@ msgstr "" "en relevant lokal etat som <strong>TfL</strong>, via systemet London Report-" "It." -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:6 +#: templates/web/default/report/new/councils_text_all.html:17 +#: templates/web/default/report/new/councils_text_all.html:19 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:12 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" @@ -449,11 +496,11 @@ msgstr "" "Er du en <strong>utvikler</strong>? Kunne du tenke deg å bidra til " "FiksGataMi?" -#: templates/web/fixmystreet/footer.html:18 +#: templates/web/fixmystreet/footer.html:17 msgid "Are you a developer?" msgstr "Er du en utvikler?" -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/footer.html:21 msgid "Are you from a council?" msgstr "Der du fra den lokale administrasjonen?" @@ -488,14 +535,17 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:75 -#: templates/web/fixmystreet/around/display_location.html:77 +#: templates/web/fixmystreet/around/display_location.html:80 +#: templates/web/fixmystreet/around/display_location.html:82 msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette " "steget</a>." -#: templates/web/default/admin/council_contacts.html:31 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: templates/web/bromley/report/new/fill_in_details_form.html:68 +#: templates/web/default/admin/council_contacts.html:35 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 @@ -507,43 +557,43 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:72 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:181 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 msgid "Category: %s" msgstr "Kategori: %s" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 -#: templates/web/fixmystreet/auth/change_password.html:1 -#: templates/web/fixmystreet/auth/change_password.html:3 -#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "Bytt passord" #: templates/web/fixmystreet/around/display_location.html:72 +#: templates/web/fixmystreet/around/display_location.html:73 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:641 +#: perllib/FixMyStreet/DB/Result/Problem.pm:690 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -555,8 +605,8 @@ msgstr "Fiksede rapporter" msgid "Closed:" msgstr "Lukket:" -#: templates/web/default/around/display_location.html:101 #: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:105 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" @@ -580,28 +630,27 @@ msgstr "Merkevaresamarbeidsdata:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:358 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:361 +#: perllib/FixMyStreet/App/Controller/Admin.pm:372 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" -#: templates/web/default/admin/council_contacts.html:124 +#: templates/web/default/admin/council_contacts.html:153 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:101 +#: templates/web/default/admin/council_contacts.html:105 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:42 msgid "Confirm" msgstr "Bekreft" #: templates/web/default/auth/token.html:1 -#: templates/web/fixmystreet/auth/token.html:1 msgid "Confirm account" msgstr "Bekreft konto" @@ -615,8 +664,8 @@ msgstr "Bekreft konto" msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/default/admin/council_contacts.html:33 -#: templates/web/default/admin/council_contacts.html:78 +#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:82 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -637,6 +686,7 @@ msgstr "Kontakt" msgid "Contact FixMyStreet" msgstr "Kontakt FiksGataMi" +#: templates/web/bromley/contact/submit.html:1 #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 @@ -645,14 +695,15 @@ msgstr "Kontakt FiksGataMi" msgid "Contact Us" msgstr "Kontakt oss" +#: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -663,7 +714,7 @@ msgstr "Kunne ikke finne bruker" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontakter" @@ -691,7 +742,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/default/admin/council_contacts.html:92 +#: templates/web/default/admin/council_contacts.html:96 msgid "Create category" msgstr "Lag kategori" @@ -714,13 +765,19 @@ msgstr "Gjeldende tilstand" msgid "Currently has 1+ deleted" msgstr "For tiden har 1+ slettet" -#: templates/web/default/admin/council_contacts.html:34 -#: templates/web/default/admin/council_contacts.html:81 +#: templates/web/default/dashboard/index.html:5 +#: templates/web/default/dashboard/index.html:7 +msgid "Dashboard" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "Slettet" +#: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 msgid "Details" msgstr "Detaljer" @@ -736,8 +793,8 @@ msgstr "Arbeidshester" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 +#: templates/web/fixmystreet/report/display.html:128 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 msgid "Do you have a FixMyStreet password?" msgstr "Har du et FiksGataMi-passord?" @@ -768,7 +825,8 @@ msgstr "Redigerer bruker %d" msgid "Editor" msgstr "Oppdatert av" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -777,45 +835,45 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:125 +#: templates/web/fixmystreet/report/display.html:120 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" -#: templates/web/default/around/display_location.html:83 +#: templates/web/default/around/display_location.html:85 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problemer" -#: templates/web/default/report/display.html:35 +#: templates/web/default/report/display.html:30 msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:77 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:39 +#: templates/web/default/report/display.html:34 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -823,11 +881,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eiendom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." @@ -843,36 +901,44 @@ msgstr "Slutt-dag:" msgid "End month:" msgstr "Sluttmåned:" -#: 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 #: templates/web/emptyhomes/index.html:40 -#: templates/web/emptyhomes/index.html:43 -#: templates/web/fixmystreet/around/around_index.html:10 -#: templates/web/fixmystreet/around/around_index.html:13 -#: templates/web/fixmystreet/index.html:32 -#: templates/web/fixmystreet/index.html:35 +#: templates/web/emptyhomes/index.html:41 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:32 +#: perllib/FixMyStreet/Cobrand/UK.pm:18 +#, fuzzy +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" +#: templates/web/default/around/postcode_form.html:1 +#: templates/web/default/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +#, fuzzy +msgid "Enter a nearby street name and area" +msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" + #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:176 +#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "Skriv inn et nytt passord:" +#: templates/web/bromley/report/display.html:148 +#: templates/web/bromley/report/new/fill_in_details_form.html:189 #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:165 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 -#: templates/web/fixmystreet/index.html:55 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 +#: templates/web/fixmystreet/index.html:41 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -883,7 +949,6 @@ msgstr "Legg inn detaljer om problemet" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 -#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Feil" @@ -896,6 +961,12 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" +#: templates/web/default/admin/report_edit.html:40 +#, fuzzy +msgid "Extra data:" +msgstr "Merkevaresamarbeidsdata:" + +#: templates/web/bromley/contact/submit.html:14 #: templates/web/default/contact/submit.html:15 msgid "" "Failed to send message. Please try again, or <a href=\"mailto:%s\">email " @@ -904,6 +975,13 @@ msgstr "" "Klarte ikke å sende melding. Vennligst prøv igjen senere eller <a href=" "\"mailto:%s\">send oss en e-post</a>." +#: templates/web/bromley/report/display.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:113 +#: templates/web/bromley/report/new/fill_in_details_form.html:160 +#, fuzzy +msgid "First Name" +msgstr "Første gang" + #: templates/web/default/questionnaire/index.html:79 #: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" @@ -926,12 +1004,7 @@ msgstr "FiksGataMi-administrator:" msgid "FixMyStreet administration" msgstr "Fiksgatami-administrasjon" -#: templates/web/fixmystreet/static/for_councils.html:1 -msgid "FixMyStreet for Councils" -msgstr "FiksGataMi for det offentlige" - -#: templates/web/default/alert/index.html:6 -#: templates/web/fixmystreet/alert/index.html:6 +#: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " "including\n" @@ -944,8 +1017,8 @@ msgstr "" "eller et område med problemer\n" "innen en angitt distanse fra en bestemt posisjon." -#: templates/web/default/alert/list.html:98 -#: templates/web/fixmystreet/alert/_list.html:69 +#: templates/web/default/alert/_list.html:71 +#: templates/web/fixmystreet/alert/_list.html:73 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular " @@ -962,14 +1035,18 @@ msgstr "" "administrasjoner, problemer som gjelder flere administrasjoner blir sendt " "til alle de det gjelder." -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:12 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Fixed" msgstr "Løst" @@ -999,14 +1076,14 @@ msgstr "Flag bruker" msgid "Flagged" msgstr "Flagget:" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "Flagget:" -#: templates/web/default/reports/council.html:24 -#: templates/web/default/reports/council.html:87 +#: templates/web/default/reports/_ward-list.html:3 #: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." @@ -1020,6 +1097,8 @@ msgstr "For administrasjon(ene):" #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 +#: templates/web/fixmystreet/static/privacy.html:1 +#: templates/web/zurich/faq/faq-de.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" @@ -1031,29 +1110,35 @@ msgstr "Mer informasjon om vårt arbeid med tomme hjem" msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" -#: templates/web/fixmystreet/report/display.html:28 +#: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:23 msgid "Get updates" msgstr "Få oppdateringer" -#: templates/web/default/reports/council.html:72 +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +#, fuzzy +msgid "Get updates of %s problems" +msgstr "Få oppdateringer for problemer i denne %s" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Få oppdateringer for problemer i denne %s" -#: templates/web/default/alert/list.html:110 -#: templates/web/fixmystreet/alert/_list.html:78 +#: templates/web/default/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 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:33 templates/web/emptyhomes/index.html:49 -#: templates/web/fixmystreet/alert/index.html:25 -#: templates/web/fixmystreet/around/around_index.html:20 -#: templates/web/fixmystreet/index.html:42 +#: templates/web/default/alert/index.html:34 +#: templates/web/default/around/postcode_form.html:8 +#: templates/web/emptyhomes/index.html:47 +#: templates/web/fixmystreet/around/postcode_form.html:18 msgid "Go" msgstr "Fortsett" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -1081,7 +1166,8 @@ msgstr "" "Har du rapportert et problem til en administrasjon før, eller er dette " "første gangen?" -#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 +#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 @@ -1090,14 +1176,17 @@ msgstr "" msgid "Help" msgstr "Hjelp" -#: templates/web/default/alert/list.html:37 +#: templates/web/default/alert/_list.html:6 #: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" "Her er de forskjellige typene lokale problemvarsler for ‘%s’." -#: templates/web/bromley/header.html:46 -#: templates/web/fixmystreet/header.html:46 +#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 +#: templates/web/bromley/header.html:99 +#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmystreet/header.html:47 +#: templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "Hei, %s" @@ -1121,12 +1210,12 @@ msgstr "Skjul nåler" msgid "History" msgstr "Historie" -#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 -#: templates/web/fixmystreet/index.html:50 +#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 +#: templates/web/fixmystreet/index.html:36 msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:592 +#: perllib/FixMyStreet/App/Controller/Admin.pm:637 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." @@ -1134,7 +1223,7 @@ msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." 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" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:43 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:44 msgid "" "I'm afraid we couldn't validate that token, as the report was made too long " "ago." @@ -1142,7 +1231,7 @@ msgstr "" "Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge " "siden rapporten ble laget." -#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" @@ -1158,8 +1247,6 @@ msgstr "ID" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:10 -#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1181,7 +1268,6 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 -#: templates/web/fixmystreet/auth/token.html:23 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 " @@ -1210,12 +1296,16 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "In Progress" msgstr "Under arbeid" @@ -1231,7 +1321,7 @@ msgstr "" "del av description), interface_used, comment_count, requestor_name (kun " "tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +#: templates/web/fixmystreet/report/banner.html:19 msgid "In progress" msgstr "Under arbeid" @@ -1239,32 +1329,36 @@ msgstr "Under arbeid" msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" -#: perllib/FixMyStreet/App/Controller/Open311.pm:358 +#: perllib/FixMyStreet/App/Controller/Open311.pm:356 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: perllib/FixMyStreet/App/Controller/Open311.pm:343 +#: perllib/FixMyStreet/App/Controller/Open311.pm:341 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:426 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:932 msgid "Invalid start date" msgstr "Ugyldig startdato" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 msgid "Investigating" msgstr "Undersøkes" @@ -1281,16 +1375,25 @@ msgid "" "your concerns about this property to the council is a valuable first step." msgstr "" +#: templates/web/bromley/report/display.html:166 +#: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/bromley/report/display.html:195 +#: templates/web/bromley/report/new/fill_in_details_form.html:119 +#: templates/web/bromley/report/new/fill_in_details_form.html:166 +#, fuzzy +msgid "Last Name" +msgstr "Siste oppdatering:" + +#: templates/web/default/admin/council_contacts.html:39 msgid "Last editor" msgstr "Sist redigert av" @@ -1302,14 +1405,16 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:985 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 msgid "List Flagged" msgstr "List flagget" -#: templates/web/default/admin/council_contacts.html:13 +#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:16 msgid "List all reported problems" msgstr "List alle rapporterte problemer" +#: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." @@ -1326,12 +1431,6 @@ msgstr "Laster..." #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 -#: templates/web/fixmystreet/alert/choose.html:1 -#: templates/web/fixmystreet/alert/choose.html:3 -#: templates/web/fixmystreet/alert/index.html:1 -#: templates/web/fixmystreet/alert/index.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:5 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" @@ -1340,14 +1439,11 @@ msgstr "Lokal RSS-strøm og e-postvarsel" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:12 -#: templates/web/fixmystreet/alert/list.html:14 -#: templates/web/fixmystreet/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 +#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 #: templates/web/fixmystreet/footer.html:51 @@ -1355,12 +1451,12 @@ msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:54 +#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 +#: templates/web/fixmystreet/index.html:40 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: perllib/FixMyStreet/Map/OSM.pm:43 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" "\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/" @@ -1378,7 +1474,7 @@ msgstr "Melding" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" @@ -1386,7 +1482,7 @@ msgstr "Mangler jurisdiction_id" msgid "Month" msgstr "Måned" -#: templates/web/default/report/display.html:31 +#: templates/web/default/report/display.html:26 msgid "More problems nearby" msgstr "Flere problemer i nærheten" @@ -1400,9 +1496,9 @@ msgstr "Flere problemer i nærheten" #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/display.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 msgid "Name" msgstr "Navn" @@ -1418,7 +1514,7 @@ msgstr "Navn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:100 +#: perllib/FixMyStreet/Geocode/OSM.pm:159 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1426,7 +1522,7 @@ msgstr "" "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/Default.pm:480 +#: perllib/FixMyStreet/Cobrand/UK.pm:161 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1434,8 +1530,8 @@ msgstr "" "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:469 -#: perllib/FixMyStreet/Cobrand/Default.pm:520 +#: perllib/FixMyStreet/Cobrand/Default.pm:404 +#: perllib/FixMyStreet/Cobrand/Default.pm:444 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1443,7 +1539,7 @@ msgstr "" "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s\n" @@ -1461,7 +1557,7 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/App/Controller/Admin.pm:314 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1531,15 +1627,15 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1554,7 +1650,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/DB/Result/Problem.pm:328 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1574,13 +1670,13 @@ msgstr "Ingen flaggede brukere ble funnet" msgid "No info at all" msgstr "Helt uten informasjon" -#: templates/web/default/around/around_map_list_items.html:15 -#: templates/web/fixmystreet/around/around_map_list_items.html:24 +#: templates/web/default/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." msgstr "Ingen problemer ble funnet." -#: templates/web/default/around/on_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:21 +#: templates/web/default/around/on_map_list_items.html:14 +#: templates/web/fixmystreet/around/on_map_list_items.html:6 msgid "No problems have been reported yet." msgstr "Ingen problemer er rapportert" @@ -1593,13 +1689,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikke rapportert tidligere" -#: templates/web/default/report/_main.html:9 +#: templates/web/default/report/_main.html:11 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:11 +#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:36 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "Merk" @@ -1614,7 +1710,7 @@ msgstr "" "opprettet, hvilket ikke trenger være den samme måneden som rapporten var " "bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:89 #: templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "Merk:" @@ -1623,7 +1719,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Note: <strong>%d</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 msgid "Now to submit your report…" msgstr "På tide å sende din rapport…" @@ -1631,16 +1727,16 @@ msgstr "På tide å sende din rapport…" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:132 +#: templates/web/fixmystreet/report/display.html:127 msgid "Now to submit your update…" msgstr "På tide å registrere din oppdatering…" -#: templates/web/default/report/display.html:138 +#: templates/web/default/report/display.html:133 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "" "På tide å registrere din oppdatering… har du et FiksGataMi-passord?" -#: templates/web/default/report/display.html:26 +#: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" @@ -1678,10 +1774,12 @@ msgstr "Eldre løste" msgid "Older problems" msgstr "Eldre problemer" +#: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:74 msgid "Open" msgstr "Åpen" @@ -1701,13 +1799,13 @@ msgstr "Open311-initiativets nettside" msgid "Open311 specification" msgstr "Open311-spesifikasjon" -#: templates/web/default/alert/list.html:85 -#: templates/web/fixmystreet/alert/_list.html:56 +#: templates/web/default/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 msgid "Or problems reported to:" msgstr "Eller problemer meldt til:" -#: templates/web/default/alert/list.html:61 -#: templates/web/fixmystreet/alert/_list.html:33 +#: templates/web/default/alert/_list.html:33 +#: templates/web/fixmystreet/alert/_list.html:36 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1715,14 +1813,15 @@ msgstr "" "Eller du kan abonnere på varsel basert på bydel eller administrasjon du " "hører inn under:" -#: bin/send-reports:176 bin/send-reports:185 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/DB/Result/Problem.pm:489 -#: perllib/FixMyStreet/DB/Result/Problem.pm:499 -#: perllib/FixMyStreet/DB/Result/Problem.pm:509 -#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 +#: perllib/FixMyStreet/DB/Result/Problem.pm:497 +#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: perllib/FixMyStreet/DB/Result/Problem.pm:517 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 msgid "Other" msgstr "Annet" @@ -1748,50 +1847,59 @@ msgstr "Fant ikke siden" msgid "Partial" msgstr "Delvis" +#: templates/web/bromley/report/display.html:145 +#: templates/web/bromley/report/new/fill_in_details_form.html:186 #: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:157 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 msgid "Password (optional)" msgstr "Passord (valgfritt)" #: templates/web/default/auth/change_password.html:25 -#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "Passord:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 +#: templates/web/bromley/report/new/fill_in_details_form.html:183 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/bromley/report/display.html:109 +#: templates/web/bromley/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/report/display.html:103 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 msgid "Photo" msgstr "Bilde" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:114 +#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilde:" -#: templates/web/default/alert/list.html:27 -#: templates/web/fixmystreet/alert/list.html:27 +#: templates/web/default/alert/list.html:26 msgid "Photos of recent nearby reports" msgstr "Bilder av nye problemer i nærheten" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 msgid "Planned" msgstr "Planlagt" @@ -1810,13 +1918,10 @@ 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/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" #: templates/web/default/auth/token.html:17 -#: templates/web/fixmystreet/auth/token.html:17 msgid "Please check your email" msgstr "Vennligst sjekk e-posten du oppgav" @@ -1827,18 +1932,25 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 +#: perllib/FixMyStreet/DB/Result/Problem.pm:347 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "Please choose a property type" msgstr "Velg en type egenskap" +#: templates/web/bromley/report/new/fill_in_details_form.html:64 +msgid "" +"Please describe the exact location of the report. Example: “2 dumped " +"mattresses outside Number 19 Stockwell Close”" +msgstr "" + #: templates/web/default/contact/blurb.html:2 msgid "" "Please do <strong>not</strong> report problems through this form; messages " @@ -1861,42 +1973,40 @@ msgstr "" "Ikke vær ufin — å kjefte på din administrasjon skader verdien av " "tjenesten for alle brukerne." -#: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:15 msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/DB/Result/User.pm:96 +#: perllib/FixMyStreet/DB/Result/User.pm:104 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" -#: perllib/FixMyStreet/App/Controller/Alert.pm:342 +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:93 +#: perllib/FixMyStreet/DB/Result/User.pm:101 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 #: templates/web/default/js/validation_strings.html:11 @@ -1906,11 +2016,17 @@ msgstr "Legg inn opplysninger om problemet" msgid "Please enter your email" msgstr "Legg inn din e-post" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" -#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:19 +#, fuzzy +msgid "Please enter your first name" +msgstr "Legg inn ditt navn" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:340 #: templates/web/default/js/validation_strings.html:7 msgid "" "Please enter your full name, councils need this information – if you do not " @@ -1921,13 +2037,23 @@ msgstr "" "under" #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 -#: perllib/FixMyStreet/DB/Result/User.pm:89 +#: perllib/FixMyStreet/DB/Result/Comment.pm:143 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Legg inn ditt navn" +#: templates/web/default/js/validation_strings.html:20 +#, fuzzy +msgid "Please enter your second name" +msgstr "Legg inn ditt navn" + +#: templates/web/default/js/validation_strings.html:18 +#, fuzzy +msgid "Please enter your title" +msgstr "Legg inn din e-post" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -1969,6 +2095,7 @@ msgstr "" msgid "Please fill in details of the problem." msgstr "Vennligst fyll ut detaljer om problemet." +#: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 msgid "" @@ -1982,8 +2109,11 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" -#: templates/web/default/report/display.html:61 -#: templates/web/fixmystreet/report/display.html:59 +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3 +msgid "Please note that updates are not sent to the council." +msgstr "" + +#: templates/web/default/report/display.html:56 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 " @@ -1994,6 +2124,19 @@ msgstr "" "informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy" "\">personvernpolicy</a>" +#: templates/web/barnet/report/updates-sidebar-notes.html:1 +#, fuzzy +msgid "" +"Please note that updates are not sent to the relevant department. 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 "" +"Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis " +"du legger igjen navnet ditt så vil det være offentlig tilgjengelig. Din " +"informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy" +"\">personvernpolicy</a>" + +#: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" @@ -2018,7 +2161,7 @@ msgstr "" msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported a problem to your council before" @@ -2042,26 +2185,35 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 +#: perllib/FixMyStreet/App/Controller/Photo.pm:176 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" +#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#, fuzzy +msgid "Please upload a JPEG image only\n" +msgstr "Vennligst last opp kun JPEG-bilder" + #: perllib/FixMyStreet/App/Controller/Contact.pm:98 msgid "Please write a message" msgstr "Skriv inn en melding" -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/bromley/report/display.html:70 +#: templates/web/fixmystreet/report/display.html:69 msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" +#: templates/web/bromley/report/display.html:121 +#: templates/web/bromley/report/display.html:149 +#: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:124 -#: templates/web/default/report/display.html:161 -#: templates/web/default/report/display.html:183 +#: templates/web/default/report/display.html:119 +#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:120 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/display.html:166 +#: templates/web/fixmystreet/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:161 msgid "Post" msgstr "Send inn" @@ -2069,11 +2221,11 @@ msgstr "Send inn" msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:21 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/default/report/updates.html:19 +#: templates/web/default/report/updates.html:23 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" @@ -2097,7 +2249,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:776 +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2109,16 +2261,17 @@ msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" msgid "Problems" msgstr "Problemer" -#: templates/web/default/around/display_location.html:79 +#: templates/web/default/around/display_location.html:81 msgid "Problems in this area" msgstr "Problemer i dette området" -#: templates/web/fixmystreet/around/display_location.html:93 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/bromley/report/display.html:31 +#: templates/web/fixmystreet/around/display_location.html:98 +#: templates/web/fixmystreet/report/display.html:24 msgid "Problems nearby" msgstr "Problemer i nærheten" -#: templates/web/fixmystreet/around/display_location.html:92 +#: templates/web/fixmystreet/around/display_location.html:97 msgid "Problems on the map" msgstr "Problemer på kartet" @@ -2126,29 +2279,30 @@ msgstr "Problemer på kartet" msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problemer nylig rapportert fikset på FiksGataMi" -#: templates/web/default/alert/list.html:50 +#: templates/web/default/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:748 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 +#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 +#: perllib/FixMyStreet/Cobrand/UK.pm:254 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:29 msgid "Problems within %s, FixMyStreet" msgstr "Problemer innenfor %s, Fiksgatami" -#: templates/web/default/alert/list.html:67 -#: templates/web/fixmystreet/alert/_list.html:38 +#: templates/web/default/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problemer innenfor grensene av:" @@ -2157,23 +2311,36 @@ msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Property type:" msgstr "Type egenskap:" +#: templates/web/bromley/report/new/fill_in_details_form.html:52 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 msgid "Provide a title" msgstr "Oppgi en tittel" -#: templates/web/default/report/display.html:56 -#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/bromley/report/display.html:57 +#: templates/web/default/report/display.html:51 +#: templates/web/fixmystreet/report/display.html:50 msgid "Provide an update" msgstr "Bidra med en oppdatering" -#: templates/web/default/report/display.html:180 +#: templates/web/bromley/report/new/fill_in_details_form.html:180 +#, fuzzy +msgid "" +"Providing a password is optional, but doing so will allow you to more easily " +"report future problems, leave updates and manage your reports." +msgstr "" +"Det er valgfritt å oppgi et passord, men om du gjør det vil det bli enklere " +"for deg å rapportere problemer, legge inn oppdateringer og holde oversikt " +"over dine rapporter" + +#: templates/web/bromley/report/display.html:142 +#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2188,9 +2355,9 @@ msgstr "" #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 #: templates/web/fixmystreet/questionnaire/index.html:0 -#: templates/web/fixmystreet/questionnaire/index.html:15 -#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:14 #: templates/web/fixmystreet/questionnaire/index.html:32 +#: templates/web/fixmystreet/questionnaire/index.html:4 msgid "Questionnaire" msgstr "Spørreskjema" @@ -2206,64 +2373,58 @@ msgstr "Spørreskjema %d sendt for problem %d" msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" -#: templates/web/fixmystreet/static/for_councils_faq.html:1 -msgid "Questions and Answers :: FixMyStreet for Councils" -msgstr "Spørsmål og svar :: FiksGataMi for det offentlige" - -#: templates/web/default/alert/list.html:52 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/alert/_list.html:21 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:47 -#: templates/web/default/reports/council.html:79 +#: templates/web/default/report/display.html:42 +#: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 #: templates/web/fixmystreet/around/display_location.html:1 #: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/Default.pm:786 -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 -#: perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:816 -#: perllib/FixMyStreet/Cobrand/Default.pm:830 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 +#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:822 -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/_list.html:21 #: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: templates/web/default/reports/council.html:79 +#: templates/web/default/reports/_rss.html:1 msgid "RSS feed of problems in this %s" msgstr "RSS-strøm for problemer i denne %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:749 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 +#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:247 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:756 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 +#: perllib/FixMyStreet/Cobrand/UK.pm:253 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" @@ -2274,16 +2435,18 @@ msgstr "RSS-strøm for problemer innenfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" -#: templates/web/default/report/display.html:47 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" +#: templates/web/bromley/report/display.html:39 #: templates/web/default/alert/updates.html:9 -#: templates/web/default/report/display.html:38 +#: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:32 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" @@ -2304,7 +2467,7 @@ msgstr "Nylig løste <br>problemer" msgid "Recently fixed" msgstr "Nylig løste problemer" -#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 +#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 msgid "Recently reported problems" msgstr "Nylig meldte problemer" @@ -2325,17 +2488,17 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:77 +#: templates/web/emptyhomes/header.html:10 msgid "Report Empty Homes" msgstr "Rapporter tomme hjem" -#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 -#: templates/web/emptyhomes/header.html:27 +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 +#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 @@ -2343,7 +2506,8 @@ msgstr "Rapporter tomme hjem" msgid "Report a problem" msgstr "Rapporter et problem" -#: templates/web/fixmystreet/report/display.html:27 +#: templates/web/bromley/report/display.html:28 +#: templates/web/fixmystreet/report/display.html:22 msgid "Report abuse" msgstr "Rapporter misbruk" @@ -2351,23 +2515,24 @@ msgstr "Rapporter misbruk" msgid "Report empty properties" msgstr "Rapporter tomme hjem" -#: perllib/FixMyStreet/App/Controller/Rss.pm:281 +#: perllib/FixMyStreet/App/Controller/Rss.pm:277 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 +#: templates/web/default/index.html:15 +#: templates/web/fixmystreet/around/postcode_form.html:6 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 +#: templates/web/default/my/my.html:74 msgid "Reported %s" msgstr "Rapportert %s" -#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 +#: templates/web/default/my/my.html:72 msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2379,33 +2544,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:527 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported by %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:492 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2413,14 +2578,14 @@ msgstr "Rapportert i kategorien %s av %s %s" #: 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_form.html:1 -#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/around/around_index.html:2 #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til et problem" -#: templates/web/default/around/display_location.html:93 +#: templates/web/default/around/display_location.html:95 msgid "Reports on and around the map" msgstr "Problemer i og rundt kartet" @@ -2428,7 +2593,7 @@ msgstr "Problemer i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:107 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2436,7 +2601,7 @@ msgstr "" "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og " "type) %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:104 +#: perllib/FixMyStreet/Geocode/OSM.pm:163 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" @@ -2444,7 +2609,7 @@ msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" msgid "Save changes" msgstr "Lagre endringer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2452,13 +2617,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbrukstabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukere" @@ -2469,7 +2634,7 @@ msgstr "Søk i brukere" msgid "Search:" msgstr "Søk:" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " @@ -2478,7 +2643,7 @@ msgstr "" "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, " "eller skriv inn din e-postadresse for å abonnere på et e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -2511,11 +2676,14 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:213 +#: templates/web/bromley/report/display.html:203 +#: templates/web/bromley/report/new/fill_in_details_form.html:129 +#: templates/web/bromley/report/new/fill_in_details_form.html:175 +#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:189 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" @@ -2529,13 +2697,14 @@ msgstr "Vis gamle" msgid "Show pins" msgstr "Vis nåler" -#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmybarangay/header.html.orig:46 #: templates/web/fixmystreet/auth/general.html:3 #: templates/web/fixmystreet/auth/general.html:38 #: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:50 +#: templates/web/fixmystreet/header.html:51 +#: templates/web/zurich/header.html:51 msgid "Sign in" msgstr "Logg inn" @@ -2548,12 +2717,12 @@ msgstr "Logg inn via epost" msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" +#: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2573,8 +2742,7 @@ msgstr "Logget inn som %s" msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" -#: templates/web/default/alert/index.html:30 -#: templates/web/fixmystreet/alert/index.html:33 +#: templates/web/default/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -2587,7 +2755,7 @@ msgstr "Noe tekst å oversette" msgid "Some unconfirmeds" msgstr "Noen ubekreftede" -#: perllib/FixMyStreet/Cobrand/Default.pm:428 +#: perllib/FixMyStreet/Cobrand/UK.pm:97 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2600,14 +2768,15 @@ msgstr "" "Beklager, men det oppsto et problem når vi forsøkte å bekrefte " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 -#: perllib/FixMyStreet/Geocode/Google.pm:68 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 +#: perllib/FixMyStreet/Geocode/Google.pm:69 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." #: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:60 +#: perllib/FixMyStreet/Geocode/Google.pm:64 +#: perllib/FixMyStreet/Geocode/OSM.pm:59 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." @@ -2628,20 +2797,21 @@ msgstr "Startdag:" msgid "Start month:" msgstr "Startmåned:" +#: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:77 +#: templates/web/fixmystreet/report/display.html:72 msgid "State" msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:82 +#: templates/web/default/report/display.html:77 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:986 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2650,6 +2820,7 @@ msgstr "Statistikk" msgid "Still open, via questionnaire, %s" msgstr "Fortsatt åpen via spørreskjema, %s" +#: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 msgid "Subject" @@ -2661,17 +2832,20 @@ msgstr "Emne" msgid "Subject:" msgstr "Emne:" +#: templates/web/bromley/report/new/fill_in_details_form.html:140 +#: templates/web/bromley/report/new/fill_in_details_form.html:190 +#: templates/web/bromley/report/new/fill_in_details_form.html:204 #: templates/web/default/questionnaire/creator_fixed.html:19 #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:56 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2682,19 +2856,20 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" +#: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:43 +#: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:42 +#: templates/web/fixmystreet/report/display.html:37 msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:126 -#: templates/web/fixmystreet/alert/_list.html:88 +#: templates/web/default/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2706,7 +2881,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" @@ -2715,7 +2890,7 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:18 msgid "Text only version" msgstr "Tekst-versjon" @@ -2771,8 +2946,17 @@ msgstr "" "Takk for at du bruker ReportEmptyHomes.com. Ditt bidrag bidrar allerede for " "å løse UKs tomme hjem-krise." -#: templates/web/default/around/around_index.html:43 -#: templates/web/fixmystreet/around/around_index.html:46 +#: templates/web/fixmystreet/around/around_index.html:27 +#, fuzzy +msgid "" +"Thanks for uploading your photo. We now need to locate your problem, so " +"please enter a nearby street name or postcode in the box above :" +msgstr "" +"Takk for at du lastet opp ditt bilde. Nå trenger vi å plassere ditt problem," +"så vær så snill å skriv inn navn på vei i nærheten, eller postnummer i " +"boksen under :" + +#: templates/web/default/around/around_index.html:28 msgid "" "Thanks for uploading your photo. We now need to locate your problem, so " "please enter a nearby street name or postcode in the box below :" @@ -2793,31 +2977,32 @@ 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:856 +#: perllib/FixMyStreet/App/Controller/Photo.pm:190 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt." -#: templates/web/default/alert/index.html:12 -#: templates/web/fixmystreet/alert/index.html:12 +#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#, fuzzy msgid "" -"That location does not appear to be covered by a council, perhaps it is " -"offshore - please try somewhere more specific." +"That location does not appear to be covered by a council; perhaps it is " +"offshore or outside the country. Please try again." msgstr "" "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs - " "vennligst forsøk et mer spesifikt sted." # Should this be "Norge" or "Storbritannia" ? #: perllib/FixMyStreet/App/Controller/Location.pm:107 -msgid "That location does not appear to be in Britain; please try again." +#, fuzzy +msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:90 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:560 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -2825,17 +3010,6 @@ msgstr "Det problemet vil nå bli sendt på nytt." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/default/around/around_index.html:26 -#: templates/web/fixmystreet/around/around_index.html:29 -msgid "" -"That spot does not appear to be covered by a council. If you have tried to " -"report an issue past the shoreline, for example, please specify the closest " -"point on land." -msgstr "" -"Punktet ser ikke ut til å være dekket av en administrasjon. Hvis du for " -"eksempel har forsøkt å rapportere et problem utenfor kysten, marker nærmeste " -"punkt på land." - #: templates/web/emptyhomes/static/about.html:7 msgid "The Empty Homes Agency" msgstr "" @@ -2868,7 +3042,6 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 -#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -2905,8 +3078,9 @@ msgid "" msgstr "" "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden." +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 #: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -2920,7 +3094,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code and service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:99 +#: perllib/FixMyStreet/Geocode/OSM.pm:158 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -2983,8 +3157,6 @@ 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/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Passordene er ikke like" @@ -2993,25 +3165,16 @@ msgstr "Passordene er ikke like" msgid "The requested URL '%s' was not found on this server" msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 -#: perllib/FixMyStreet/App/Controller/Admin.pm:540 -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 -msgid "The requested URL was not found on this server." -msgstr "Den forespurte URL-en ble ikke funnet på denne tjeneren" - -#: templates/web/default/alert/list.html:45 +#: templates/web/default/alert/_list.html:14 #: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Den enkleste meldingen er vår geografiske:" -#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/barnet/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_extra_text.html:1 #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 -#: templates/web/fixmystreet/report/new/councils_text_all.html:18 -#: templates/web/fixmystreet/report/new/councils_text_some.html:10 -#: templates/web/fixmystreet/report/new/councils_text_some.html:11 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " @@ -3020,7 +3183,7 @@ msgstr "" "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" "hvis du gir oss tillatelse til det." -#: bin/send-reports:79 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3028,15 +3191,22 @@ msgstr "" "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt " "stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:70 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen " "senere." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#, fuzzy +msgid "There was a problem showing this page. Please try again later." +msgstr "" +"Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen " +"senere." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 msgid "" @@ -3048,14 +3218,14 @@ msgstr "" "passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-" "delen av skjemaet" -#: perllib/FixMyStreet/App/Controller/Alert.pm:351 +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "" "There was a problem with your email/password combination. Please try again." msgstr "" "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøk " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 msgid "There was a problem with your update. Please try again." msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen." @@ -3063,7 +3233,7 @@ msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen. 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:242 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -3075,7 +3245,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil " "endre seg uten advarsel i fremtiden." -#: bin/send-reports:186 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3088,7 +3258,7 @@ msgstr "" "eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan " "legge det til i vårt system." -#: bin/send-reports:189 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3099,7 +3269,8 @@ msgstr "" "snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å " "håndtere denne saken." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 +#: perllib/FixMyStreet/Cobrand/UK.pm:62 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3130,49 +3301,51 @@ msgstr "" "Dette er en opplisting av alle problemene i denne tjenesten; velg en bestemt " "administrasjon for å se problemer som er sendt dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:874 +#: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukket" -#: perllib/FixMyStreet/Cobrand/Default.pm:870 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:100 -#: templates/web/fixmystreet/report/display.html:95 +#: templates/web/bromley/report/display.html:96 +#: templates/web/default/report/banner.html:12 +#: templates/web/default/report/display.html:95 +#: templates/web/emptyhomes/report/display.html:12 +#: templates/web/fixmystreet/report/display.html:90 msgid "This problem has been fixed" msgstr "Dette problemet er løst" -#: templates/web/default/report/display.html:95 -#: templates/web/fixmystreet/report/display.html:89 +#: templates/web/bromley/report/display.html:90 +#: templates/web/default/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:84 msgid "This problem has not been fixed" msgstr "Dette problemet har ikke blitt løst" -#: perllib/FixMyStreet/Cobrand/Default.pm:879 +#: templates/web/default/report/banner.html:19 msgid "This problem is in progress" msgstr "Dette problemet er under arbeid" -#: perllib/FixMyStreet/Cobrand/Default.pm:866 +#: templates/web/default/report/banner.html:9 msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammel og med ukjent status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: bin/send-reports:72 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3196,21 +3369,15 @@ msgid "" msgstr "" "For å <strong>rapportere et problem</strong>, klikk på kartet på riktig sted." -#: templates/web/fixmystreet/alert/index.html:19 -msgid "" -"To find out what local alerts we have for you, please enter your GB\n" -" postcode or street name and area" -msgstr "" -"Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" - -#: templates/web/default/alert/index.html:21 +#: templates/web/default/alert/index.html:27 +#, fuzzy msgid "" -"To find out what local alerts we have for you, please enter your GB\n" -"postcode or street name and area:" +"To find out what local alerts we have for you, please enter your postcode or " +"street name and area" msgstr "" "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted:" -#: bin/send-reports:78 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 msgid "To view a map of the precise location of this issue" msgstr "For å se en kart med en mer presis plassering for dette problemet." @@ -3231,7 +3398,7 @@ msgstr "Klarte ikke slå opp områder i MaPit. Vennligst forsøk igjen senere." msgid "Unconfirmed" msgstr "Ubekreftet" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +#: templates/web/fixmystreet/report/banner.html:9 msgid "Unknown" msgstr "Ukjent" @@ -3243,7 +3410,8 @@ msgstr "Ukjent varsel-type" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: templates/web/fixmystreet/report/display.html:70 +#: templates/web/bromley/report/display.html:66 +#: templates/web/fixmystreet/report/display.html:65 msgid "Update" msgstr "Oppdatering" @@ -3281,17 +3449,17 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/default/admin/council_contacts.html:58 +#: templates/web/default/admin/council_contacts.html:62 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:76 +#: templates/web/default/report/display.html:71 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:766 -#: perllib/FixMyStreet/App/Controller/Admin.pm:846 +#: perllib/FixMyStreet/App/Controller/Admin.pm:694 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Updated!" msgstr "Oppdatert!" @@ -3305,18 +3473,20 @@ msgstr "Oppdateringer" msgid "Updates on {{title}}" msgstr "Oppdateringer av {{title}}" +#: templates/web/bromley/report/display.html:0 +#: templates/web/bromley/report/display.html:8 #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 #: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:8 msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 msgid "User flagged" msgstr "Bruker flagget" @@ -3324,8 +3494,8 @@ msgstr "Bruker flagget" msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:306 -#: perllib/FixMyStreet/App/Controller/Admin.pm:336 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: perllib/FixMyStreet/App/Controller/Admin.pm:339 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3334,6 +3504,11 @@ msgstr "Verdier oppdatert" msgid "View report on site" msgstr "Se rapport på nettstedet" +#: templates/web/default/reports/council.html:18 +#, fuzzy +msgid "View reports by ward" +msgstr "Se rapport på nettstedet" + #: templates/web/emptyhomes/tokens/confirm_problem.html:39 msgid "View your report" msgstr "Vis din rapport" @@ -3347,30 +3522,21 @@ msgstr "Vis din rapport" msgid "Viewing a location" msgstr "Ser på et sted" +#: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 -#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på et problem" -#: templates/web/default/reports/council.html:23 -#: templates/web/default/reports/council.html:74 -#: templates/web/default/reports/council.html:86 +#: templates/web/default/reports/council.html:20 #: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "Bydeler innenfor denne administrasjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:432 -#: perllib/FixMyStreet/Geocode/Bing.pm:48 -#: perllib/FixMyStreet/Geocode/Google.pm:63 -msgid "We do not currently cover Northern Ireland, I'm afraid." -msgstr "Vi dekker desverre ikke Nord-Irland." - #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:32 -#: templates/web/fixmystreet/alert/choose.html:6 -#: templates/web/fixmystreet/around/around_index.html:35 +#: templates/web/default/around/around_index.html:17 +#: templates/web/fixmystreet/around/around_index.html:16 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." @@ -3379,7 +3545,6 @@ msgstr "" "forsøk et annet søk hvis din plass ikke er her." #: templates/web/default/auth/token.html:19 -#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg en epost som inneholder link for å bekrefte din konto." @@ -3393,16 +3558,19 @@ msgstr "" "Det kan hende vi periodisk tar kontakt med deg for å spørre om noe har " "endret seg med eiedommen du rapporterte." -#: templates/web/fixmystreet/report/display.html:158 +#: templates/web/bromley/report/display.html:141 +#: templates/web/fixmystreet/report/display.html:153 msgid "We never show your email" msgstr "Vi viser aldri din e-postadresse" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 +#: templates/web/bromley/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 msgid "We never show your email address or phone number." msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer" -#: bin/send-reports:196 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 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 " @@ -3412,13 +3580,13 @@ msgstr "" "tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 -#: templates/web/fixmystreet/index.html:56 +#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:45 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" +#: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 -#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3426,6 +3594,15 @@ msgstr "" "Vi vil kun bruke personlig informasjon om deg i henhold til vår <a href=\"/" "faq#privacy\">personvernpolicy.</a>" +#: templates/web/fixmystreet/report/new/notes.html:4 +#, fuzzy +msgid "" +"We will only use your personal information in accordance with our <a href=\"/" +"privacy\">privacy policy.</a>" +msgstr "" +"Vi vil kun bruke personlig informasjon om deg i henhold til vår <a href=\"/" +"faq#privacy\">personvernpolicy.</a>" + #: templates/web/emptyhomes/contact/blurb.html:2 msgid "" "We’d love to hear what you think about this website. Just fill in the " @@ -3445,7 +3622,7 @@ msgstr "" "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare " "fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:41 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "Når redigert" @@ -3455,7 +3632,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" @@ -3470,15 +3647,17 @@ msgstr "" "enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a " "href=\"%s\">MaPit</a>." -#: templates/web/fixmystreet/footer.html:23 +#: templates/web/fixmystreet/footer.html:22 +#, fuzzy msgid "" -"Would you like better integration with FixMyStreet? <a href=\"/for-councils" -"\">Find out about FixMyStreet for councils</a>." +"Would you like better integration with FixMyStreet? <a href=\"http://www." +"mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for " +"councils</a>." msgstr "" "Ønsker dere bedre integrasjon med FiksGataMi? <a href=\"/for-councils\"> " "Finn ut mer om FiksGataMi for administrajoner</a>." -#: templates/web/fixmystreet/footer.html:19 +#: templates/web/fixmystreet/footer.html:18 msgid "" "Would you like to contribute to FixMyStreet? Our code is open source and <a " "href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." @@ -3508,15 +3687,15 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -3527,8 +3706,10 @@ msgstr "År" msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/bromley/report/display.html:155 +#: templates/web/bromley/report/new/fill_in_details_form.html:198 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 msgid "Yes I have a password" msgstr "<strong>Ja</strong>, jeg har et passord" @@ -3566,10 +3747,6 @@ msgstr "Du kan <a href=\"/reports/\">se alle administrasjoner</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:14 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local problems for %s " "and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3586,6 +3763,7 @@ msgstr "" "vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt " "problem</a>.\n" +#: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 @@ -3597,8 +3775,9 @@ msgstr "" "Du har allerede lagt ved et bilde til dette problemet. Å legge ved et annet " "vil bytte ut dette." -#: templates/web/default/report/display.html:111 -#: templates/web/fixmystreet/report/display.html:105 +#: templates/web/bromley/report/display.html:106 +#: templates/web/default/report/display.html:106 +#: templates/web/fixmystreet/report/display.html:100 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3607,10 +3786,10 @@ msgstr "" "annet vil bytte ut dette." #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allerede logget ut" +#: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 msgid "" @@ -3624,8 +3803,8 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Du har nå lykkes med å bekrefte ditt varsel." -#: templates/web/default/tokens/confirm_problem.html:6 -#: templates/web/default/tokens/confirm_problem.html:7 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" msgstr "Du har nå lykkes med å bekrefte ditt problem" @@ -3647,8 +3826,8 @@ msgstr "Du har lykkes med å opprette ditt varsel." msgid "You have successfully deleted your alert." msgstr "Sletting av ditt varsel var vellykket." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3675,18 +3854,22 @@ msgstr "Ønsker du virkelig å sende på nytt?" msgid "Your Reports" msgstr "Dine rapporter" -#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/bromley/report/display.html:41 +#: templates/web/bromley/report/display.html:43 +#: templates/web/bromley/report/new/fill_in_details_form.html:145 +#: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:39 -#: templates/web/fixmystreet/report/display.html:41 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/display.html:34 +#: templates/web/fixmystreet/report/display.html:36 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 msgid "Your email" msgstr "Din e-post" +#: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:129 +#: templates/web/fixmystreet/report/display.html:124 msgid "Your email address" msgstr "Din e-postadresse" @@ -3694,48 +3877,75 @@ msgstr "Din e-postadresse" msgid "Your email address:" msgstr "Din e-postadresse:" -#: templates/web/default/alert/list.html:120 -#: templates/web/default/report/display.html:133 +#: templates/web/default/alert/_list.html:92 +#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "Din e-post" +#: templates/web/bromley/report/display.html:193 +#: templates/web/bromley/report/new/fill_in_details_form.html:117 +#: templates/web/bromley/report/new/fill_in_details_form.html:164 +#, fuzzy +msgid "Your first name" +msgstr "Ditt navn" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5 +#, fuzzy +msgid "" +"Your information will only be used in accordance with our <a href=\"/privacy" +"\">privacy policy</a>" +msgstr "" +"Vi vil kun bruke personlig informasjon om deg i henhold til vår <a href=\"/" +"faq#privacy\">personvernpolicy.</a>" + +#: templates/web/bromley/report/display.html:199 +#: templates/web/bromley/report/new/fill_in_details_form.html:123 +#: templates/web/bromley/report/new/fill_in_details_form.html:170 +#, fuzzy +msgid "Your last name" +msgstr "Ditt navn" + #: templates/web/fixmystreet/auth/general.html:53 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 msgid "Your name" msgstr "Ditt navn" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:207 +#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Ditt navn:" +#: templates/web/bromley/report/display.html:160 +#: templates/web/bromley/report/new/fill_in_details_form.html:203 #: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:143 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 msgid "Your password" msgstr "Ditt passord" #: templates/web/default/auth/change_password.html:6 -#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 +#: templates/web/bromley/report/new/fill_in_details_form.html:184 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Your phone number" msgstr "Ditt telefonnummer" -#: templates/web/fixmystreet/questionnaire/index.html:16 +#: templates/web/fixmystreet/questionnaire/index.html:15 msgid "Your report" msgstr "Dine rapporter" -#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 +#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9 #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 @@ -3755,8 +3965,8 @@ msgstr "Din e-post:" msgid "by %s" msgstr "av %s" -#: templates/web/default/reports/council.html:6 -#: templates/web/default/reports/council.html:7 +#: templates/web/default/reports/council.html:12 +#: templates/web/default/reports/council.html:13 #: templates/web/emptyhomes/reports/council.html:6 #: templates/web/emptyhomes/reports/council.html:7 msgid "council" @@ -3766,8 +3976,8 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikke kart" -#: templates/web/fixmystreet/alert/index.html:24 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:17 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -3775,26 +3985,26 @@ msgstr "for eksempel «%s» eller «%s»" msgid "from %d different users" msgstr "fra %d forskjellige brukere" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:289 msgid "less than a minute" msgstr "mindre enn et minutt" -#: templates/web/default/report/updates.html:24 +#: templates/web/default/report/updates.html:27 msgid "marked as %s" msgstr "markert som %s" -#: templates/web/default/report/updates.html:22 +#: templates/web/default/report/updates.html:25 msgid "marked as fixed" msgstr "markert som fikset" -#: perllib/FixMyStreet/App/Controller/Admin.pm:109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:112 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "n/a" -#: templates/web/default/alert/list.html:114 -#: templates/web/fixmystreet/alert/_list.html:81 +#: templates/web/default/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" @@ -3806,15 +4016,20 @@ msgstr "søkte etter" msgid "other areas:" msgstr "andre områder:" -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/updates.html:26 msgid "reopened" msgstr "åpnet på nytt" -#: templates/web/bromley/header.html:47 -#: templates/web/fixmystreet/header.html:47 +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 +#: templates/web/bromley/header.html:65 +#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmystreet/header.html:48 +#: templates/web/zurich/header.html:48 msgid "sign out" msgstr "logg ut" +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:7 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 @@ -3822,15 +4037,19 @@ msgstr "logg ut" msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 msgid "the map was not used so pin location may be inaccurate" msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig" -#: bin/send-reports:177 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +msgid "their ref: %s" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:222 +#: perllib/Utils.pm:263 msgid "today" msgstr "idag" @@ -3847,7 +4066,7 @@ msgid "user is problem owner" msgstr "bruker er eier av problemet" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:3 +#: templates/web/default/reports/council.html:9 #: templates/web/emptyhomes/reports/council.html:0 #: templates/web/emptyhomes/reports/council.html:3 msgid "ward" @@ -3883,13 +4102,6 @@ msgstr "vil ditt problem ikke bli publisert" msgid "your update will not be posted" msgstr "din oppdatering vil ikke bli publisert" -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapportert<br>nylig" -msgstr[1] "<big>%s</big> rapportert<br>nylig" - #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -3900,6 +4112,13 @@ msgstr[0] "" msgstr[1] "" "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapportert<br>nylig" +msgstr[1] "<big>%s</big> rapportert<br>nylig" + #: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" @@ -3914,14 +4133,7 @@ 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:29 -#, 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/fixmystreet/report/new/councils_text_some.html:14 +#: templates/web/default/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3936,6 +4148,41 @@ msgstr[1] "" "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene " "som dekker dette stedet." +#: templates/web/default/front/stats.html:29 +#, 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 "FixMyStreet for Councils" +#~ msgstr "FiksGataMi for det offentlige" + +#~ msgid "Questions and Answers :: FixMyStreet for Councils" +#~ msgstr "Spørsmål og svar :: FiksGataMi for det offentlige" + +#~ msgid "" +#~ "That spot does not appear to be covered by a council. If you have tried " +#~ "to report an issue past the shoreline, for example, please specify the " +#~ "closest point on land." +#~ msgstr "" +#~ "Punktet ser ikke ut til å være dekket av en administrasjon. Hvis du for " +#~ "eksempel har forsøkt å rapportere et problem utenfor kysten, marker " +#~ "nærmeste punkt på land." + +#~ msgid "The requested URL was not found on this server." +#~ msgstr "Den forespurte URL-en ble ikke funnet på denne tjeneren" + +#~ msgid "" +#~ "To find out what local alerts we have for you, please enter your GB\n" +#~ " postcode or street name and area" +#~ msgstr "" +#~ "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller " +#~ "sted" + +#~ msgid "We do not currently cover Northern Ireland, I'm afraid." +#~ msgstr "Vi dekker desverre ikke Nord-Irland." + #, fuzzy #~ msgid "<strong>Yes</strong>, I have a password" #~ msgstr "<strong>Ja</strong>, jeg har et passord:" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index c05ddfaa6..22a04be64 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2012-03-28 19:23+0100\n" +"POT-Creation-Date: 2012-08-21 09:54+0100\n" "PO-Revision-Date: 2011-12-08 10:56+0100\n" "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n" "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -21,16 +21,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: bin/send-reports:184 perllib/FixMyStreet/DB/Result/Problem.pm:549 +#: perllib/FixMyStreet/DB/Result/Problem.pm:555 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:337 msgid " and " msgstr " og " -#: templates/web/default/tokens/confirm_problem.html:10 -#: templates/web/default/tokens/confirm_problem.html:6 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:18 msgid " and <strong>we will now send it to the council</strong>" msgstr " og <strong>vi sender det no til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:17 #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_none.html:14 #: templates/web/default/report/new/councils_text_none.html:17 @@ -38,13 +40,6 @@ msgstr " og <strong>vi sender det no til administrasjonen</strong>" #: templates/web/default/report/new/councils_text_some.html:23 #: templates/web/default/report/new/councils_text_some.html:5 #: templates/web/emptyhomes/report/new/councils_text_all.html:2 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:15 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:23 -#: templates/web/fixmystreet/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " @@ -60,11 +55,11 @@ msgstr "%d stadfesta varsel, %d ikkje stadfesta" msgid "%d council contacts – %d confirmed, %d unconfirmed" msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:293 msgid "%d day" msgstr "%d dag" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:293 msgid "%d days" msgstr "%d dagar" @@ -72,11 +67,11 @@ msgstr "%d dagar" msgid "%d edits by %s" msgstr "%d redigeringar av %s" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 msgid "%d hour" msgstr "%d time" -#: perllib/Utils.pm:253 +#: perllib/Utils.pm:294 msgid "%d hours" msgstr "%d timar" @@ -84,11 +79,11 @@ msgstr "%d timar" msgid "%d live updates" msgstr "%d aktive oppdateringar" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 msgid "%d minute" msgstr "%d minutt" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:295 msgid "%d minutes" msgstr "%d minutt" @@ -96,36 +91,38 @@ msgstr "%d minutt" msgid "%d questionnaires sent – %d answered (%s%%)" msgstr "%d spørjeskjema sendt – %d svart (%s%%)" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 msgid "%d week" msgstr "%d veke" -#: perllib/Utils.pm:251 +#: perllib/Utils.pm:292 msgid "%d weeks" msgstr "%d veker" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:14 +#: templates/web/default/reports/council.html:26 #: templates/web/emptyhomes/reports/council.html:11 #: templates/web/emptyhomes/reports/council.html:13 msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/Cobrand/Default.pm:792 -#: perllib/FixMyStreet/Cobrand/Default.pm:806 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +msgid "%s ref: %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/UK.pm:288 perllib/FixMyStreet/Cobrand/UK.pm:300 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:480 +#: perllib/FixMyStreet/DB/Result/Problem.pm:488 msgid "%s, reported anonymously at %s" msgstr "%s, rapportert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:482 +#: perllib/FixMyStreet/DB/Result/Problem.pm:490 msgid "%s, reported by %s at %s" msgstr "%s, rapportert av %s %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:823 -#: perllib/FixMyStreet/Cobrand/Default.pm:837 +#: perllib/FixMyStreet/Cobrand/UK.pm:315 perllib/FixMyStreet/Cobrand/UK.pm:327 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -141,31 +138,36 @@ msgstr "(Ingen grunn til å uroa seg — %s)" msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" -#: templates/web/default/alert/list.html:51 +#: templates/web/default/alert/_list.html:20 #: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)" -#: templates/web/default/alert/list.html:56 +#: templates/web/default/alert/_list.html:25 #: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" +#: templates/web/default/around/around_map_list_items.html:12 +#: templates/web/default/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:23 +#, fuzzy +msgid "(closed)" +msgstr "Lukka" + #: templates/web/default/around/around_map_list_items.html:10 #: templates/web/default/around/on_map_list_items.html:7 -#: templates/web/default/reports/council.html:134 -#: templates/web/fixmystreet/around/around_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:21 msgid "(fixed)" msgstr "(løyst)" #: templates/web/default/index.html:12 templates/web/default/index.html:8 -#: templates/web/fixmystreet/index.html:30 +#: templates/web/fixmystreet/around/postcode_form.html:7 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/default/reports/council.html:131 -#: templates/web/default/reports/council.html:152 +#: templates/web/default/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:17 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -173,8 +175,8 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/default/reports/council.html:130 -#: templates/web/default/reports/council.html:150 +#: templates/web/default/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:16 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -182,31 +184,32 @@ msgstr "(sendt til begge)" msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: templates/web/default/report/display.html:214 +#: templates/web/default/report/display.html:209 msgid "(we never show your email)" msgstr "(vi viser aldri e-postadressa di)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:284 msgid "*unknown*" msgstr "*ukjent*" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:549 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/DB/Result/Problem.pm:337 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:629 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/DB/Result/Problem.pm:345 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:535 -#: perllib/FixMyStreet/DB/Result/Problem.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:609 +#: perllib/FixMyStreet/DB/Result/Problem.pm:351 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" #: templates/web/default/tokens/confirm_problem.html:14 -#: templates/web/default/tokens/confirm_problem.html:6 -msgid ". You can <a href=\"%s\">view the problem on this site</a>." +#: templates/web/default/tokens/confirm_problem.html:22 +#, fuzzy +msgid ". You can <a href=\"%s%s\">view the problem on this site</a>." msgstr ". Du kan <a href=\"%s\">lesa om problemet på portalen</a>." -#: templates/web/default/questionnaire/completed.html:25 +#: templates/web/default/questionnaire/completed.html:20 msgid "" "<p style=\"font-size:150%\">Thank you very much for filling in our " "questionnaire; glad to hear it’s been fixed.</p>" @@ -214,15 +217,51 @@ msgstr "" "<p style=\"font-size:150%\">Tusen takk for at du fylte ut spørjeskjemaet " "vårt. Vi er glade for å høyra at problemet ditt er løyst.</p>" -#: templates/web/default/questionnaire/completed.html:15 +#: templates/web/fiksgatami/questionnaire/completed-open.html:1 +#, fuzzy 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" -"or, if it’s a problem that could be fixed by local people working " -"together,\n" -"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a " -"pledge</a>?\n" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/" +"\">writing\n" +"direct to your councillor(s)</a> or, if it’s a problem that could be\n" +"fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%%\">Det var trist å høyra dette. Vi har to forslag: " +"kva med å freista\n" +"<a href=\"%s\">å skriva direkte til representantane dine</a>, eller viss det " +"er eit problem som kan fiksast\n" +"av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." +"pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" + +#: templates/web/fixmystreet/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing " +"direct\n" +"to your councillor(s)</a> or, if it’s a problem that could be fixed " +"by\n" +"local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +"</p>" +msgstr "" +"<p style=\"font-size:150%%\">Det var trist å høyra dette. Vi har to forslag: " +"kva med å freista\n" +"<a href=\"%s\">å skriva direkte til representantane dine</a>, eller viss det " +"er eit problem som kan fiksast\n" +"av folk i nabolaget som jobbar saman, kva med å <a href=\"http://www." +"pledgebank.com/new\">publisera ei utfordring om å bidra</a>?</p>" + +#: templates/web/default/questionnaire/completed-open.html:1 +#, fuzzy +msgid "" +"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +"suggestions: why not try writing to your local representative or, if " +"it’s\n" +"a problem that could be fixed by local people working together, why not\n" +"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" "</p>" msgstr "" "<p style=\"font-size:150%%\">Det var trist å høyra dette. Vi har to forslag: " @@ -293,12 +332,12 @@ msgstr "" msgid "<strong>%d</strong> live problems" msgstr "<strong>%d</strong> aktive problem" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:169 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172 #, fuzzy msgid "<strong>No</strong> Let me confirm my report by email" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/fixmystreet/report/display.html:153 +#: templates/web/fixmystreet/report/display.html:148 #, fuzzy msgid "<strong>No</strong> Let me confirm my update by email" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" @@ -316,17 +355,17 @@ msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#: templates/web/default/report/display.html:169 +#: templates/web/default/report/display.html:164 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" #: templates/web/default/auth/general.html:37 -#: templates/web/default/report/display.html:147 +#: templates/web/default/report/display.html:142 #: templates/web/default/report/new/fill_in_details_form.html:140 #: templates/web/fixmystreet/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:34 -#: templates/web/fixmystreet/report/display.html:136 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 +#: templates/web/fixmystreet/report/display.html:131 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154 #, fuzzy msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -339,7 +378,7 @@ msgstr "<strong>Ja</strong>, eg har eit passord:" msgid "About us" msgstr "Om oss" -#: templates/web/default/admin/council_contacts.html:62 +#: templates/web/default/admin/council_contacts.html:66 msgid "Add new category" msgstr "Legg til ny kategori" @@ -348,7 +387,6 @@ msgid "Added %s" msgstr "La til %s" #: templates/web/default/auth/change_password.html:29 -#: templates/web/fixmystreet/auth/change_password.html:29 msgid "Again:" msgstr "Gjenta:" @@ -360,8 +398,9 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/default/report/display.html:219 -#: templates/web/fixmystreet/report/display.html:193 +#: templates/web/bromley/report/display.html:207 +#: templates/web/default/report/display.html:214 +#: templates/web/fixmystreet/report/display.html:189 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -378,7 +417,8 @@ msgstr "Alle rapportar" msgid "All confirmed" msgstr "Alle stadfesta" -#: templates/web/bromley/footer.html:37 templates/web/default/footer.html:11 +#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 +#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11 #: templates/web/fiksgatami/footer.html:7 #: templates/web/fiksgatami/nn/footer.html:7 #: templates/web/fixmystreet/footer.html:49 @@ -387,15 +427,21 @@ msgid "All reports" msgstr "Alle rapportar" #: templates/web/default/report/new/councils_text_some.html:2 -#: templates/web/fixmystreet/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" msgstr "All informasjonen du har lagt inn her vil sendast til" +#: templates/web/default/report/new/councils_text_all.html:10 +#: templates/web/default/report/new/councils_text_all.html:12 +#, fuzzy +msgid "" +"All the information you provide here will be sent to <strong>%s</strong> or " +"<strong>Roads Service</strong>." +msgstr "" +"All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." + # TfL? skal ikkje det omsetjast? --KBU #: templates/web/default/report/new/councils_text_all.html:3 #: templates/web/default/report/new/councils_text_all.html:5 -#: templates/web/fixmystreet/report/new/councils_text_all.html:3 -#: templates/web/fixmystreet/report/new/councils_text_all.html:5 msgid "" "All the information you provide here will be sent to <strong>%s</strong> or " "a relevant local body such as <strong>TfL</strong>, via the London Report-It " @@ -405,12 +451,12 @@ msgstr "" "ein relevant lokal etat som <strong>TfL</strong>, via systemet London Report-" "It." -#: templates/web/default/report/new/councils_text_all.html:10 -#: templates/web/default/report/new/councils_text_all.html:12 +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:6 +#: templates/web/default/report/new/councils_text_all.html:17 +#: templates/web/default/report/new/councils_text_all.html:19 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:13 -#: templates/web/fixmystreet/report/new/councils_text_all.html:10 -#: templates/web/fixmystreet/report/new/councils_text_all.html:12 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:8 msgid "" @@ -452,11 +498,11 @@ msgid "" "FixMyStreet?" msgstr "Er du ein utviklar? Kunne du tenkja deg å bidra til FiksGataMi?" -#: templates/web/fixmystreet/footer.html:18 +#: templates/web/fixmystreet/footer.html:17 msgid "Are you a developer?" msgstr "" -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/footer.html:21 #, fuzzy msgid "Are you from a council?" msgstr "den lokale administrasjonen" @@ -492,15 +538,18 @@ msgstr "" msgid "By Date" msgstr "På dato" -#: templates/web/fixmystreet/around/display_location.html:75 -#: templates/web/fixmystreet/around/display_location.html:77 +#: templates/web/fixmystreet/around/display_location.html:80 +#: templates/web/fixmystreet/around/display_location.html:82 #, fuzzy msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>" msgstr "" "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over " "dette steget</a>.</small>" -#: templates/web/default/admin/council_contacts.html:31 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:657 +#: templates/web/bromley/report/new/fill_in_details_form.html:68 +#: templates/web/default/admin/council_contacts.html:35 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/list_flagged.html:14 #: templates/web/default/admin/search_reports.html:17 @@ -512,45 +561,45 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:552 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:582 -#: templates/web/default/admin/council_contacts.html:68 +#: templates/web/default/admin/council_contacts.html:72 #: templates/web/default/admin/council_edit.html:23 #: templates/web/default/admin/report_edit.html:25 #: templates/web/default/report/new/fill_in_details_form.html:67 msgid "Category:" msgstr "Kategori:" -#: bin/send-reports:181 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:334 msgid "Category: %s" msgstr "Kategori: %s" #: templates/web/default/auth/change_password.html:1 #: templates/web/default/auth/change_password.html:3 #: templates/web/default/auth/change_password.html:33 -#: templates/web/fixmystreet/auth/change_password.html:1 -#: templates/web/fixmystreet/auth/change_password.html:3 -#: templates/web/fixmystreet/auth/change_password.html:33 msgid "Change Password" msgstr "Byt passord" #: templates/web/fixmystreet/around/display_location.html:72 +#: templates/web/fixmystreet/around/display_location.html:73 #, fuzzy msgid "Click map to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:24 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Closed" msgstr "Lukka" # skal det vera forskjellig tyding frå engelsken her? --KBU -#: perllib/FixMyStreet/DB/Result/Problem.pm:641 +#: perllib/FixMyStreet/DB/Result/Problem.pm:690 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -562,8 +611,8 @@ msgstr "Lukka rapportar" msgid "Closed:" msgstr "Lukka:" -#: templates/web/default/around/display_location.html:101 #: templates/web/default/around/display_location.html:103 +#: templates/web/default/around/display_location.html:105 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" @@ -587,28 +636,27 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 +#: perllib/FixMyStreet/App/Controller/Admin.pm:358 msgid "Configuration updated" msgstr "Oppsett oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:361 +#: perllib/FixMyStreet/App/Controller/Admin.pm:372 msgid "Configuration updated - contacts will be generated automatically later" msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" -#: templates/web/default/admin/council_contacts.html:124 +#: templates/web/default/admin/council_contacts.html:153 msgid "Configure Open311" msgstr "Sett opp Open311" -#: templates/web/default/admin/council_contacts.html:101 +#: templates/web/default/admin/council_contacts.html:105 msgid "Configure Open311 integration" msgstr "Sett opp Open311-integrasjon" -#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:42 msgid "Confirm" msgstr "Stadfest" #: templates/web/default/auth/token.html:1 -#: templates/web/fixmystreet/auth/token.html:1 msgid "Confirm account" msgstr "Stadfest konto" @@ -622,8 +670,8 @@ msgstr "Stadfest konto" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/default/admin/council_contacts.html:33 -#: templates/web/default/admin/council_contacts.html:78 +#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:82 #: templates/web/default/admin/council_edit.html:28 #: templates/web/default/admin/council_edit.html:43 #: templates/web/default/admin/stats.html:5 @@ -644,6 +692,7 @@ msgstr "Kontakt" msgid "Contact FixMyStreet" msgstr "Kontakt FiksGataMi" +#: templates/web/bromley/contact/submit.html:1 #: templates/web/default/contact/index.html:1 #: templates/web/default/contact/index.html:2 #: templates/web/default/contact/submit.html:1 @@ -652,14 +701,15 @@ msgstr "Kontakt FiksGataMi" msgid "Contact Us" msgstr "Kontakt oss" +#: templates/web/bromley/contact/submit.html:3 #: templates/web/default/contact/index.html:6 #: templates/web/default/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:7 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1135 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1150 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -670,7 +720,7 @@ msgstr "Kunne ikkje finna brukaren" msgid "Council" msgstr "Administrasjon" -#: perllib/FixMyStreet/App/Controller/Admin.pm:979 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1022 #: templates/web/default/admin/council_list.html:1 msgid "Council contacts" msgstr "Administrasjonskontaktar" @@ -698,7 +748,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/default/admin/council_contacts.html:92 +#: templates/web/default/admin/council_contacts.html:96 msgid "Create category" msgstr "Lag kategori" @@ -721,13 +771,19 @@ msgstr "Gjeldande tilstand" msgid "Currently has 1+ deleted" msgstr "For tida har 1+ sletta" -#: templates/web/default/admin/council_contacts.html:34 -#: templates/web/default/admin/council_contacts.html:81 +#: templates/web/default/dashboard/index.html:5 +#: templates/web/default/dashboard/index.html:7 +msgid "Dashboard" +msgstr "" + +#: templates/web/default/admin/council_contacts.html:38 +#: templates/web/default/admin/council_contacts.html:85 #: templates/web/default/admin/council_edit.html:29 #: templates/web/default/admin/council_edit.html:44 msgid "Deleted" msgstr "Sletta" +#: templates/web/bromley/report/new/fill_in_details_form.html:54 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:64 #, fuzzy msgid "Details" @@ -744,8 +800,8 @@ msgstr "Arbeidshestar" #: templates/web/default/auth/general.html:32 #: templates/web/fixmystreet/auth/general.html:29 -#: templates/web/fixmystreet/report/display.html:133 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147 +#: templates/web/fixmystreet/report/display.html:128 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:150 msgid "Do you have a FixMyStreet password?" msgstr "Har du eit FiksGataMi-passord?" @@ -776,7 +832,8 @@ msgstr "Redigerer brukar %d" msgid "Editor" msgstr "Oppdatert av" -#: templates/web/default/admin/council_contacts.html:32 +#: templates/web/bromley/report/display.html:126 +#: templates/web/default/admin/council_contacts.html:36 #: templates/web/default/admin/council_edit.html:42 #: templates/web/default/admin/list_flagged.html:12 #: templates/web/default/admin/list_flagged.html:35 @@ -785,45 +842,45 @@ msgstr "Oppdatert av" #: templates/web/default/admin/search_reports.html:15 #: templates/web/default/admin/search_users.html:13 #: templates/web/fixmystreet/auth/general.html:20 -#: templates/web/fixmystreet/report/display.html:125 +#: templates/web/fixmystreet/report/display.html:120 msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1126 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1080 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1123 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" -#: templates/web/default/around/display_location.html:83 +#: templates/web/default/around/display_location.html:85 msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" -#: templates/web/default/report/display.html:35 +#: templates/web/default/report/display.html:30 msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/default/admin/council_contacts.html:73 +#: templates/web/default/admin/council_contacts.html:77 #: templates/web/default/admin/council_edit.html:26 #: templates/web/default/admin/report_edit.html:31 #: templates/web/default/admin/update_edit.html:24 #: templates/web/default/admin/user_edit.html:11 #: templates/web/default/alert/updates.html:13 -#: templates/web/default/report/display.html:39 +#: templates/web/default/report/display.html:34 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:537 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:611 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:536 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:610 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:539 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:613 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" @@ -831,11 +888,11 @@ msgstr "Tomt kontor eller forretningsbygg" msgid "Empty property details form" msgstr "Tom eigedom detaljskjema" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:540 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:614 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:541 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:615 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -852,37 +909,45 @@ msgid "End month:" msgstr "Sluttmånad:" # GB – Great Britain? --KBU -#: 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 #: templates/web/emptyhomes/index.html:40 -#: templates/web/emptyhomes/index.html:43 -#: templates/web/fixmystreet/around/around_index.html:10 -#: templates/web/fixmystreet/around/around_index.html:13 -#: templates/web/fixmystreet/index.html:32 -#: templates/web/fixmystreet/index.html:35 +#: templates/web/emptyhomes/index.html:41 msgid "Enter a nearby GB postcode, or street name and area" msgstr "Skriv inn GB-postnummer i nærleiken, eller vegnamn og stad" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:32 +#: perllib/FixMyStreet/Cobrand/UK.pm:18 +#, fuzzy +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" +#: templates/web/default/around/postcode_form.html:1 +#: templates/web/default/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +#, fuzzy +msgid "Enter a nearby street name and area" +msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" + #: templates/web/default/auth/general.html:64 -#: templates/web/default/report/display.html:176 +#: templates/web/default/report/display.html:171 #: templates/web/default/report/new/fill_in_details_form.html:169 msgid "Enter a new password:" msgstr "Skriv inn eit nytt passord:" +#: templates/web/bromley/report/display.html:148 +#: templates/web/bromley/report/new/fill_in_details_form.html:189 #: templates/web/fixmystreet/auth/general.html:57 -#: templates/web/fixmystreet/report/display.html:165 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 +#: templates/web/fixmystreet/report/display.html:160 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:200 #, fuzzy msgid "Enter a password" msgstr "Skriv inn eit nytt passord:" -#: templates/web/default/index.html:44 templates/web/emptyhomes/index.html:60 -#: templates/web/fixmystreet/index.html:55 +#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:58 +#: templates/web/fixmystreet/index.html:41 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -893,7 +958,6 @@ msgstr "Legg inn detaljar om problemet" #: templates/web/default/tokens/abuse.html:3 #: templates/web/default/tokens/error.html:1 #: templates/web/default/tokens/error.html:3 -#: templates/web/fixmystreet/auth/token.html:5 msgid "Error" msgstr "Feil" @@ -906,6 +970,12 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" +#: templates/web/default/admin/report_edit.html:40 +#, fuzzy +msgid "Extra data:" +msgstr "Data om merkevaresamarbeid:" + +#: templates/web/bromley/contact/submit.html:14 #: templates/web/default/contact/submit.html:15 msgid "" "Failed to send message. Please try again, or <a href=\"mailto:%s\">email " @@ -914,6 +984,13 @@ msgstr "" "Klarte ikkje å senda meldinga. Ver venleg og prøv igjen seinare eller <a " "href=\"mailto:%s\">send oss ein e-post</a>." +#: templates/web/bromley/report/display.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:113 +#: templates/web/bromley/report/new/fill_in_details_form.html:160 +#, fuzzy +msgid "First Name" +msgstr "Første gong" + #: templates/web/default/questionnaire/index.html:79 #: templates/web/fixmystreet/questionnaire/index.html:73 msgid "First time" @@ -937,13 +1014,7 @@ msgstr "FiksGataMi-administrator:" msgid "FixMyStreet administration" msgstr "Fiksgatami-administrasjon" -#: templates/web/fixmystreet/static/for_councils.html:1 -#, fuzzy -msgid "FixMyStreet for Councils" -msgstr "Finn ut om FiksGataMi for det offentlege" - -#: templates/web/default/alert/index.html:6 -#: templates/web/fixmystreet/alert/index.html:6 +#: templates/web/default/alert/index.html:11 msgid "" "FixMyStreet has a variety of RSS feeds and email alerts for local problems, " "including\n" @@ -957,8 +1028,8 @@ msgstr "" "innan ein gitt distanse frå ein viss posisjon." # var bokmålen tilstrekkeleg her? --KBU -#: templates/web/default/alert/list.html:98 -#: templates/web/fixmystreet/alert/_list.html:69 +#: templates/web/default/alert/_list.html:71 +#: templates/web/fixmystreet/alert/_list.html:73 msgid "" "FixMyStreet sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular " @@ -974,14 +1045,18 @@ msgstr "" "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, " "problem som gjeld fleire administrasjonar vert send til alle dei det gjeld." -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:20 +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/index.html:36 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/banner.html:12 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "Fixed" msgstr "Løyst" @@ -1011,14 +1086,14 @@ msgstr "Flagg brukar" msgid "Flagged" msgstr "Flagga:" -#: templates/web/default/admin/report_edit.html:41 +#: templates/web/default/admin/report_edit.html:42 #: templates/web/default/admin/user_edit.html:18 msgid "Flagged:" msgstr "Flagga:" -#: templates/web/default/reports/council.html:24 -#: templates/web/default/reports/council.html:87 +#: templates/web/default/reports/_ward-list.html:3 #: templates/web/emptyhomes/reports/council.html:19 +#: templates/web/fixmystreet/reports/_ward-list.html:4 msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." @@ -1032,6 +1107,8 @@ msgstr "For administrasjon(ane):" #: templates/web/fiksgatami/faq/faq-nb.html:1 #: templates/web/fiksgatami/nn/faq/faq-nn.html:1 #: templates/web/fixmystreet/faq/faq-en-gb.html:1 +#: templates/web/fixmystreet/static/privacy.html:1 +#: templates/web/zurich/faq/faq-de.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" @@ -1043,31 +1120,37 @@ msgstr "Meir informasjon om arbeidet vårt med tomme heimar." msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" -#: templates/web/fixmystreet/report/display.html:28 +#: templates/web/bromley/report/display.html:30 +#: templates/web/fixmystreet/report/display.html:23 #, fuzzy msgid "Get updates" msgstr "Siste oppdatering:" -#: templates/web/default/reports/council.html:72 +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +#, fuzzy +msgid "Get updates of %s problems" +msgstr "RSS-straum for problem i denne %s-en" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 #, fuzzy msgid "Get updates of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: templates/web/default/alert/list.html:110 -#: templates/web/fixmystreet/alert/_list.html:78 +#: templates/web/default/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Gje meg ein RSS-straum" -#: templates/web/default/alert/index.html:24 -#: templates/web/default/around/around_index.html:17 -#: templates/web/default/index.html:33 templates/web/emptyhomes/index.html:49 -#: templates/web/fixmystreet/alert/index.html:25 -#: templates/web/fixmystreet/around/around_index.html:20 -#: templates/web/fixmystreet/index.html:42 +#: templates/web/default/alert/index.html:34 +#: templates/web/default/around/postcode_form.html:8 +#: templates/web/emptyhomes/index.html:47 +#: templates/web/fixmystreet/around/postcode_form.html:18 msgid "Go" msgstr "Hald fram" -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" @@ -1095,7 +1178,8 @@ msgstr "" "Har du rapportert eit problem til ein administrasjon før, eller er dette " "første gongen?" -#: templates/web/bromley/footer.html:41 templates/web/default/footer.html:15 +#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 +#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15 #: templates/web/emptyhomes/header.html:28 #: templates/web/fiksgatami/footer.html:9 #: templates/web/fiksgatami/nn/footer.html:9 @@ -1104,13 +1188,16 @@ msgstr "" msgid "Help" msgstr "Hjelp" -#: templates/web/default/alert/list.html:37 +#: templates/web/default/alert/_list.html:6 #: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." -#: templates/web/bromley/header.html:46 -#: templates/web/fixmystreet/header.html:46 +#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 +#: templates/web/bromley/header.html:99 +#: templates/web/fixmybarangay/header.html.orig:42 +#: templates/web/fixmystreet/header.html:47 +#: templates/web/zurich/header.html:47 msgid "Hi %s" msgstr "" @@ -1134,12 +1221,12 @@ msgstr "Skjul nåler" msgid "History" msgstr "Historie" -#: templates/web/default/index.html:39 templates/web/emptyhomes/index.html:55 -#: templates/web/fixmystreet/index.html:50 +#: templates/web/default/index.html:28 templates/web/emptyhomes/index.html:53 +#: templates/web/fixmystreet/index.html:36 msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:592 +#: perllib/FixMyStreet/App/Controller/Admin.pm:637 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1147,7 +1234,7 @@ msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:43 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:44 msgid "" "I'm afraid we couldn't validate that token, as the report was made too long " "ago." @@ -1155,7 +1242,7 @@ msgstr "" "Eg er redd vi ikkje kunne verifisera den referansen, då det er for lenge " "sidan rapporten vart laga." -#: perllib/FixMyStreet/App/Controller/Tokens.pm:233 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:235 msgid "" "I'm afraid we couldn't validate that token. If you've copied the URL from an " "email, please check that you copied it exactly.\n" @@ -1171,8 +1258,6 @@ msgstr "ID" #: templates/web/default/report/new/councils_text_none.html:11 #: templates/web/default/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:10 -#: templates/web/fixmystreet/report/new/councils_text_none.html:9 msgid "" "If you submit a problem here the subject and details of the problem will be " "public, but the problem will <strong>not</strong> be reported to the council." @@ -1194,7 +1279,6 @@ msgstr "" #: templates/web/default/auth/token.html:23 #: templates/web/default/email_sent.html:24 -#: templates/web/fixmystreet/auth/token.html:23 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 " @@ -1223,12 +1307,16 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig val av straum" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:82 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:20 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:86 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:81 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:138 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:81 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:76 msgid "In Progress" msgstr "Under arbeid" @@ -1244,7 +1332,7 @@ msgstr "" "av description), interface_used, comment_count, requestor_name (berre " "tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:29 +#: templates/web/fixmystreet/report/banner.html:19 #, fuzzy msgid "In progress" msgstr "Under arbeid" @@ -1253,32 +1341,36 @@ msgstr "Under arbeid" msgid "Include unconfirmed reports" msgstr "Inkluder ikkje-stadfesta problem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:358 +#: perllib/FixMyStreet/App/Controller/Open311.pm:356 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: perllib/FixMyStreet/App/Controller/Open311.pm:343 +#: perllib/FixMyStreet/App/Controller/Open311.pm:341 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:899 +#: perllib/FixMyStreet/App/Controller/Admin.pm:942 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:426 +#: perllib/FixMyStreet/App/Controller/Open311.pm:432 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:889 +#: perllib/FixMyStreet/App/Controller/Admin.pm:932 msgid "Invalid start date" msgstr "Ugyldig startdato" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 msgid "Investigating" msgstr "Undersøkjer" @@ -1295,16 +1387,25 @@ msgid "" "your concerns about this property to the council is a valuable first step." msgstr "" +#: templates/web/bromley/report/display.html:166 +#: templates/web/bromley/report/new/fill_in_details_form.html:209 #: templates/web/default/auth/general.html:44 -#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:151 #: templates/web/default/report/new/fill_in_details_form.html:149 #: templates/web/fixmystreet/auth/general.html:42 -#: templates/web/fixmystreet/report/display.html:149 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:164 +#: templates/web/fixmystreet/report/display.html:144 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" -#: templates/web/default/admin/council_contacts.html:35 +#: templates/web/bromley/report/display.html:195 +#: templates/web/bromley/report/new/fill_in_details_form.html:119 +#: templates/web/bromley/report/new/fill_in_details_form.html:166 +#, fuzzy +msgid "Last Name" +msgstr "Siste oppdatering:" + +#: templates/web/default/admin/council_contacts.html:39 msgid "Last editor" msgstr "Sist redigert av" @@ -1316,14 +1417,16 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:985 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1028 msgid "List Flagged" msgstr "Vis flagga" -#: templates/web/default/admin/council_contacts.html:13 +#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:16 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" +#: templates/web/bromley/report/new/fill_in_details_form.html:69 #: templates/web/default/report/new/fill_in_details_form.html:68 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 msgid "Loading..." @@ -1340,12 +1443,6 @@ msgstr "Lastar …" #: templates/web/default/tokens/confirm_alert.html:3 #: templates/web/emptyhomes/alert/index.html:1 #: templates/web/emptyhomes/alert/index.html:3 -#: templates/web/fixmystreet/alert/choose.html:1 -#: templates/web/fixmystreet/alert/choose.html:3 -#: templates/web/fixmystreet/alert/index.html:1 -#: templates/web/fixmystreet/alert/index.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:5 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" @@ -1354,14 +1451,11 @@ msgstr "Lokal RSS-straum og e-postvarsel" #: templates/web/default/alert/list.html:12 #: templates/web/default/alert/list.html:14 #: templates/web/default/alert/list.html:3 -#: templates/web/fixmystreet/alert/list.html:1 -#: templates/web/fixmystreet/alert/list.html:12 -#: templates/web/fixmystreet/alert/list.html:14 -#: templates/web/fixmystreet/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-straum og e-postvarsel for «%s»" -#: templates/web/bromley/footer.html:39 templates/web/default/footer.html:13 +#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 +#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13 #: templates/web/fiksgatami/footer.html:8 #: templates/web/fiksgatami/nn/footer.html:8 #: templates/web/fixmystreet/footer.html:51 @@ -1369,12 +1463,12 @@ msgstr "Lokal RSS-straum og e-postvarsel for «%s»" msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/default/index.html:43 templates/web/emptyhomes/index.html:59 -#: templates/web/fixmystreet/index.html:54 +#: templates/web/default/index.html:32 templates/web/emptyhomes/index.html:57 +#: templates/web/fixmystreet/index.html:40 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: perllib/FixMyStreet/Map/OSM.pm:43 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "" "Map © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/" "\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/" @@ -1393,7 +1487,7 @@ msgstr "Melding:" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:440 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1401,7 +1495,7 @@ msgstr "Manglar jurisdiction_id" msgid "Month" msgstr "Månad" -#: templates/web/default/report/display.html:31 +#: templates/web/default/report/display.html:26 msgid "More problems nearby" msgstr "Fleire problem i nærleiken" @@ -1415,9 +1509,9 @@ msgstr "Fleire problem i nærleiken" #: templates/web/fiksgatami/nn/reports/index.html:9 #: templates/web/fiksgatami/reports/index.html:9 #: templates/web/fixmystreet/auth/general.html:52 -#: templates/web/fixmystreet/report/display.html:181 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:114 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:171 +#: templates/web/fixmystreet/report/display.html:177 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:117 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176 msgid "Name" msgstr "Namn" @@ -1433,7 +1527,7 @@ msgstr "Namn:" msgid "Navigation" msgstr "Navigasjon" -#: perllib/FixMyStreet/Geocode/OSM.pm:100 +#: perllib/FixMyStreet/Geocode/OSM.pm:159 msgid "" "Nearest named road to the pin placed on the map (automatically generated " "using OpenStreetMap): %s%s" @@ -1441,7 +1535,7 @@ msgstr "" "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved " "hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/Default.pm:480 +#: perllib/FixMyStreet/Cobrand/UK.pm:161 msgid "" "Nearest postcode to the pin placed on the map (automatically generated): %s " "(%sm away)" @@ -1449,8 +1543,8 @@ msgstr "" "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s " "(%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:469 -#: perllib/FixMyStreet/Cobrand/Default.pm:520 +#: perllib/FixMyStreet/Cobrand/Default.pm:404 +#: perllib/FixMyStreet/Cobrand/Default.pm:444 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " "Maps): %s" @@ -1458,7 +1552,7 @@ msgstr "" "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av " "Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:242 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:245 #, fuzzy msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing " @@ -1477,7 +1571,7 @@ msgstr "Nesten ferdig! No må du sjekka e-posten din …" msgid "New <br>problems" msgstr "Nye problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/App/Controller/Admin.pm:314 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1547,15 +1641,15 @@ msgstr "Ny tilstand" msgid "New!" msgstr "Ny!" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:4 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:28 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/update_edit.html:16 #: templates/web/default/questionnaire/creator_fixed.html:16 #: templates/web/default/questionnaire/index.html:107 @@ -1570,7 +1664,7 @@ msgstr "Nei" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:320 +#: perllib/FixMyStreet/DB/Result/Problem.pm:328 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1590,13 +1684,13 @@ msgstr "Fann ingen flagga brukarar" msgid "No info at all" msgstr "Heilt utan informasjon" -#: templates/web/default/around/around_map_list_items.html:15 -#: templates/web/fixmystreet/around/around_map_list_items.html:24 +#: templates/web/default/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 msgid "No problems found." msgstr "Fann ingen problem." -#: templates/web/default/around/on_map_list_items.html:12 -#: templates/web/fixmystreet/around/on_map_list_items.html:21 +#: templates/web/default/around/on_map_list_items.html:14 +#: templates/web/fixmystreet/around/on_map_list_items.html:6 msgid "No problems have been reported yet." msgstr "Ingen problem er rapporterte" @@ -1609,13 +1703,13 @@ msgstr "Ingen" msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" -#: templates/web/default/report/_main.html:9 +#: templates/web/default/report/_main.html:11 #: templates/web/emptyhomes/report/display.html:24 -#: templates/web/fixmystreet/report/_main.html:11 +#: templates/web/fixmystreet/report/_main.html:13 msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/default/admin/council_contacts.html:36 +#: templates/web/default/admin/council_contacts.html:40 #: templates/web/default/admin/council_edit.html:46 msgid "Note" msgstr "Merk" @@ -1630,7 +1724,7 @@ msgstr "" "var oppretta. Det treng vera den same månaden som rapporten var stadfesta, " "så tala kan hoppa litt opp og ned." -#: templates/web/default/admin/council_contacts.html:85 +#: templates/web/default/admin/council_contacts.html:89 #: templates/web/default/admin/council_edit.html:31 msgid "Note:" msgstr "Merk:" @@ -1639,7 +1733,7 @@ msgstr "Merk:" msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:149 #, fuzzy msgid "Now to submit your report…" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" @@ -1648,16 +1742,16 @@ msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" -#: templates/web/fixmystreet/report/display.html:132 +#: templates/web/fixmystreet/report/display.html:127 #, fuzzy msgid "Now to submit your update…" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" -#: templates/web/default/report/display.html:138 +#: templates/web/default/report/display.html:133 msgid "Now to submit your update… do you have a FixMyStreet password?" msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" -#: templates/web/default/report/display.html:26 +#: templates/web/default/report/display.html:21 #: templates/web/default/report/update.html:16 msgid "Offensive? Unsuitable? Tell us" msgstr "Støytande? Upassende? Sei frå" @@ -1698,10 +1792,12 @@ msgstr "Eldre løyste" msgid "Older problems" msgstr "Eldre problem" +#: templates/web/bromley/report/display.html:80 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/update_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/fixmystreet/report/display.html:79 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/report/display.html:79 +#: templates/web/fixmystreet/report/display.html:74 msgid "Open" msgstr "Opne" @@ -1721,13 +1817,13 @@ msgstr "Nettsida til Open311-initiativet" msgid "Open311 specification" msgstr "Open311-spesifikasjon" -#: templates/web/default/alert/list.html:85 -#: templates/web/fixmystreet/alert/_list.html:56 +#: templates/web/default/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 msgid "Or problems reported to:" msgstr "Eller problem meldt til:" -#: templates/web/default/alert/list.html:61 -#: templates/web/fixmystreet/alert/_list.html:33 +#: templates/web/default/alert/_list.html:33 +#: templates/web/fixmystreet/alert/_list.html:36 msgid "" "Or you can subscribe to an alert based upon what ward or council you’" "re in:" @@ -1735,14 +1831,15 @@ msgstr "" "Eller du kan abonnera på varsel basert på bydel eller administrasjon du " "høyrer til under:" -#: bin/send-reports:176 bin/send-reports:185 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:568 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:581 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 -#: perllib/FixMyStreet/DB/Result/Problem.pm:489 -#: perllib/FixMyStreet/DB/Result/Problem.pm:499 -#: perllib/FixMyStreet/DB/Result/Problem.pm:509 -#: perllib/FixMyStreet/DB/Result/Problem.pm:521 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:655 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 +#: perllib/FixMyStreet/DB/Result/Problem.pm:497 +#: perllib/FixMyStreet/DB/Result/Problem.pm:507 +#: perllib/FixMyStreet/DB/Result/Problem.pm:517 +#: perllib/FixMyStreet/DB/Result/Problem.pm:529 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:338 msgid "Other" msgstr "Anna" @@ -1768,53 +1865,62 @@ msgstr "Fann ikkje sida" msgid "Partial" msgstr "Delvis" +#: templates/web/bromley/report/display.html:145 +#: templates/web/bromley/report/new/fill_in_details_form.html:186 #: templates/web/fixmystreet/auth/general.html:55 -#: templates/web/fixmystreet/report/display.html:162 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 +#: templates/web/fixmystreet/report/display.html:157 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197 #, fuzzy msgid "Password (optional)" msgstr "(valfritt)" #: templates/web/default/auth/change_password.html:25 -#: templates/web/fixmystreet/auth/change_password.html:25 msgid "Password:" msgstr "Passord:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:188 +#: templates/web/bromley/report/new/fill_in_details_form.html:136 +#: templates/web/bromley/report/new/fill_in_details_form.html:183 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:194 #, fuzzy msgid "Phone number (optional)" msgstr "(valfritt)" -#: bin/send-reports:70 templates/web/default/admin/report_edit.html:32 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:260 +#: templates/web/default/admin/report_edit.html:32 #: templates/web/default/report/new/fill_in_details_form.html:215 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/display.html:108 +#: templates/web/bromley/report/display.html:109 +#: templates/web/bromley/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/report/display.html:103 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:108 #, fuzzy msgid "Photo" msgstr "Bilete:" #: templates/web/default/questionnaire/index.html:95 -#: templates/web/default/report/display.html:114 +#: templates/web/default/report/display.html:109 #: templates/web/default/report/new/fill_in_details_form.html:102 #: templates/web/fixmystreet/questionnaire/index.html:90 msgid "Photo:" msgstr "Bilete:" -#: templates/web/default/alert/list.html:27 -#: templates/web/fixmystreet/alert/list.html:27 +#: templates/web/default/alert/list.html:26 msgid "Photos of recent nearby reports" msgstr "Bilete av nye problem i nærleiken" +#: templates/web/bromley/report/display.html:80 +#: templates/web/bromley/report/display.html:81 #: templates/web/default/admin/report_edit.html:18 #: templates/web/default/admin/report_edit.html:19 -#: templates/web/default/report/display.html:84 -#: templates/web/default/report/display.html:85 -#: templates/web/fixmystreet/report/display.html:79 -#: templates/web/fixmystreet/report/display.html:80 +#: templates/web/default/dashboard/index.html:136 +#: templates/web/default/dashboard/index.html:137 +#: templates/web/default/report/display.html:79 +#: templates/web/default/report/display.html:80 +#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/fixmystreet/report/display.html:75 msgid "Planned" msgstr "Planlagt" @@ -1832,13 +1938,10 @@ msgstr "Ver høfleg, poengtert og kortfatta." #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:17 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:17 msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" #: templates/web/default/auth/token.html:17 -#: templates/web/fixmystreet/auth/token.html:17 msgid "Please check your email" msgstr "Ver venleg og sjekk e-posten du oppgav" @@ -1849,18 +1952,25 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:739 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:758 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:795 -#: perllib/FixMyStreet/DB/Result/Problem.pm:339 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:819 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:826 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:845 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:884 +#: perllib/FixMyStreet/DB/Result/Problem.pm:347 #: templates/web/default/js/validation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:345 +#: perllib/FixMyStreet/DB/Result/Problem.pm:353 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" +#: templates/web/bromley/report/new/fill_in_details_form.html:64 +msgid "" +"Please describe the exact location of the report. Example: “2 dumped " +"mattresses outside Number 19 Stockwell Close”" +msgstr "" + #: templates/web/default/contact/blurb.html:2 msgid "" "Please do <strong>not</strong> report problems through this form; messages " @@ -1882,42 +1992,40 @@ msgstr "" "Ikkje ver ufin — å kjefta på administrasjonen din skader verdet av " "tenesta for alle brukarane." -#: perllib/FixMyStreet/DB/Result/Comment.pm:113 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: templates/web/default/js/validation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:15 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:15 msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:97 -#: perllib/FixMyStreet/DB/Result/Problem.pm:314 +#: perllib/FixMyStreet/DB/Result/Problem.pm:322 #: templates/web/default/js/validation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/DB/Result/User.pm:96 +#: perllib/FixMyStreet/DB/Result/User.pm:104 #: templates/web/default/js/validation_strings.html:12 #: templates/web/default/js/validation_strings.html:16 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" -#: perllib/FixMyStreet/App/Controller/Alert.pm:342 +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 #: perllib/FixMyStreet/App/Controller/Contact.pm:107 msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:317 +#: perllib/FixMyStreet/DB/Result/Problem.pm:325 #: templates/web/default/js/validation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:96 -#: perllib/FixMyStreet/DB/Result/User.pm:93 +#: perllib/FixMyStreet/DB/Result/User.pm:101 #: templates/web/default/auth/general.html:13 #: templates/web/default/auth/general.html:8 #: templates/web/default/js/validation_strings.html:11 @@ -1927,12 +2035,18 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:143 +#: templates/web/bromley/report/new/fill_in_details_form.html:149 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:146 #, fuzzy msgid "Please enter your email address" msgstr "Ver venleg og legg inn e-posten din" -#: perllib/FixMyStreet/DB/Result/Problem.pm:332 +#: templates/web/default/js/validation_strings.html:19 +#, fuzzy +msgid "Please enter your first name" +msgstr "Ver venleg og legg inn namnet ditt" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:340 #: templates/web/default/js/validation_strings.html:7 #, fuzzy msgid "" @@ -1944,13 +2058,23 @@ msgstr "" "visast." #: perllib/FixMyStreet/App/Controller/Contact.pm:95 -#: perllib/FixMyStreet/DB/Result/Comment.pm:110 -#: perllib/FixMyStreet/DB/Result/Problem.pm:325 -#: perllib/FixMyStreet/DB/Result/User.pm:89 +#: perllib/FixMyStreet/DB/Result/Comment.pm:143 +#: perllib/FixMyStreet/DB/Result/Problem.pm:333 +#: perllib/FixMyStreet/DB/Result/User.pm:97 #: templates/web/default/js/validation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" +#: templates/web/default/js/validation_strings.html:20 +#, fuzzy +msgid "Please enter your second name" +msgstr "Ver venleg og legg inn namnet ditt" + +#: templates/web/default/js/validation_strings.html:18 +#, fuzzy +msgid "Please enter your title" +msgstr "Ver venleg og legg inn e-posten din" + #: templates/web/emptyhomes/report/new/fill_in_details_text.html:1 msgid "" "Please fill in details of the empty property below, saying what type of\n" @@ -1992,6 +2116,7 @@ msgstr "" msgid "Please fill in details of the problem." msgstr "Ver venleg og fyll ut detaljar om problemet under." +#: templates/web/bromley/report/new/fill_in_details_form.html:28 #: templates/web/default/report/new/fill_in_details_form.html:27 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:34 msgid "" @@ -2005,8 +2130,11 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" -#: templates/web/default/report/display.html:61 -#: templates/web/fixmystreet/report/display.html:59 +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3 +msgid "Please note that updates are not sent to the council." +msgstr "" + +#: templates/web/default/report/display.html:56 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 " @@ -2017,6 +2145,19 @@ msgstr "" "Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy" "\">personvernpolicyen vår</a>" +#: templates/web/barnet/report/updates-sidebar-notes.html:1 +#, fuzzy +msgid "" +"Please note that updates are not sent to the relevant department. 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 "" +"Merk at oppdateringar ikkje vert sende til administrasjonen. Viss du\n" +"legg igjen namnet ditt så vil det vera offentleg tilgjengeleg.\n" +"Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy" +"\">personvernpolicyen vår</a>" + +#: templates/web/bromley/report/new/fill_in_details_form.html:23 #: templates/web/default/report/new/fill_in_details_form.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:25 msgid "" @@ -2041,7 +2182,7 @@ msgstr "" msgid "Please provide some text as well as a photo" msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:115 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:237 msgid "" "Please say whether you've ever reported a problem to your council before" @@ -2065,27 +2206,36 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:843 +#: perllib/FixMyStreet/App/Controller/Photo.pm:176 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" +#: perllib/FixMyStreet/App/Controller/Photo.pm:183 +#, fuzzy +msgid "Please upload a JPEG image only\n" +msgstr "Ver venleg og berre last opp JPEG-bilete" + #: perllib/FixMyStreet/App/Controller/Contact.pm:98 msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/fixmystreet/report/display.html:74 +#: templates/web/bromley/report/display.html:70 +#: templates/web/fixmystreet/report/display.html:69 #, fuzzy msgid "Please write your update here" msgstr "Skriv inn ei melding" +#: templates/web/bromley/report/display.html:121 +#: templates/web/bromley/report/display.html:149 +#: templates/web/bromley/report/display.html:161 #: templates/web/default/contact/index.html:93 -#: templates/web/default/report/display.html:124 -#: templates/web/default/report/display.html:161 -#: templates/web/default/report/display.html:183 +#: templates/web/default/report/display.html:119 +#: templates/web/default/report/display.html:156 +#: templates/web/default/report/display.html:178 #: templates/web/fixmystreet/contact/index.html:93 -#: templates/web/fixmystreet/report/display.html:120 -#: templates/web/fixmystreet/report/display.html:144 -#: templates/web/fixmystreet/report/display.html:166 +#: templates/web/fixmystreet/report/display.html:115 +#: templates/web/fixmystreet/report/display.html:139 +#: templates/web/fixmystreet/report/display.html:161 msgid "Post" msgstr "Send inn" @@ -2093,11 +2243,11 @@ msgstr "Send inn" msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: templates/web/default/report/updates.html:17 +#: templates/web/default/report/updates.html:21 msgid "Posted by %s (<strong>%s</strong>) at %s" msgstr "Lagt inn av %s (<strong>%s</strong>) %s" -#: templates/web/default/report/updates.html:19 +#: templates/web/default/report/updates.html:23 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" @@ -2121,7 +2271,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:776 +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2133,17 +2283,18 @@ msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" msgid "Problems" msgstr "Problem" -#: templates/web/default/around/display_location.html:79 +#: templates/web/default/around/display_location.html:81 msgid "Problems in this area" msgstr "Problem i dette området" -#: templates/web/fixmystreet/around/display_location.html:93 -#: templates/web/fixmystreet/report/display.html:29 +#: templates/web/bromley/report/display.html:31 +#: templates/web/fixmystreet/around/display_location.html:98 +#: templates/web/fixmystreet/report/display.html:24 #, fuzzy msgid "Problems nearby" msgstr "Fleire problem i nærleiken" -#: templates/web/fixmystreet/around/display_location.html:92 +#: templates/web/fixmystreet/around/display_location.html:97 #, fuzzy msgid "Problems on the map" msgstr "Problem i dette området" @@ -2152,29 +2303,30 @@ msgstr "Problem i dette området" msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problem nyleg rapportert fiksa på FiksGataMi" -#: templates/web/default/alert/list.html:50 +#: templates/web/default/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:748 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:162 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:177 +#: perllib/FixMyStreet/Cobrand/Default.pm:609 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:95 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:162 +#: perllib/FixMyStreet/Cobrand/UK.pm:240 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:757 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:170 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:103 +#: perllib/FixMyStreet/Cobrand/UK.pm:254 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:17 +#: templates/web/default/reports/council.html:29 msgid "Problems within %s, FixMyStreet" msgstr "Problem innanfor %s, FiksGataMi" -#: templates/web/default/alert/list.html:67 -#: templates/web/fixmystreet/alert/_list.html:38 +#: templates/web/default/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" msgstr "Problem innanfor grensene av:" @@ -2182,24 +2334,37 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:543 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:617 msgid "Property type:" msgstr "Type eigenskap:" +#: templates/web/bromley/report/new/fill_in_details_form.html:52 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:62 #, fuzzy msgid "Provide a title" msgstr "Bidra med ei oppdatering" -#: templates/web/default/report/display.html:56 -#: templates/web/fixmystreet/report/display.html:55 +#: templates/web/bromley/report/display.html:57 +#: templates/web/default/report/display.html:51 +#: templates/web/fixmystreet/report/display.html:50 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/default/report/display.html:180 +#: templates/web/bromley/report/new/fill_in_details_form.html:180 +#, fuzzy +msgid "" +"Providing a password is optional, but doing so will allow you to more easily " +"report future problems, leave updates and manage your reports." +msgstr "" +"Det er valfritt å oppgje eit passord, men om du gjer det vil det verta " +"enklare for deg å rapportera problem, leggja inn oppdateringar og halda " +"oversyn over rapportane dine" + +#: templates/web/bromley/report/display.html:142 +#: templates/web/default/report/display.html:175 #: templates/web/default/report/new/fill_in_details_form.html:173 -#: templates/web/fixmystreet/report/display.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:185 +#: templates/web/fixmystreet/report/display.html:154 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:191 msgid "" "Providing a password is optional, but doing so will allow you to more easily " "report problems, leave updates and manage your reports." @@ -2214,9 +2379,9 @@ msgstr "" #: templates/web/default/questionnaire/index.html:14 #: templates/web/default/questionnaire/index.html:4 #: templates/web/fixmystreet/questionnaire/index.html:0 -#: templates/web/fixmystreet/questionnaire/index.html:15 -#: templates/web/fixmystreet/questionnaire/index.html:3 +#: templates/web/fixmystreet/questionnaire/index.html:14 #: templates/web/fixmystreet/questionnaire/index.html:32 +#: templates/web/fixmystreet/questionnaire/index.html:4 msgid "Questionnaire" msgstr "Spørjeskjema" @@ -2232,65 +2397,58 @@ msgstr "Spørjeskjema %d sendt for problem %d" msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" -#: templates/web/fixmystreet/static/for_councils_faq.html:1 -#, fuzzy -msgid "Questions and Answers :: FixMyStreet for Councils" -msgstr "Finn ut om FiksGataMi for det offentlege" - -#: templates/web/default/alert/list.html:52 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/alert/_list.html:21 #: templates/web/default/around/display_location.html:1 #: templates/web/default/around/display_location.html:3 -#: templates/web/default/report/display.html:47 -#: templates/web/default/reports/council.html:79 +#: templates/web/default/report/display.html:42 +#: templates/web/default/reports/_rss.html:1 #: templates/web/fixmystreet/alert/_list.html:22 #: templates/web/fixmystreet/alert/updates.html:9 #: templates/web/fixmystreet/around/display_location.html:1 #: templates/web/fixmystreet/around/display_location.html:3 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/Default.pm:786 -#: perllib/FixMyStreet/Cobrand/Default.pm:800 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:793 -#: perllib/FixMyStreet/Cobrand/Default.pm:807 +#: perllib/FixMyStreet/Cobrand/UK.pm:289 perllib/FixMyStreet/Cobrand/UK.pm:301 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:816 -#: perllib/FixMyStreet/Cobrand/Default.pm:830 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:193 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:201 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:211 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:219 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:178 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:186 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:196 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:204 +#: perllib/FixMyStreet/Cobrand/UK.pm:309 perllib/FixMyStreet/Cobrand/UK.pm:321 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:822 -#: perllib/FixMyStreet/Cobrand/Default.pm:836 +#: perllib/FixMyStreet/Cobrand/UK.pm:314 perllib/FixMyStreet/Cobrand/UK.pm:326 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" -#: templates/web/default/alert/list.html:52 +#: templates/web/default/alert/_list.html:21 #: templates/web/fixmystreet/alert/_list.html:22 msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: templates/web/default/reports/council.html:79 +#: templates/web/default/reports/_rss.html:1 msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:749 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:163 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:176 +#: perllib/FixMyStreet/Cobrand/Default.pm:610 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:96 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:161 +#: perllib/FixMyStreet/Cobrand/UK.pm:247 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:756 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:169 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:102 +#: perllib/FixMyStreet/Cobrand/UK.pm:253 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2301,16 +2459,18 @@ msgstr "RSS-straum for problem innanfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" -#: templates/web/default/report/display.html:47 +#: templates/web/bromley/report/display.html:37 +#: templates/web/default/report/display.html:42 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:35 +#: templates/web/fixmystreet/report/display.html:30 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" +#: templates/web/bromley/report/display.html:39 #: templates/web/default/alert/updates.html:9 -#: templates/web/default/report/display.html:38 +#: templates/web/default/report/display.html:33 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:37 +#: templates/web/fixmystreet/report/display.html:32 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" @@ -2332,7 +2492,7 @@ msgstr "Nyleg løyste problem" msgid "Recently fixed" msgstr "Nyleg løyste problem" -#: templates/web/default/index.html:61 templates/web/fixmystreet/index.html:72 +#: templates/web/default/index.html:50 templates/web/fixmystreet/index.html:62 msgid "Recently reported problems" msgstr "Nyleg melde problem" @@ -2353,17 +2513,17 @@ msgstr "" msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/default/admin/report_edit.html:52 +#: templates/web/default/admin/report_edit.html:53 #: templates/web/default/admin/update_edit.html:48 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:77 +#: templates/web/emptyhomes/header.html:10 msgid "Report Empty Homes" msgstr "Rapporter tomme heimar" -#: templates/web/bromley/footer.html:33 templates/web/default/footer.html:7 -#: templates/web/emptyhomes/header.html:27 +#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 +#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:27 #: templates/web/fiksgatami/footer.html:5 #: templates/web/fiksgatami/nn/footer.html:5 #: templates/web/fixmystreet/footer.html:45 @@ -2371,7 +2531,8 @@ msgstr "Rapporter tomme heimar" msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/fixmystreet/report/display.html:27 +#: templates/web/bromley/report/display.html:28 +#: templates/web/fixmystreet/report/display.html:22 #, fuzzy msgid "Report abuse" msgstr "Rapporter eit problem" @@ -2381,23 +2542,24 @@ msgstr "Rapporter eit problem" msgid "Report empty properties" msgstr "Rapporter tomme heimar" -#: perllib/FixMyStreet/App/Controller/Rss.pm:281 +#: perllib/FixMyStreet/App/Controller/Rss.pm:277 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/default/index.html:15 templates/web/fixmystreet/index.html:28 +#: templates/web/default/index.html:15 +#: templates/web/fixmystreet/around/postcode_form.html:6 msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: templates/web/default/my/my.html:74 templates/web/fixmystreet/my/my.html:77 +#: templates/web/default/my/my.html:74 msgid "Reported %s" msgstr "Rapportert %s" -#: templates/web/default/my/my.html:72 templates/web/fixmystreet/my/my.html:75 +#: templates/web/default/my/my.html:72 msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:504 +#: perllib/FixMyStreet/DB/Result/Problem.pm:512 #: templates/web/default/contact/index.html:45 #: templates/web/fixmystreet/contact/index.html:46 msgid "Reported anonymously at %s" @@ -2409,33 +2571,33 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:496 +#: perllib/FixMyStreet/DB/Result/Problem.pm:504 msgid "Reported by %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:527 +#: perllib/FixMyStreet/DB/Result/Problem.pm:535 #: templates/web/default/contact/index.html:47 #: templates/web/fixmystreet/contact/index.html:48 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:518 +#: perllib/FixMyStreet/DB/Result/Problem.pm:526 msgid "Reported by %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:492 +#: perllib/FixMyStreet/DB/Result/Problem.pm:500 msgid "Reported by %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:512 +#: perllib/FixMyStreet/DB/Result/Problem.pm:520 msgid "Reported by %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:500 +#: perllib/FixMyStreet/DB/Result/Problem.pm:508 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:522 +#: perllib/FixMyStreet/DB/Result/Problem.pm:530 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" @@ -2443,14 +2605,14 @@ msgstr "Rapportert i kategorien %s av %s %s" #: 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_form.html:1 -#: templates/web/fixmystreet/around/around_index.html:1 +#: templates/web/fixmystreet/around/around_index.html:2 #: templates/web/fixmystreet/report/new/fill_in_details.html:0 #: templates/web/fixmystreet/report/new/fill_in_details.html:5 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "Legger til eit problem" -#: templates/web/default/around/display_location.html:93 +#: templates/web/default/around/display_location.html:95 msgid "Reports on and around the map" msgstr "Problem i og rundt kartet" @@ -2458,7 +2620,7 @@ msgstr "Problem i og rundt kartet" msgid "Resend report" msgstr "Send rapport på nytt" -#: perllib/FixMyStreet/Geocode/OSM.pm:107 +#: perllib/FixMyStreet/Geocode/OSM.pm:166 msgid "" "Road operator for this named road (derived from road reference number and " "type): %s" @@ -2466,7 +2628,7 @@ msgstr "" "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og " "type): %s" -#: perllib/FixMyStreet/Geocode/OSM.pm:104 +#: perllib/FixMyStreet/Geocode/OSM.pm:163 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" @@ -2474,7 +2636,7 @@ msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" msgid "Save changes" msgstr "Lagra endringar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1027 msgid "Search Abuse" msgstr "Søk etter misbruk" @@ -2482,13 +2644,13 @@ msgstr "Søk etter misbruk" msgid "Search Abuse Table" msgstr "Søk i misbruktabell" -#: perllib/FixMyStreet/App/Controller/Admin.pm:980 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1023 #: templates/web/default/admin/list_flagged.html:1 #: templates/web/default/admin/search_reports.html:1 msgid "Search Reports" msgstr "Søk i rapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:983 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1026 #: templates/web/default/admin/search_users.html:1 msgid "Search Users" msgstr "Søk i brukarar" @@ -2499,7 +2661,7 @@ msgstr "Søk i brukarar" msgid "Search:" msgstr "Søk:" -#: templates/web/default/alert/list.html:39 +#: templates/web/default/alert/_list.html:8 #: templates/web/fixmystreet/alert/_list.html:10 msgid "" "Select which type of alert you'd like and click the button for an RSS feed, " @@ -2508,7 +2670,7 @@ msgstr "" "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-" "kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel." -#: perllib/FixMyStreet/DB/Result/Problem.pm:569 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2541,11 +2703,14 @@ msgid "" " significant contribution to the supply of affordable homes in Wales." msgstr "" -#: templates/web/default/report/display.html:213 +#: templates/web/bromley/report/display.html:203 +#: templates/web/bromley/report/new/fill_in_details_form.html:129 +#: templates/web/bromley/report/new/fill_in_details_form.html:175 +#: templates/web/default/report/display.html:208 #: templates/web/default/report/new/fill_in_details_form.html:210 -#: templates/web/fixmystreet/report/display.html:189 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:123 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:180 +#: templates/web/fixmystreet/report/display.html:185 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:126 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:186 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" @@ -2559,13 +2724,14 @@ msgstr "" msgid "Show pins" msgstr "Vis nåler" -#: templates/web/bromley/header.html:50 #: templates/web/default/auth/general.html:3 #: templates/web/default/auth/general.html:49 +#: templates/web/fixmybarangay/header.html.orig:46 #: templates/web/fixmystreet/auth/general.html:3 #: templates/web/fixmystreet/auth/general.html:38 #: templates/web/fixmystreet/auth/general.html:58 -#: templates/web/fixmystreet/header.html:50 +#: templates/web/fixmystreet/header.html:51 +#: templates/web/zurich/header.html:51 msgid "Sign in" msgstr "Logg inn" @@ -2578,12 +2744,12 @@ msgstr "Logg inn via epost" msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" +#: templates/web/bromley/auth/sign_out.html:1 #: templates/web/default/auth/sign_out.html:1 #: templates/web/default/header.html:30 #: templates/web/emptyhomes/header.html:41 #: templates/web/fiksgatami/header.html:22 #: templates/web/fiksgatami/nn/header.html:22 -#: templates/web/fixmystreet/auth/sign_out.html:1 #: templates/web/lichfielddc/header.html:177 #: templates/web/reading/header.html:33 msgid "Sign out" @@ -2603,8 +2769,7 @@ msgstr "Logga inn som %s" msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" -#: templates/web/default/alert/index.html:30 -#: templates/web/fixmystreet/alert/index.html:33 +#: templates/web/default/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2617,7 +2782,7 @@ msgstr "Noko tekst å omsetja" msgid "Some unconfirmeds" msgstr "Nokre ustadfesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:428 +#: perllib/FixMyStreet/Cobrand/UK.pm:97 msgid "" "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2630,14 +2795,15 @@ msgstr "" "Orsak, men det oppstod eit problem når vi freista å stadfesta " "problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:147 -#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:53 -#: perllib/FixMyStreet/Geocode/Google.pm:68 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:27 perllib/FixMyStreet/Geocode/Bing.pm:51 +#: perllib/FixMyStreet/Geocode/Google.pm:69 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." #: perllib/FixMyStreet/Geocode/Bing.pm:46 -#: perllib/FixMyStreet/Geocode/Google.pm:60 +#: perllib/FixMyStreet/Geocode/Google.pm:64 +#: perllib/FixMyStreet/Geocode/OSM.pm:59 msgid "Sorry, we could not parse that location. Please try again." msgstr "" "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." @@ -2659,20 +2825,21 @@ msgstr "Startdag:" msgid "Start month:" msgstr "Startmånad:" +#: templates/web/bromley/report/display.html:78 #: templates/web/default/admin/list_flagged.html:18 #: templates/web/default/admin/list_updates.html:6 #: templates/web/default/admin/search_reports.html:21 -#: templates/web/fixmystreet/report/display.html:77 +#: templates/web/fixmystreet/report/display.html:72 msgid "State" msgstr "Tilstand" #: templates/web/default/admin/report_edit.html:17 #: templates/web/default/admin/update_edit.html:18 -#: templates/web/default/report/display.html:82 +#: templates/web/default/report/display.html:77 msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:986 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1029 #: templates/web/default/admin/stats.html:1 msgid "Stats" msgstr "Statistikk" @@ -2682,6 +2849,7 @@ msgstr "Statistikk" msgid "Still open, via questionnaire, %s" msgstr "Skal spørjeskjemaet sendast?" +#: templates/web/bromley/report/new/fill_in_details_form.html:48 #: templates/web/fixmystreet/contact/index.html:79 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:58 #, fuzzy @@ -2694,17 +2862,20 @@ msgstr "Emne:" msgid "Subject:" msgstr "Emne:" +#: templates/web/bromley/report/new/fill_in_details_form.html:140 +#: templates/web/bromley/report/new/fill_in_details_form.html:190 +#: templates/web/bromley/report/new/fill_in_details_form.html:204 #: templates/web/default/questionnaire/creator_fixed.html:19 #: templates/web/default/report/new/fill_in_details_form.html:114 #: templates/web/default/report/new/fill_in_details_form.html:154 #: templates/web/default/report/new/fill_in_details_form.html:176 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:137 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:162 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201 msgid "Submit" msgstr "Send inn" -#: templates/web/default/admin/report_edit.html:55 +#: templates/web/default/admin/report_edit.html:56 #: templates/web/default/admin/update_edit.html:51 #: templates/web/default/admin/user_edit.html:20 msgid "Submit changes" @@ -2715,19 +2886,20 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" +#: templates/web/bromley/report/display.html:44 #: templates/web/default/alert/updates.html:17 -#: templates/web/default/report/display.html:43 +#: templates/web/default/report/display.html:38 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:42 +#: templates/web/fixmystreet/report/display.html:37 msgid "Subscribe" msgstr "Abonner" -#: templates/web/default/alert/list.html:126 -#: templates/web/fixmystreet/alert/_list.html:88 +#: templates/web/default/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:978 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1021 #: templates/web/default/admin/index.html:1 msgid "Summary" msgstr "Oppsummering" @@ -2739,7 +2911,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:982 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1025 #: templates/web/default/admin/questionnaire.html:1 msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" @@ -2748,7 +2920,7 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Text" msgstr "Tekst" -#: templates/web/default/admin/council_contacts.html:14 +#: templates/web/default/admin/council_contacts.html:18 msgid "Text only version" msgstr "Tekst-utgåve" @@ -2804,8 +2976,17 @@ msgstr "" "Takk for at du brukar ReportEmptyHomes.com. Handlinga di bidreg\n" "allereie til å løyse Storbritannias krise med tomme heimar." -#: templates/web/default/around/around_index.html:43 -#: templates/web/fixmystreet/around/around_index.html:46 +#: templates/web/fixmystreet/around/around_index.html:27 +#, fuzzy +msgid "" +"Thanks for uploading your photo. We now need to locate your problem, so " +"please enter a nearby street name or postcode in the box above :" +msgstr "" +"Takk for at du lasta opp biletet ditt. No treng vi å plassera\n" +"problemet ditt, så ver venleg og skriv inn namn på ein veg i\n" +"nærleiken, eller eit postnummer, i boksen under :" + +#: templates/web/default/around/around_index.html:28 msgid "" "Thanks for uploading your photo. We now need to locate your problem, so " "please enter a nearby street name or postcode in the box below :" @@ -2827,32 +3008,33 @@ msgstr "" "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du " "har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:856 +#: perllib/FixMyStreet/App/Controller/Photo.pm:190 msgid "" "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." -#: templates/web/default/alert/index.html:12 -#: templates/web/fixmystreet/alert/index.html:12 +#: perllib/FixMyStreet/App/Controller/Council.pm:91 +#, fuzzy msgid "" -"That location does not appear to be covered by a council, perhaps it is " -"offshore - please try somewhere more specific." +"That location does not appear to be covered by a council; perhaps it is " +"offshore or outside the country. Please try again." msgstr "" "Den staden vert ikkje dekt av nokon administrasjon, kanskje det er til\n" "havs – ver venleg og prøv ein meir spesifikk stad." #: perllib/FixMyStreet/App/Controller/Location.pm:107 -msgid "That location does not appear to be in Britain; please try again." +#, fuzzy +msgid "That location does not appear to be in the UK; please try again." msgstr "" "Den staden synest ikkje å vera i Storbritannia. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:78 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:90 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:560 +#: perllib/FixMyStreet/App/Controller/Admin.pm:605 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -2860,17 +3042,6 @@ msgstr "Det problemet vil no sendast på nytt." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: templates/web/default/around/around_index.html:26 -#: templates/web/fixmystreet/around/around_index.html:29 -msgid "" -"That spot does not appear to be covered by a council. If you have tried to " -"report an issue past the shoreline, for example, please specify the closest " -"point on land." -msgstr "" -"Punktet ser ikkje ut til å vera dekt av ein administrasjon. Viss du til " -"dømes har freista å rapportera eit problem utanfor kysten, marker næraste " -"punkt på land." - #: templates/web/emptyhomes/static/about.html:7 msgid "The Empty Homes Agency" msgstr "" @@ -2903,7 +3074,6 @@ msgstr "" #: templates/web/default/auth/token.html:21 #: templates/web/default/email_sent.html:22 -#: templates/web/fixmystreet/auth/token.html:21 msgid "" "The confirmation email <strong>may</strong> take a few minutes to arrive " "— <em>please</em> be patient." @@ -2941,8 +3111,9 @@ msgid "" msgstr "" "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 #: perllib/FixMyStreet/App/Controller/Reports.pm:44 -#: perllib/FixMyStreet/App/Controller/Reports.pm:71 +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -2956,7 +3127,7 @@ msgstr "" "service_request_id, description, lat, long, media_url, status, " "requested_datetime, updated_datetime, service_code og service_name." -#: perllib/FixMyStreet/Geocode/OSM.pm:99 +#: perllib/FixMyStreet/Geocode/OSM.pm:158 msgid "" "The following information about the nearest road might be inaccurate or " "irrelevant, if the problem is close to several roads or close to a road " @@ -3020,8 +3191,6 @@ msgstr "" #: templates/web/default/auth/change_password.html:12 #: templates/web/default/auth/change_password.html:16 -#: templates/web/fixmystreet/auth/change_password.html:12 -#: templates/web/fixmystreet/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Passorda er ikkje like" @@ -3030,25 +3199,16 @@ msgstr "Passorda er ikkje like" msgid "The requested URL '%s' was not found on this server" msgstr "Fann ikkje URL-en «%s» på denne tenaren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1036 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 -#: perllib/FixMyStreet/App/Controller/Admin.pm:540 -#: perllib/FixMyStreet/App/Controller/Admin.pm:703 -msgid "The requested URL was not found on this server." -msgstr "Fann ikkje URL-ein du spurde etter på denne tenaren" - -#: templates/web/default/alert/list.html:45 +#: templates/web/default/alert/_list.html:14 #: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" msgstr "Den enklaste meldinga er den geografiske:" -#: templates/web/default/report/new/councils_text_all.html:18 +#: templates/web/barnet/report/new/councils_text_all.html:3 +#: templates/web/default/report/new/councils_extra_text.html:1 #: templates/web/default/report/new/councils_text_some.html:10 #: templates/web/default/report/new/councils_text_some.html:11 #: templates/web/default/report/new/fill_in_details_form.html:17 -#: templates/web/fixmystreet/report/new/councils_text_all.html:18 -#: templates/web/fixmystreet/report/new/councils_text_some.html:10 -#: templates/web/fixmystreet/report/new/councils_text_some.html:11 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "" "The subject and details of the problem will be public, plus your name if you " @@ -3057,7 +3217,7 @@ msgstr "" "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" "viss du gjev oss lov til det." -#: bin/send-reports:79 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:269 msgid "" "The user could not locate the problem on a map, but to see the area around " "the location they entered" @@ -3065,15 +3225,22 @@ msgstr "" "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt " "staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Reports.pm:70 +#: perllib/FixMyStreet/App/Controller/Reports.pm:72 msgid "" "There was a problem showing the All Reports page. Please try again later." msgstr "" "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " "igjen seinare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:656 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:125 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#, fuzzy +msgid "There was a problem showing this page. Please try again later." +msgstr "" +"Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv " +"igjen seinare." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:733 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:130 #: templates/web/default/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:24 #, fuzzy @@ -3087,14 +3254,14 @@ msgstr "" "sannsynlegvis ikkje ein konto enno. – ver venleg og fyll inn høgresida " "av dette skjemaet for å skaffa deg ein." -#: perllib/FixMyStreet/App/Controller/Alert.pm:351 +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 msgid "" "There was a problem with your email/password combination. Please try again." msgstr "" "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv " "igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:215 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:252 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3102,7 +3269,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:242 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:279 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -3114,7 +3281,7 @@ msgstr "" "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil " "endra seg utan åtvaring i framtida." -#: bin/send-reports:186 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:339 msgid "" "This email has been sent to both councils covering the location of the " "problem, as the user did not categorise it; please ignore it if you're not " @@ -3127,7 +3294,7 @@ msgstr "" "eller gjev oss melding om kva for ein kategori av problem dette er så vi kan " "leggja det til i systemet vårt." -#: bin/send-reports:189 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:342 msgid "" "This email has been sent to several councils covering the location of the " "problem, as the category selected is provided for all of them; please ignore " @@ -3138,7 +3305,8 @@ msgstr "" "og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera " "denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:778 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:865 +#: perllib/FixMyStreet/Cobrand/UK.pm:62 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3169,49 +3337,51 @@ msgstr "" "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss " "administrasjon for å sjå problem som er sende dit." -#: perllib/FixMyStreet/Cobrand/Default.pm:874 +#: templates/web/default/report/banner.html:15 msgid "This problem has been closed" msgstr "Dette problemet er lukka" -#: perllib/FixMyStreet/Cobrand/Default.pm:870 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 -#: templates/web/default/report/display.html:100 -#: templates/web/fixmystreet/report/display.html:95 +#: templates/web/bromley/report/display.html:96 +#: templates/web/default/report/banner.html:12 +#: templates/web/default/report/display.html:95 +#: templates/web/emptyhomes/report/display.html:12 +#: templates/web/fixmystreet/report/display.html:90 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/default/report/display.html:95 -#: templates/web/fixmystreet/report/display.html:89 +#: templates/web/bromley/report/display.html:90 +#: templates/web/default/report/display.html:90 +#: templates/web/fixmystreet/report/display.html:84 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" -#: perllib/FixMyStreet/Cobrand/Default.pm:879 +#: templates/web/default/report/banner.html:19 msgid "This problem is in progress" msgstr "Dette problemet er under arbeid" -#: perllib/FixMyStreet/Cobrand/Default.pm:866 +#: templates/web/default/report/banner.html:9 msgid "This problem is old and of unknown status." msgstr "Dette problemet er gammalt og med ukjend status." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:79 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:81 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:83 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: bin/send-reports:72 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:262 msgid "" "This web page also contains a photo of the problem, provided by the user." msgstr "" "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." -#: perllib/FixMyStreet/App/Controller/Admin.pm:981 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1024 #: templates/web/default/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3238,22 +3408,15 @@ msgstr "" "For å <strong>rapportera eit problem</strong>, klikk på kartet på riktig " "stad." -#: templates/web/fixmystreet/alert/index.html:19 +#: templates/web/default/alert/index.html:27 #, fuzzy msgid "" -"To find out what local alerts we have for you, please enter your GB\n" -" postcode or street name and area" +"To find out what local alerts we have for you, please enter your postcode or " +"street name and area" msgstr "" "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" -#: templates/web/default/alert/index.html:21 -msgid "" -"To find out what local alerts we have for you, please enter your GB\n" -"postcode or street name and area:" -msgstr "" -"Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller stad:" - -#: bin/send-reports:78 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:268 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -3275,7 +3438,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: perllib/FixMyStreet/Cobrand/FixMyStreet.pm:16 +#: templates/web/fixmystreet/report/banner.html:9 #, fuzzy msgid "Unknown" msgstr "*ukjent*" @@ -3288,7 +3451,8 @@ msgstr "Ukjend varsel-type" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/fixmystreet/report/display.html:70 +#: templates/web/bromley/report/display.html:66 +#: templates/web/fixmystreet/report/display.html:65 #, fuzzy msgid "Update" msgstr "Oppdatering:" @@ -3327,17 +3491,17 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/default/admin/council_contacts.html:58 +#: templates/web/default/admin/council_contacts.html:62 msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/default/report/display.html:76 +#: templates/web/default/report/display.html:71 msgid "Update:" msgstr "Oppdatering:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:649 -#: perllib/FixMyStreet/App/Controller/Admin.pm:766 -#: perllib/FixMyStreet/App/Controller/Admin.pm:846 +#: perllib/FixMyStreet/App/Controller/Admin.pm:694 +#: perllib/FixMyStreet/App/Controller/Admin.pm:809 +#: perllib/FixMyStreet/App/Controller/Admin.pm:889 msgid "Updated!" msgstr "Oppdatert!" @@ -3351,18 +3515,20 @@ msgstr "Oppdateringar" msgid "Updates on {{title}}" msgstr "Oppdateringar av {{title}}" +#: templates/web/bromley/report/display.html:0 +#: templates/web/bromley/report/display.html:8 #: templates/web/default/report/display.html:0 #: templates/web/default/report/display.html:7 #: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:7 +#: templates/web/fixmystreet/report/display.html:8 msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1139 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1154 msgid "User flagged" msgstr "Brukar flagga" @@ -3370,8 +3536,8 @@ msgstr "Brukar flagga" msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:306 -#: perllib/FixMyStreet/App/Controller/Admin.pm:336 +#: perllib/FixMyStreet/App/Controller/Admin.pm:309 +#: perllib/FixMyStreet/App/Controller/Admin.pm:339 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3380,6 +3546,11 @@ msgstr "Verdi oppdatert" msgid "View report on site" msgstr "Sjå rapport på nettstaden" +#: templates/web/default/reports/council.html:18 +#, fuzzy +msgid "View reports by ward" +msgstr "Sjå rapport på nettstaden" + #: templates/web/emptyhomes/tokens/confirm_problem.html:39 msgid "View your report" msgstr "Vis rapporten din" @@ -3393,30 +3564,21 @@ msgstr "Vis rapporten din" msgid "Viewing a location" msgstr "Ser på ein stad" +#: templates/web/bromley/report/display.html:0 #: templates/web/default/report/display.html:0 -#: templates/web/emptyhomes/report/display.html:1 #: templates/web/emptyhomes/report/display.html:2 #: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på eit problem" -#: templates/web/default/reports/council.html:23 -#: templates/web/default/reports/council.html:74 -#: templates/web/default/reports/council.html:86 +#: templates/web/default/reports/council.html:20 #: templates/web/emptyhomes/reports/council.html:18 msgid "Wards of this council" msgstr "Bydelar innanfor denne administrasjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:432 -#: perllib/FixMyStreet/Geocode/Bing.pm:48 -#: perllib/FixMyStreet/Geocode/Google.pm:63 -msgid "We do not currently cover Northern Ireland, I'm afraid." -msgstr "Vi dekkjer diverre ikkje Nord-Irland." - #: templates/web/default/alert/choose.html:6 -#: templates/web/default/around/around_index.html:32 -#: templates/web/fixmystreet/alert/choose.html:6 -#: templates/web/fixmystreet/around/around_index.html:35 +#: templates/web/default/around/around_index.html:17 +#: templates/web/fixmystreet/around/around_index.html:16 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." @@ -3425,7 +3587,6 @@ msgstr "" "prøv eit anna søk viss staden din ikkje er her." #: templates/web/default/auth/token.html:19 -#: templates/web/fixmystreet/auth/token.html:19 msgid "We have sent you an email containing a link to confirm your account." msgstr "" "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen " @@ -3440,18 +3601,21 @@ msgstr "" "Det kan hende vi periodisk tek kontakt med deg for å spørja om noko har " "endra seg med eiedommen du rapporterte." -#: templates/web/fixmystreet/report/display.html:158 +#: templates/web/bromley/report/display.html:141 +#: templates/web/fixmystreet/report/display.html:153 #, fuzzy msgid "We never show your email" msgstr "(vi viser aldri e-postadressa di)" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:127 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:184 +#: templates/web/bromley/report/new/fill_in_details_form.html:133 +#: templates/web/bromley/report/new/fill_in_details_form.html:179 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:130 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:190 #, fuzzy msgid "We never show your email address or phone number." msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: bin/send-reports:196 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:349 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 " @@ -3461,13 +3625,13 @@ msgstr "" "tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta " "kontakt med oss." -#: templates/web/default/index.html:45 templates/web/emptyhomes/index.html:61 -#: templates/web/fixmystreet/index.html:56 +#: templates/web/default/index.html:34 templates/web/emptyhomes/index.html:59 +#: templates/web/fixmystreet/index.html:45 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" +#: templates/web/bromley/report/new/fill_in_details_form.html:217 #: templates/web/default/report/new/notes.html:5 -#: templates/web/fixmystreet/report/new/notes.html:4 msgid "" "We will only use your personal information in accordance with our <a href=\"/" "faq#privacy\">privacy policy.</a>" @@ -3475,6 +3639,15 @@ msgstr "" "Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/" "faq#privacy\">personvernpolicyen</a> vår." +#: templates/web/fixmystreet/report/new/notes.html:4 +#, fuzzy +msgid "" +"We will only use your personal information in accordance with our <a href=\"/" +"privacy\">privacy policy.</a>" +msgstr "" +"Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/" +"faq#privacy\">personvernpolicyen</a> vår." + #: templates/web/emptyhomes/contact/blurb.html:2 msgid "" "We’d love to hear what you think about this website. Just fill in the " @@ -3494,7 +3667,7 @@ msgstr "" "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. " "Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/default/admin/council_contacts.html:37 +#: templates/web/default/admin/council_contacts.html:41 #: templates/web/default/admin/council_edit.html:41 msgid "When edited" msgstr "Når redigert" @@ -3504,7 +3677,7 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:538 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:612 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -3519,13 +3692,14 @@ msgstr "" "einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a " "href=\"%s\">MaPit</a>." -#: templates/web/fixmystreet/footer.html:23 +#: templates/web/fixmystreet/footer.html:22 msgid "" -"Would you like better integration with FixMyStreet? <a href=\"/for-councils" -"\">Find out about FixMyStreet for councils</a>." +"Would you like better integration with FixMyStreet? <a href=\"http://www." +"mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for " +"councils</a>." msgstr "" -#: templates/web/fixmystreet/footer.html:19 +#: templates/web/fixmystreet/footer.html:18 #, fuzzy msgid "" "Would you like to contribute to FixMyStreet? Our code is open source and <a " @@ -3556,15 +3730,15 @@ msgstr "" msgid "Year" msgstr "År" -#: templates/web/default/admin/council_contacts.html:44 -#: templates/web/default/admin/council_contacts.html:45 +#: templates/web/default/admin/council_contacts.html:48 +#: templates/web/default/admin/council_contacts.html:49 #: templates/web/default/admin/council_edit.html:5 #: templates/web/default/admin/list_updates.html:30 #: templates/web/default/admin/list_updates.html:31 #: templates/web/default/admin/list_updates.html:32 #: templates/web/default/admin/problem_row.html:19 #: templates/web/default/admin/report_edit.html:27 -#: templates/web/default/admin/report_edit.html:40 +#: templates/web/default/admin/report_edit.html:41 #: templates/web/default/admin/search_users.html:23 #: templates/web/default/admin/update_edit.html:15 #: templates/web/default/questionnaire/creator_fixed.html:14 @@ -3575,8 +3749,10 @@ msgstr "År" msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/display.html:138 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:153 +#: templates/web/bromley/report/display.html:155 +#: templates/web/bromley/report/new/fill_in_details_form.html:198 +#: templates/web/fixmystreet/report/display.html:133 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:156 #, fuzzy msgid "Yes I have a password" msgstr "<strong>Ja</strong>, eg har eit passord:" @@ -3615,10 +3791,6 @@ msgstr "Du kan <a href=\"/reports/\">sjå alle administrasjonar</a>." #: templates/web/default/report/new/councils_text_none.html:16 #: templates/web/default/report/new/councils_text_some.html:20 #: templates/web/default/report/new/councils_text_some.html:22 -#: templates/web/fixmystreet/report/new/councils_text_none.html:12 -#: templates/web/fixmystreet/report/new/councils_text_none.html:14 -#: templates/web/fixmystreet/report/new/councils_text_some.html:20 -#: templates/web/fixmystreet/report/new/councils_text_some.html:22 msgid "" "You can help us by finding a contact email address for local problems for %s " "and emailing it to us at <a href='mailto:%s'>%s</a>." @@ -3635,6 +3807,7 @@ msgstr "" "venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet " "ditt</a>.\n" +#: templates/web/bromley/report/new/fill_in_details_form.html:97 #: templates/web/default/questionnaire/index.html:92 #: templates/web/default/report/new/fill_in_details_form.html:93 #: templates/web/fixmystreet/questionnaire/index.html:87 @@ -3646,8 +3819,9 @@ msgstr "" "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved eit " "anna vil byta ut dette." -#: templates/web/default/report/display.html:111 -#: templates/web/fixmystreet/report/display.html:105 +#: templates/web/bromley/report/display.html:106 +#: templates/web/default/report/display.html:106 +#: templates/web/fixmystreet/report/display.html:100 msgid "" "You have already attached a photo to this update, attaching another one will " "replace it." @@ -3656,10 +3830,10 @@ msgstr "" "anna vil byta ut dette." #: templates/web/default/auth/sign_out.html:3 -#: templates/web/fixmystreet/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allereie logga ut" +#: templates/web/bromley/report/new/fill_in_details_form.html:25 #: templates/web/default/report/new/fill_in_details_form.html:7 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:27 #, fuzzy @@ -3674,8 +3848,8 @@ msgstr "" msgid "You have successfully confirmed your alert." msgstr "Du har no stadfesta varselet ditt." -#: templates/web/default/tokens/confirm_problem.html:6 -#: templates/web/default/tokens/confirm_problem.html:7 +#: templates/web/default/tokens/confirm_problem.html:14 +#: templates/web/default/tokens/confirm_problem.html:15 msgid "You have successfully confirmed your problem" msgstr "Du har no stadfesta problemet ditt" @@ -3696,8 +3870,8 @@ msgstr "Du har oppretta varselet ditt." msgid "You have successfully deleted your alert." msgstr "Sletting av varselet ditt var vellukka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:131 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:740 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:136 msgid "" "You have successfully signed in; please check and confirm your details are " "accurate:" @@ -3724,19 +3898,23 @@ msgstr "Ynskjer du verkeleg å senda på nytt?" msgid "Your Reports" msgstr "Rapportane dine" -#: templates/web/fixmystreet/alert/_list.html:85 +#: templates/web/bromley/report/display.html:41 +#: templates/web/bromley/report/display.html:43 +#: templates/web/bromley/report/new/fill_in_details_form.html:145 +#: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 #: templates/web/fixmystreet/contact/index.html:72 -#: templates/web/fixmystreet/report/display.html:39 -#: templates/web/fixmystreet/report/display.html:41 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 +#: templates/web/fixmystreet/report/display.html:34 +#: templates/web/fixmystreet/report/display.html:36 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142 #, fuzzy msgid "Your email" msgstr "E-posten din" +#: templates/web/bromley/report/display.html:130 #: templates/web/fixmystreet/auth/general.html:26 -#: templates/web/fixmystreet/report/display.html:129 +#: templates/web/fixmystreet/report/display.html:124 #, fuzzy msgid "Your email address" msgstr "e-postadressa di:" @@ -3745,51 +3923,78 @@ msgstr "e-postadressa di:" msgid "Your email address:" msgstr "e-postadressa di:" -#: templates/web/default/alert/list.html:120 -#: templates/web/default/report/display.html:133 +#: templates/web/default/alert/_list.html:92 +#: templates/web/default/report/display.html:128 #: templates/web/default/report/new/fill_in_details_form.html:124 msgid "Your email:" msgstr "E-posten din" +#: templates/web/bromley/report/display.html:193 +#: templates/web/bromley/report/new/fill_in_details_form.html:117 +#: templates/web/bromley/report/new/fill_in_details_form.html:164 +#, fuzzy +msgid "Your first name" +msgstr "Namnet ditt:" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5 +#, fuzzy +msgid "" +"Your information will only be used in accordance with our <a href=\"/privacy" +"\">privacy policy</a>" +msgstr "" +"Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/" +"faq#privacy\">personvernpolicyen</a> vår." + +#: templates/web/bromley/report/display.html:199 +#: templates/web/bromley/report/new/fill_in_details_form.html:123 +#: templates/web/bromley/report/new/fill_in_details_form.html:170 +#, fuzzy +msgid "Your last name" +msgstr "Namnet ditt:" + #: templates/web/fixmystreet/auth/general.html:53 #: templates/web/fixmystreet/contact/index.html:65 -#: templates/web/fixmystreet/report/display.html:185 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:118 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:175 +#: templates/web/fixmystreet/report/display.html:181 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:121 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:181 #, fuzzy msgid "Your name" msgstr "Namnet ditt:" #: templates/web/default/auth/general.html:59 #: templates/web/default/contact/index.html:68 -#: templates/web/default/report/display.html:207 +#: templates/web/default/report/display.html:202 #: templates/web/default/report/new/fill_in_details_form.html:203 msgid "Your name:" msgstr "Namnet ditt:" +#: templates/web/bromley/report/display.html:160 +#: templates/web/bromley/report/new/fill_in_details_form.html:203 #: templates/web/fixmystreet/auth/general.html:37 -#: templates/web/fixmystreet/report/display.html:143 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:158 +#: templates/web/fixmystreet/report/display.html:138 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 #, fuzzy msgid "Your password" msgstr "Rapportane dine" #: templates/web/default/auth/change_password.html:6 -#: templates/web/fixmystreet/auth/change_password.html:6 msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:131 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:189 +#: templates/web/bromley/report/new/fill_in_details_form.html:137 +#: templates/web/bromley/report/new/fill_in_details_form.html:184 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:195 msgid "Your phone number" msgstr "" -#: templates/web/fixmystreet/questionnaire/index.html:16 +#: templates/web/fixmystreet/questionnaire/index.html:15 #, fuzzy msgid "Your report" msgstr "Oppdateringane dine" -#: templates/web/bromley/footer.html:35 templates/web/default/footer.html:9 +#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 +#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9 #: templates/web/fiksgatami/footer.html:6 #: templates/web/fiksgatami/nn/footer.html:6 #: templates/web/fixmystreet/footer.html:47 @@ -3809,8 +4014,8 @@ msgstr "E-posten din:" msgid "by %s" msgstr "av %s" -#: templates/web/default/reports/council.html:6 -#: templates/web/default/reports/council.html:7 +#: templates/web/default/reports/council.html:12 +#: templates/web/default/reports/council.html:13 #: templates/web/emptyhomes/reports/council.html:6 #: templates/web/emptyhomes/reports/council.html:7 msgid "council" @@ -3820,8 +4025,8 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikkje kart" -#: templates/web/fixmystreet/alert/index.html:24 -#: templates/web/fixmystreet/index.html:41 +#: templates/web/default/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:17 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -3829,26 +4034,26 @@ msgstr "" msgid "from %d different users" msgstr "frå %d ulike brukarar" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:289 msgid "less than a minute" msgstr "mindre enn eitt minutt" -#: templates/web/default/report/updates.html:24 +#: templates/web/default/report/updates.html:27 msgid "marked as %s" msgstr "markert som %s" -#: templates/web/default/report/updates.html:22 +#: templates/web/default/report/updates.html:25 msgid "marked as fixed" msgstr "markert som løyst" -#: perllib/FixMyStreet/App/Controller/Admin.pm:109 +#: perllib/FixMyStreet/App/Controller/Admin.pm:112 #: templates/web/default/admin/questionnaire.html:15 #: templates/web/default/admin/questionnaire.html:16 msgid "n/a" msgstr "i/t" -#: templates/web/default/alert/list.html:114 -#: templates/web/fixmystreet/alert/_list.html:81 +#: templates/web/default/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 msgid "or" msgstr "eller" @@ -3860,16 +4065,21 @@ msgstr "søkte etter" msgid "other areas:" msgstr "andre område:" -#: templates/web/default/report/updates.html:23 +#: templates/web/default/report/updates.html:26 msgid "reopened" msgstr "opna på nytt" -#: templates/web/bromley/header.html:47 -#: templates/web/fixmystreet/header.html:47 +#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 +#: templates/web/bromley/header.html:65 +#: templates/web/fixmybarangay/header.html.orig:43 +#: templates/web/fixmystreet/header.html:48 +#: templates/web/zurich/header.html:48 #, fuzzy msgid "sign out" msgstr "Logg ut" +#: templates/web/bromley/report/new/fill_in_details_form.html:4 +#: templates/web/bromley/report/new/fill_in_details_form.html:7 #: templates/web/default/report/new/fill_in_details_form.html:11 #: templates/web/default/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:6 @@ -3877,15 +4087,19 @@ msgstr "Logg ut" msgid "the local council" msgstr "den lokale administrasjonen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:534 +#: perllib/FixMyStreet/DB/Result/Problem.pm:541 msgid "the map was not used so pin location may be inaccurate" msgstr "karta vart ikkje brukt, så nåleposisjon kan vera unøyaktig" -#: bin/send-reports:177 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +msgid "their ref: %s" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:330 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:222 +#: perllib/Utils.pm:263 msgid "today" msgstr "i dag" @@ -3902,7 +4116,7 @@ msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" #: templates/web/default/reports/council.html:0 -#: templates/web/default/reports/council.html:3 +#: templates/web/default/reports/council.html:9 #: templates/web/emptyhomes/reports/council.html:0 #: templates/web/emptyhomes/reports/council.html:3 msgid "ward" @@ -3938,13 +4152,6 @@ msgstr "vil problemet ditt ikkje publiserast" msgid "your update will not be posted" msgstr "oppdateringa di vil ikkje publiserast" -#: templates/web/emptyhomes/front/stats.html:17 -#, perl-format -msgid "<big>%s</big> report recently" -msgid_plural "<big>%s</big> reports recently" -msgstr[0] "<big>%s</big> rapport nyleg" -msgstr[1] "<big>%s</big> rapportar nyleg" - #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format msgid "We do not yet have details for the council that covers this location." @@ -3955,6 +4162,13 @@ msgstr[0] "" msgstr[1] "" "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." +#: templates/web/emptyhomes/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapport nyleg" +msgstr[1] "<big>%s</big> rapportar nyleg" + #: templates/web/emptyhomes/front/stats.html:12 #, perl-format msgid "<big>%s</big> report in past week" @@ -3969,14 +4183,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> løyst siste månad" msgstr[1] "<big>%s</big> løyst siste månad" -#: templates/web/default/front/stats.html:29 -#, perl-format -msgid "<big>%s</big> update on reports" -msgid_plural "<big>%s</big> updates on reports" -msgstr[0] "<big>%s</big> rapportoppdatering" -msgstr[1] "<big>%s</big> rapportoppdateringar" - -#: templates/web/fixmystreet/report/new/councils_text_some.html:14 +#: templates/web/default/report/new/councils_text_some.html:14 #, perl-format msgid "" "We do <strong>not</strong> yet have details for the other council that " @@ -3991,6 +4198,44 @@ msgstr[1] "" "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane " "som dekkjer denne staden." +#: templates/web/default/front/stats.html:29 +#, perl-format +msgid "<big>%s</big> update on reports" +msgid_plural "<big>%s</big> updates on reports" +msgstr[0] "<big>%s</big> rapportoppdatering" +msgstr[1] "<big>%s</big> rapportoppdateringar" + +#, fuzzy +#~ msgid "FixMyStreet for Councils" +#~ msgstr "Finn ut om FiksGataMi for det offentlege" + +#, fuzzy +#~ msgid "Questions and Answers :: FixMyStreet for Councils" +#~ msgstr "Finn ut om FiksGataMi for det offentlege" + +#~ msgid "" +#~ "That spot does not appear to be covered by a council. If you have tried " +#~ "to report an issue past the shoreline, for example, please specify the " +#~ "closest point on land." +#~ msgstr "" +#~ "Punktet ser ikkje ut til å vera dekt av ein administrasjon. Viss du til " +#~ "dømes har freista å rapportera eit problem utanfor kysten, marker næraste " +#~ "punkt på land." + +#~ msgid "The requested URL was not found on this server." +#~ msgstr "Fann ikkje URL-ein du spurde etter på denne tenaren" + +#, fuzzy +#~ msgid "" +#~ "To find out what local alerts we have for you, please enter your GB\n" +#~ " postcode or street name and area" +#~ msgstr "" +#~ "Du finn lokale problem ved å søkja på postnummeret ditt, vegnamn eller " +#~ "stad:" + +#~ msgid "We do not currently cover Northern Ireland, I'm afraid." +#~ msgstr "Vi dekkjer diverre ikkje Nord-Irland." + #, fuzzy #~ msgid "<strong>Yes</strong>, I have a password" #~ msgstr "<strong>Ja</strong>, eg har eit passord:" |