diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-03-02 14:58:23 +0000 |
| commit | 2fc65ef99e7591f4f570c5102f46583a0ce9a793 (patch) | |
| tree | c30c3c3da3adb22261ddadccc4f6f26d7ba1af37 /locale/nn_NO.UTF-8 | |
| parent | 3ef78780e20e1ede6631a2243c7f337bea46b269 (diff) | |
Version 1.8.v1.8
Add things missing from README, pull from Transifex, merge in new
translations, bump version number.
Diffstat (limited to 'locale/nn_NO.UTF-8')
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1251 |
1 files changed, 525 insertions, 726 deletions
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index e6e0ccebe..af7a6fe98 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-10-23 16:51+0100\n" -"PO-Revision-Date: 2015-07-31 16:31+0000\n" +"POT-Creation-Date: 2016-03-02 13:09+0000\n" +"PO-Revision-Date: 2015-10-23 16:36+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nn_NO/)\n" "Language: nn_NO\n" @@ -21,45 +21,24 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:628 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:411 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: perllib/FixMyStreet/Script/Reports.pm:189 msgid " and " msgstr " og " #: templates/web/base/report/new/councils_text_all.html:2 -#: templates/web/base/report/new/councils_text_none.html:11 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:15 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr " eller " -#: templates/web/base/admin/index.html:35 -#: templates/web/base/status/index.html:13 -msgid "%s confirmed alerts, %s unconfirmed" -msgstr "%d stadfesta varsel, %d ikkje stadfesta" - -#: templates/web/base/admin/index.html:37 -#: templates/web/base/status/index.html:16 -#: templates/web/zurich/admin/index.html:6 -msgid "%s council contacts – %s confirmed, %s unconfirmed" -msgstr "%d administrasjonskontaktar – %d stadfesta, %d ikkje stadfesta" - #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringar av %s" -#: templates/web/base/admin/index.html:34 -#: templates/web/base/status/index.html:12 -msgid "%s live updates" -msgstr "%d aktive oppdateringar" - -#: templates/web/base/admin/index.html:36 -#: templates/web/base/status/index.html:14 -msgid "%s questionnaires sent – %s answered (%s%%)" -msgstr "%d spørjeskjema sendt – %d svart (%s%%)" - #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" msgstr "" @@ -74,35 +53,49 @@ msgstr "%s – oppsummeringsrapportar" msgid "%s admin:" msgstr "" +#: templates/web/base/status/stats.html:26 +msgid "%s bodies" +msgstr "" + +#: templates/web/base/status/stats.html:24 +msgid "%s confirmed alerts, %s unconfirmed" +msgstr "%s stadfesta varsel, %s ikkje stadfesta" + +#: templates/web/base/status/stats.html:27 +#: templates/web/zurich/admin/index.html:6 +msgid "%s council contacts – %s confirmed, %s unconfirmed" +msgstr "%s administrasjonskontaktar – %s stadfesta, %s ikkje stadfesta" + #. ("%s is the site name") #: templates/web/base/alert/index.html:7 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller eit område med problem\n" -"innan ein gitt distanse frå ein viss posisjon." #. ("%s is the site name") #: templates/web/base/alert/index.html:11 -#, fuzzy msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." msgstr "" -"Fiksgatami har ulike RSS-straumar og e-postlister om lokale problem, dette inkluderer problem meldt innanfor ein viss bydel eller administrasjon, eller eit område med problem\n" -"innan ein gitt distanse frå ein viss posisjon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:695 +#: templates/web/base/status/stats.html:23 +msgid "%s live updates" +msgstr "%s aktive oppdateringar" + +#: templates/web/base/status/stats.html:25 +msgid "%s questionnaires sent – %s answered (%s%%)" +msgstr "%s spørjeskjema sendt – %s svart (%s%%)" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:683 msgid "%s ref: %s" msgstr "%s ref: %s" #. ("%s is the site name") #: templates/web/base/alert/_list.html:73 -#, fuzzy msgid "" "%s sends different categories of problem\n" "to the appropriate council, so problems within the boundary of a particular council\n" @@ -110,17 +103,17 @@ msgid "" "will be sent to the district council, so will appear in both of the district\n" "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" "for the county council." -msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, problem som gjeld fleire administrasjonar vert send til alle dei det gjeld." +msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:564 +#: perllib/FixMyStreet/DB/Result/Problem.pm:552 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +#: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" @@ -128,7 +121,7 @@ msgstr "%s, innanfor bydelen %s" msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/report/new/fill_in_details_form.html:46 msgid "(Defect & location of defect)" msgstr "" @@ -139,9 +132,8 @@ msgstr "(Epost i misbruktabellen)" #: templates/web/zurich/admin/report_edit-sdm.html:60 #: templates/web/zurich/admin/report_edit.html:88 -#, fuzzy msgid "(No name)" -msgstr "Namnet ditt:" +msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:67 #: templates/web/zurich/admin/report_edit.html:95 @@ -154,17 +146,16 @@ msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "(alternatively the RSS feed can be customised, within %s)" -msgstr "(alternativt kan RSS-straumen tilpassast, innanfor" +msgstr "" -#: templates/web/base/report/_item.html:27 -#: templates/web/zurich/report/_item.html:21 +#: templates/web/base/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(lukka)" -#: templates/web/base/report/_item.html:25 -#: templates/web/zurich/report/_item.html:19 +#: templates/web/base/report/_item.html:23 +#: templates/web/zurich/report/_item.html:17 msgid "(fixed)" msgstr "(løyst)" @@ -172,37 +163,28 @@ msgstr "(løyst)" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/base/report/_item.html:21 +#: templates/web/base/report/_item.html:19 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/report/new/fill_in_details_form.html:200 #: templates/web/zurich/report/new/fill_in_details_form.html:82 msgid "(optional)" msgstr "(valfritt)" -#: templates/web/fixmystreet/report/public_label.html:1 +#: templates/web/base/report/public_label.html:1 msgid "(public)" msgstr "" -#: templates/web/base/report/_item.html:20 +#: templates/web/base/report/_item.html:18 msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:194 -msgid "(we never show your email address or phone number)" -msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" - -#: templates/web/base/report/update-form.html:159 -msgid "(we never show your email)" -msgstr "(vi viser aldri e-postadressa di)" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 #: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 #: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -221,52 +203,39 @@ msgstr "" msgid "<label>Show %s</label> <label>about %s</label>" msgstr "" -#: templates/web/base/admin/index.html:32 -#: templates/web/base/status/index.html:11 +#: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%s</strong> live problems" -msgstr "<strong>%d</strong> aktive problem" +msgstr "<strong>%s</strong> aktive problem" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/fixmystreet/report/update-form.html:112 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:48 +#: templates/web/base/auth/general.html:87 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:145 -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/base/report/update-form.html:118 -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/base/auth/general.html:34 -#: templates/web/base/report/new/fill_in_details_form.html:123 -#: templates/web/base/report/update-form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 -#: templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:70 +#: templates/web/base/report/new/form_user_loggedout_password.html:3 +#: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord" -#: templates/web/base/static/about-en-gb.html:1 -#: templates/web/base/static/about-en-gb.html:3 +#: templates/web/base/about/about-en-gb.html:1 +#: templates/web/base/about/about-en-gb.html:3 msgid "About us" msgstr "Om oss" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:8 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Action Scheduled" msgstr "" @@ -297,7 +266,7 @@ msgstr "Legg til ny kategori" msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:52 +#: templates/web/base/my/my.html:56 msgid "Added %s" msgstr "La til %s" @@ -317,8 +286,7 @@ 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/base/report/update-form.html:164 -#: templates/web/fixmystreet/report/update-form.html:150 +#: templates/web/base/report/update/form_name.html:20 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -328,9 +296,8 @@ msgid "All Reports" msgstr "" #: templates/web/zurich/admin/stats.html:5 -#, fuzzy msgid "All Reports as CSV" -msgstr "Alle rapportar" +msgstr "" #: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32 #: templates/web/zurich/admin/index-dm.html:12 @@ -351,10 +318,8 @@ msgstr "All informasjonen du har lagt inn her vil sendast til" #: templates/web/base/report/new/councils_text_all.html:2 #: templates/web/base/report/new/councils_text_all.html:4 -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:14 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>." @@ -376,6 +341,10 @@ msgstr "Anonym:" msgid "Are you a developer?" msgstr "" +#: templates/web/base/js/translation_strings.html:52 +msgid "Are you sure you want to cancel this upload?" +msgstr "" + #: templates/web/base/admin/body-form.html:69 #: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 @@ -408,16 +377,16 @@ msgstr "" msgid "Assigned to %s" msgstr "" -#: templates/web/base/open311/index.html:84 +#: templates/web/base/open311/index.html:76 msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei returnerte førespurnadene vert sorterte på requested_datetime, så ein må gjera fleire søk med rullerande start_date og end_date for å få tak i alle førespurnadene." -#: templates/web/base/open311/index.html:76 +#: templates/web/base/open311/index.html:68 msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." #: perllib/FixMyStreet/DB/Result/Problem.pm:373 -#: templates/web/zurich/report/_item.html:11 +#: templates/web/zurich/report/_item.html:9 msgid "Awaiting moderation" msgstr "" @@ -429,7 +398,7 @@ msgstr "" msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1276 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1285 #: perllib/FixMyStreet/Cobrand/Zurich.pm:392 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" @@ -459,7 +428,7 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: templates/web/base/admin/body.html:68 -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/report/new/category.html:10 #: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 @@ -470,8 +439,8 @@ msgstr "" msgid "Category" msgstr "Kategori" -#: templates/web/base/admin/index.html:59 -#: templates/web/base/admin/index.html:67 +#: templates/web/base/admin/index.html:52 +#: templates/web/base/admin/index.html:60 msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" @@ -484,7 +453,7 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402 +#: perllib/FixMyStreet/Script/Reports.pm:180 msgid "Category: %s" msgstr "Kategori: %s" @@ -534,7 +503,7 @@ msgid "Click here or enter as dd/mm/yyyy" msgstr "" #: templates/web/base/around/_report_banner.html:2 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:55 msgid "Click map to report a problem" msgstr "" @@ -561,7 +530,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:25 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/fixmystreet/report/banner.html:15 +#: templates/web/base/report/banner.html:15 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 @@ -569,7 +538,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:794 +#: perllib/FixMyStreet/DB/Result/Problem.pm:779 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -595,7 +564,7 @@ msgstr "Data om merkevaresamarbeid:" msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1283 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1292 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -608,13 +577,13 @@ msgstr "" msgid "Confirm" msgstr "Stadfest" -#: templates/web/base/auth/token.html:1 templates/web/zurich/auth/token.html:1 +#: templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Stadfest konto" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 -#: templates/web/fixmystreet/report/update-form.html:107 -msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +#: templates/web/base/report/new/form_user_loggedout_password.html:21 +#: templates/web/base/report/update/form_user_loggedout_password.html:20 +msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:1 @@ -644,35 +613,27 @@ msgid "Confirmed:" msgstr "Stadfesta:" #. ("%s is the site name") -#: templates/web/base/faq/faq-en-gb.html:8 templates/web/base/footer.html:24 -#: templates/web/base/open311/index.html:8 -#: templates/web/base/static/privacy.html:10 -#: templates/web/fixmystreet/contact/index.html:12 -#, fuzzy +#: templates/web/base/about/_sidebar.html:6 templates/web/base/footer.html:24 msgid "Contact %s" -msgstr "Kontakt oss" +msgstr "" #: templates/web/base/contact/index.html:1 #: templates/web/base/contact/index.html:2 #: templates/web/base/contact/submit.html:1 -#: templates/web/fixmystreet/contact/index.html:1 -#: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:6 -#: templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:12 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:59 -#, fuzzy msgid "Coordinates:" -msgstr "Koordinatar:" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1420 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1448 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1429 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -690,7 +651,7 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:693 +#: perllib/FixMyStreet/DB/Result/Problem.pm:681 msgid "Council ref: %s" msgstr "" @@ -705,7 +666,7 @@ msgstr "Administrasjon:" msgid "Count" msgstr "Mengd" -#: templates/web/base/email_sent.html:1 templates/web/zurich/email_sent.html:1 +#: templates/web/base/email_sent.html:1 msgid "Create a report" msgstr "Lag ein rapport" @@ -715,9 +676,8 @@ msgid "Create category" msgstr "Lag kategori" #: templates/web/zurich/admin/template_edit.html:29 -#, fuzzy msgid "Create template" -msgstr "Lag ein rapport" +msgstr "" #: templates/web/base/admin/problem_row.html:34 #: templates/web/zurich/admin/templates.html:10 @@ -754,7 +714,7 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:878 +#: perllib/FixMyStreet/App/Controller/Admin.pm:877 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -767,7 +727,7 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/form_report.html:45 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -775,12 +735,11 @@ msgid "Description" msgstr "" #: templates/web/base/js/translation_strings.html:34 -#: templates/web/zurich/report/new/fill_in_details_form.html:42 +#: templates/web/zurich/report/new/fill_in_details_form.html:68 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:62 #: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit.html:29 #: templates/web/zurich/admin/report_edit.html:43 @@ -793,38 +752,38 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:50 #: templates/web/zurich/admin/report_edit.html:69 -#, fuzzy msgid "Didn't use map" -msgstr "brukte ikkje kart" +msgstr "" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbeidshestar" #. ("%s is the site name") -#: templates/web/base/auth/general.html:31 -#: templates/web/base/report/new/fill_in_details_form.html:114 -#: templates/web/base/report/update-form.html:87 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 -#: templates/web/fixmystreet/report/update-form.html:86 -#, fuzzy +#: templates/web/base/auth/general.html:48 +#: templates/web/base/report/new/form_user_loggedout.html:18 +#: templates/web/base/report/new/oauth_email_form.html:18 +#: templates/web/base/report/update-form.html:29 +#: templates/web/base/report/update/form_user_loggedout.html:17 msgid "Do you have a %s password?" -msgstr "Har du eit FiksGataMi-passord?" +msgstr "" #: templates/web/base/questionnaire/index.html:55 msgid "Don’t know" msgstr "Veit ikkje" -#: templates/web/fixmystreet/contact/index.html:118 +#: templates/web/base/contact/index.html:110 msgid "Don't like forms?" msgstr "" +#: templates/web/base/js/translation_strings.html:51 +msgid "Drag and drop photos here or <u>click to upload</u>" +msgstr "" + #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:14 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "Duplicate" msgstr "" @@ -874,7 +833,7 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:91 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:22 +#: templates/web/base/auth/general.html:39 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -882,7 +841,7 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1396 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" @@ -898,7 +857,7 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1393 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -906,41 +865,36 @@ msgstr "E-post allereie i misbruklista" msgid "Email me new local problems" msgstr "Send meg e-post om lokale problem" -#: templates/web/base/report/display.html:38 -msgid "Email me updates" -msgstr "Send meg oppdateringar" - #: templates/web/base/admin/category_edit.html:31 #: templates/web/base/admin/report_edit.html:62 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 -#: templates/web/base/report/display.html:42 #: templates/web/zurich/admin/body.html:47 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:329 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:639 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:641 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:642 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:643 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:638 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." @@ -973,7 +927,7 @@ msgstr "" msgid "Enter a Zürich street name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:13 +#: perllib/FixMyStreet/Cobrand/UK.pm:14 msgid "Enter a nearby UK postcode, or street name and area" msgstr "" @@ -991,14 +945,9 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:152 -#: templates/web/base/report/update-form.html:125 -msgid "Enter a new password:" -msgstr "Skriv inn eit nytt passord:" - -#: templates/web/base/auth/general.html:60 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 -#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/base/auth/general.html:99 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" @@ -1008,11 +957,11 @@ msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" #: templates/web/base/errors/generic.html:1 -#: templates/web/base/errors/generic.html:3 +#: templates/web/base/errors/generic.html:4 #: templates/web/base/tokens/abuse.html:1 #: templates/web/base/tokens/abuse.html:3 #: templates/web/base/tokens/error.html:1 -#: templates/web/base/tokens/error.html:3 +#: templates/web/base/tokens/error.html:5 msgid "Error" msgstr "Feil" @@ -1025,11 +974,11 @@ msgstr "" msgid "Example postcode %s" msgstr "Postnummerdøme %s" -#: templates/web/base/open311/index.html:94 +#: templates/web/base/open311/index.html:86 msgid "Examples:" msgstr "Døme:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +#: templates/web/base/report/new/form_report.html:49 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" @@ -1070,17 +1019,15 @@ msgstr "" msgid "FixMyStreet" msgstr "" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:24 #: templates/web/base/admin/report_blocks.html:9 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:34 -#: templates/web/fixmystreet/report/banner.html:12 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:32 +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:38 msgid "Fixed" msgstr "Løyst" @@ -1107,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1281 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1290 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagga:" @@ -1138,8 +1085,8 @@ msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 -#: templates/web/fixmystreet/report/update-form.html:106 +#: templates/web/base/report/new/form_user_loggedout_password.html:20 +#: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1151,21 +1098,18 @@ msgstr "" msgid "Forwarded wish to external body" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 -#: templates/web/base/faq/faq-en-gb.html:13 -#: templates/web/base/faq/faq-en-gb.html:6 -#: templates/web/base/open311/index.html:6 -#: templates/web/base/static/privacy.html:8 -#: templates/web/fixmystreet/contact/index.html:10 +#: templates/web/base/about/_sidebar.html:4 +#: templates/web/base/about/faq-en-gb.html:1 +#: templates/web/base/about/faq-en-gb.html:5 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" -#: templates/web/base/open311/index.html:136 +#: templates/web/base/open311/index.html:128 msgid "GeoRSS on Google Maps" msgstr "GeoRSS på Google Maps" +#: templates/web/base/report/display_tools.html:11 #: templates/web/fixmystreet/around/_updates.html:3 -#: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" msgstr "" @@ -1198,7 +1142,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: templates/web/base/admin/index.html:42 +#: templates/web/base/admin/index.html:35 msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" @@ -1215,7 +1159,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?" #: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:38 -#: templates/web/zurich/faq/faq-de-ch.html:1 +#: templates/web/zurich/about/faq-de-ch.html:1 #: templates/web/zurich/footer.html:22 #: templates/web/zurich/nav_over_content.html:8 msgid "Help" @@ -1266,7 +1210,7 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:754 +#: perllib/FixMyStreet/App/Controller/Admin.pm:752 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." @@ -1284,10 +1228,6 @@ msgstr "" 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:327 -msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" -msgstr "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" - #: templates/web/base/admin/flagged.html:14 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:11 @@ -1316,25 +1256,16 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:2 -#: templates/web/base/report/new/councils_text_none.html:8 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/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." msgstr "Viss du sender inn eit problem hit, så vil emnet og detaljar for problemet vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til administrasjonen." -#: templates/web/zurich/auth/token.html:19 -#: templates/web/zurich/email_sent.html:7 -msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." -msgstr "Viss du brukar vevbasert e-post eller har filter for søppel-e-post på e-postkontoen din, kan du i visse tilfelle måtta sjå etter meldingane våre der." - #: templates/web/base/questionnaire/index.html:68 -#, fuzzy msgid "" "If you wish to leave a public update on the problem, please enter it here\n" "(please note it will not be sent to the council)." msgstr "" -"Viss du ynskjer å leggja til ein offentleg kommentar på problemet, legg han til her\n" -"(denne vert ikkje send til administrasjonen). Du kan til dømes\n" -"dela røynsla di med korleis problemet ditt vart løyst." #: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." @@ -1373,10 +1304,8 @@ msgstr "Ugyldig val av straum" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:32 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:36 msgid "In Progress" msgstr "Under arbeid" @@ -1384,7 +1313,7 @@ msgstr "Under arbeid" msgid "In abuse table?" msgstr "" -#: templates/web/base/open311/index.html:88 +#: templates/web/base/open311/index.html:80 msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." @@ -1392,7 +1321,7 @@ msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifi #: perllib/FixMyStreet/Cobrand/Zurich.pm:963 #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:7 -#: templates/web/fixmystreet/report/banner.html:19 +#: templates/web/base/report/banner.html:19 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 msgid "In progress" @@ -1427,7 +1356,7 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" @@ -1435,7 +1364,7 @@ msgstr "Ugyldig slutt-dato" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1206 msgid "Invalid start date" msgstr "Ugyldig startdato" @@ -1443,14 +1372,12 @@ msgstr "Ugyldig startdato" #: templates/web/base/admin/report_blocks.html:5 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:31 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:35 msgid "Investigating" msgstr "Undersøkjer" -#: templates/web/fixmystreet/contact/blurb.html:8 +#: templates/web/base/contact/blurb.html:8 msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" @@ -1468,11 +1395,9 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:132 -#: templates/web/base/report/update-form.html:105 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 -#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/base/auth/general.html:80 +#: templates/web/base/report/new/form_user_loggedout_password.html:16 +#: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" @@ -1530,6 +1455,7 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" @@ -1549,7 +1475,7 @@ msgstr "" msgid "Marked fixed/closed more than eight weeks ago" msgstr "" -#: templates/web/fixmystreet/contact/index.html:106 +#: templates/web/base/contact/index.html:98 msgid "Message" msgstr "" @@ -1561,10 +1487,6 @@ msgstr "" msgid "Message to external body:" msgstr "" -#: templates/web/base/contact/index.html:97 -msgid "Message:" -msgstr "Melding:" - #: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1577,10 +1499,6 @@ msgstr "" msgid "Month" msgstr "Månad" -#: templates/web/base/report/display.html:34 -msgid "More problems nearby" -msgstr "Fleire problem i nærleiken" - #: templates/web/base/admin/bodies.html:21 #: templates/web/base/admin/body-form.html:18 #: templates/web/base/admin/flagged.html:16 @@ -1588,11 +1506,11 @@ msgstr "Fleire problem i nærleiken" #: templates/web/base/admin/list_updates.html:7 #: templates/web/base/admin/reports.html:13 #: templates/web/base/admin/users.html:15 -#: templates/web/base/auth/general.html:50 +#: templates/web/base/auth/general.html:89 +#: templates/web/base/report/new/form_user_loggedin.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/report/update/form_name.html:4 #: templates/web/base/reports/index.html:20 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 -#: templates/web/fixmystreet/report/update-form.html:138 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 #: templates/web/zurich/report/new/fill_in_details_form.html:82 @@ -1606,7 +1524,7 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328 +#: perllib/FixMyStreet/Script/Reports.pm:107 msgid "Name: %s" msgstr "" @@ -1615,29 +1533,24 @@ msgstr "" msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:128 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:434 -#: perllib/FixMyStreet/Cobrand/Default.pm:474 +#: perllib/FixMyStreet/Cobrand/Default.pm:455 +#: perllib/FixMyStreet/Cobrand/Default.pm:495 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:267 +#: perllib/FixMyStreet/Script/Alerts.pm:290 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -#: templates/web/zurich/email_sent.html:5 -msgid "Nearly Done! Now check your email..." -msgstr "Nesten ferdig! No må du sjekka e-posten din …" - #: templates/web/base/auth/token.html:17 templates/web/base/email_sent.html:5 -#, fuzzy msgid "Nearly done! Now check your email…" -msgstr "Nesten ferdig! No må du sjekka e-posten din …" +msgstr "" #: templates/web/base/reports/index.html:21 msgid "New <br>problems" @@ -1694,9 +1607,8 @@ msgstr "Ny tilstand" #: templates/web/zurich/admin/template_edit.html:9 #: templates/web/zurich/admin/templates.html:26 -#, fuzzy msgid "New template" -msgstr "Ny tilstand" +msgstr "" #: templates/web/base/pagination.html:13 msgid "Next" @@ -1713,8 +1625,8 @@ msgstr "" #: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:101 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/questionnaire/index.html:92 msgid "No" msgstr "Nei" @@ -1778,10 +1690,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:13 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Not Responsible" msgstr "" @@ -1820,7 +1730,7 @@ msgstr "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rappo msgid "Note:" msgstr "Merk:" -#: templates/web/base/open311/index.html:73 +#: templates/web/base/open311/index.html:65 msgid "Note: <strong>%s</strong>" msgstr "Merk: <strong>%s</strong>" @@ -1828,13 +1738,15 @@ msgstr "Merk: <strong>%s</strong>" msgid "Notes from SDM to DM" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:113 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +#: templates/web/base/report/new/form_user_loggedout.html:14 +#: templates/web/base/report/new/form_user_loggedout.html:2 +#: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/update-form.html:86 -#: templates/web/fixmystreet/report/update-form.html:85 +#: templates/web/base/report/update-form.html:28 +#: templates/web/base/report/update/form_user_loggedout.html:13 +#: templates/web/base/report/update/form_user_loggedout.html:2 msgid "Now to submit your update…" msgstr "" @@ -1842,11 +1754,6 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:17 -msgid "Offensive? Unsuitable? Tell us" -msgstr "Støytande? Upassende? Sei frå" - #: templates/web/base/reports/index.html:23 msgid "Old / unknown <br>problems" msgstr "" @@ -1863,7 +1770,7 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +#: templates/web/base/report/new/form_report.html:15 msgid "One-line summary" msgstr "" @@ -1874,8 +1781,7 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:4 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 -#: templates/web/base/report/update-form.html:30 -#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/base/report/update/form_update.html:34 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -1890,15 +1796,15 @@ msgstr "" msgid "Open, but not had any update in eight weeks" msgstr "" -#: templates/web/base/open311/index.html:70 +#: templates/web/base/open311/index.html:62 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tenar" -#: templates/web/base/open311/index.html:80 +#: templates/web/base/open311/index.html:72 msgid "Open311 initiative web page" msgstr "Nettsida til Open311-initiativet" -#: templates/web/base/open311/index.html:81 +#: templates/web/base/open311/index.html:73 msgid "Open311 specification" msgstr "Open311-spesifikasjon" @@ -1910,15 +1816,15 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1084 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:673 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1055 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:668 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:669 +#: perllib/FixMyStreet/DB/Result/Problem.pm:558 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +#: perllib/FixMyStreet/DB/Result/Problem.pm:578 #: perllib/FixMyStreet/DB/Result/Problem.pm:590 -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:412 +#: perllib/FixMyStreet/Script/Reports.pm:175 +#: perllib/FixMyStreet/Script/Reports.pm:190 msgid "Other" msgstr "Anna" @@ -1927,7 +1833,7 @@ msgid "Owner" msgstr "Eigar" #: templates/web/base/errors/page_error_404_not_found.html:1 -#: templates/web/base/errors/page_error_404_not_found.html:3 +#: templates/web/base/errors/page_error_404_not_found.html:4 msgid "Page Not Found" msgstr "Fann ikkje sida" @@ -1941,16 +1847,16 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:53 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 -#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/base/auth/general.html:92 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/auth/general.html:36 +#: templates/web/base/auth/general.html:72 msgid "Password:" msgstr "Passord:" @@ -1962,45 +1868,37 @@ msgstr "" msgid "Phone number" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +#: templates/web/base/report/new/form_user_loggedin.html:26 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:306 +#: perllib/FixMyStreet/Script/Reports.pm:83 #: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/report/new/fill_in_details_form.html:198 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 -#: templates/web/fixmystreet/report/update-form.html:59 +#: templates/web/base/questionnaire/index.html:75 +#: templates/web/base/report/new/form_report.html:23 +#: templates/web/base/report/update/form_update.html:6 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 #: templates/web/zurich/admin/stats.html:37 -#: templates/web/zurich/report/new/fill_in_details_form.html:52 +#: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:221 -#, fuzzy +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 msgid "Photo is required." -msgstr "Denne informasjonen er påkravd" +msgstr "" #: templates/web/base/admin/category_edit.html:48 -#, fuzzy msgid "Photo required" -msgstr "Denne informasjonen er påkravd" - -#: templates/web/base/questionnaire/index.html:80 -#: templates/web/base/report/new/fill_in_details_form.html:84 -#: templates/web/base/report/update-form.html:62 -msgid "Photo:" -msgstr "Bilete:" +msgstr "" -#: templates/web/base/alert/list.html:26 +#: templates/web/base/alert/list.html:23 msgid "Photos of recent nearby reports" msgstr "Bilete av nye problem i nærleiken" @@ -2029,20 +1927,16 @@ msgstr "Ver høfleg, poengtert og kortfatta." msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" -#: templates/web/zurich/auth/token.html:16 -msgid "Please check your email" -msgstr "Ver venleg og sjekk e-posten du oppgav" - -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:16 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:33 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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/Admin.pm:343 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:883 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:948 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:878 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:943 #: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" @@ -2056,25 +1950,29 @@ msgstr "Vel ein type eigenskap" msgid "Please correct the errors below" msgstr "" -#: templates/web/base/contact/blurb.html:2 -#: templates/web/fixmystreet/contact/blurb.html:12 -#, fuzzy +#: templates/web/base/contact/blurb.html:12 msgid "" "Please do <strong>not</strong> report problems through this form; messages go to\n" "the team behind this site, not a council. To report a problem,\n" "please <a href=\"/\">go to the front page</a> and follow the instructions." -msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; meldingane går til gruppa som står bak FiksGataMi, og ikkje til ein administrasjon. For å rapportera eit problem, ver venleg og <a href=\"/\">gå til forsida</a> og følg instruksjonane." +msgstr "" #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:346 -#: perllib/FixMyStreet/DB/Result/Comment.pm:126 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1091 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1146 +#, fuzzy +msgid "Please enter a name" +msgstr "Ver venleg og legg inn namnet ditt" + #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:15 #: templates/web/base/js/translation_strings.html:19 @@ -2087,10 +1985,10 @@ msgstr "Skriv inn eit passord" msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1084 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1137 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1087 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1142 #: perllib/FixMyStreet/App/Controller/Admin.pm:345 -#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: perllib/FixMyStreet/DB/Result/User.pm:133 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 msgid "Please enter a valid email" @@ -2107,9 +2005,9 @@ msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 -#: perllib/FixMyStreet/DB/Result/User.pm:124 -#: templates/web/base/auth/general.html:10 -#: templates/web/base/auth/general.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:130 +#: templates/web/base/auth/general.html:27 +#: templates/web/base/auth/general.html:32 #: templates/web/base/js/translation_strings.html:11 #: templates/web/base/js/translation_strings.html:15 #: templates/web/zurich/auth/general.html:3 @@ -2117,7 +2015,7 @@ 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/form_user_loggedout.html:7 +#: templates/web/base/report/new/form_user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:80 msgid "Please enter your email address" msgstr "" @@ -2126,15 +2024,15 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: perllib/FixMyStreet/Cobrand/UK.pm:319 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:112 -#: perllib/FixMyStreet/DB/Result/Comment.pm:123 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 #: perllib/FixMyStreet/DB/Result/Problem.pm:406 -#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: perllib/FixMyStreet/DB/Result/User.pm:126 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" @@ -2161,12 +2059,11 @@ msgstr "" msgid "Please fill in details of the problem below." msgstr "Ver venleg og fyll ut detaljar om problemet under." -#: templates/web/zurich/report/new/fill_in_details_form.html:46 +#: templates/web/zurich/report/new/fill_in_details_form.html:72 msgid "Please fill in details of the problem." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:28 -#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: templates/web/base/report/new/sidebar.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" @@ -2177,23 +2074,24 @@ 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/fixmystreet/report/updates-sidebar-notes.html:4 +#: templates/web/base/report/updates-sidebar-notes.html:2 msgid "Please note that updates are not sent to the council." msgstr "" -#: templates/web/base/report/update-form.html:7 -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 "" -"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/base/report/new/oauth_email_form.html:4 +#, fuzzy +msgid "Please note your report has <strong>not yet been sent</strong>." +msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." -#: templates/web/base/report/new/fill_in_details_form.html:8 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:20 #: templates/web/zurich/report/new/fill_in_details_form.html:11 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." +#: templates/web/base/report/display.html:26 +msgid "Please note your update has <strong>not yet been posted</strong>." +msgstr "" + #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" @@ -2213,9 +2111,8 @@ msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" #: templates/web/zurich/admin/report_edit.html:208 -#, fuzzy msgid "Please select a body." -msgstr "Vel den kjelda du ynskjer" +msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2232,6 +2129,7 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:117 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:145 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:147 +#: templates/web/base/js/translation_strings.html:53 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" @@ -2239,18 +2137,14 @@ msgstr "Ver venleg og berre last opp JPEG-bilete" msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/fixmystreet/report/update-form.html:23 +#: templates/web/base/report/update/form_update.html:29 msgid "Please write your update here" msgstr "" -#: templates/web/base/contact/index.html:100 -#: templates/web/base/report/update-form.html:110 -#: templates/web/base/report/update-form.html:132 -#: templates/web/base/report/update-form.html:72 -#: templates/web/fixmystreet/contact/index.html:113 -#: templates/web/fixmystreet/report/update-form.html:124 -#: templates/web/fixmystreet/report/update-form.html:71 -#: templates/web/fixmystreet/report/update-form.html:97 +#: templates/web/base/contact/index.html:105 +#: templates/web/base/report/update-form.html:24 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Send inn" @@ -2278,12 +2172,9 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:7 -#: templates/web/base/open311/index.html:7 -#: templates/web/base/static/privacy.html:1 -#: templates/web/base/static/privacy.html:2 -#: templates/web/base/static/privacy.html:9 -#: templates/web/fixmystreet/contact/index.html:11 +#: templates/web/base/about/_sidebar.html:5 +#: templates/web/base/about/privacy.html:1 +#: templates/web/base/about/privacy.html:2 msgid "Privacy and cookies" msgstr "" @@ -2311,12 +2202,12 @@ msgstr "Problem %s stadfesta" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" -#: templates/web/base/admin/index.html:46 +#: templates/web/base/admin/index.html:39 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1055 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2332,11 +2223,11 @@ msgstr "Problem" msgid "Problems in this area" msgstr "Problem i dette området" -#: templates/web/fixmystreet/report/display.html:43 +#: templates/web/base/report/display_tools.html:19 msgid "Problems nearby" msgstr "" -#: templates/web/fixmystreet/report/display.html:41 +#: templates/web/base/report/display_tools.html:17 msgid "Problems on the map" msgstr "" @@ -2348,24 +2239,23 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of this location" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:663 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/UK.pm:207 +#: perllib/FixMyStreet/Cobrand/UK.pm:208 msgid "Problems within %s" msgstr "Problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 -#: perllib/FixMyStreet/Cobrand/UK.pm:221 +#: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 -#, fuzzy msgid "Problems within %s, %s" -msgstr "Problem innanfor %s" +msgstr "" #: templates/web/base/alert/_list.html:42 msgid "Problems within the boundary of:" @@ -2379,19 +2269,16 @@ msgstr "" msgid "Property type:" msgstr "Type eigenskap:" -#: templates/web/base/report/update-form.html:3 -#: templates/web/fixmystreet/report/update-form.html:4 +#: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/auth/general.html:56 +#: templates/web/base/auth/general.html:95 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:156 -#: templates/web/base/report/update-form.html:129 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 -#: templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 msgid "Providing a password is optional, but doing so will allow you to more easily report 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" @@ -2427,18 +2314,17 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:22 #: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/base/reports/_rss.html:1 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +#: perllib/FixMyStreet/Cobrand/UK.pm:251 perllib/FixMyStreet/Cobrand/UK.pm:263 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +#: perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2446,11 +2332,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2462,15 +2348,15 @@ msgstr "RSS-straum med problem i nærleiken" msgid "RSS feed of problems in this %s" msgstr "RSS-straum for problem i denne %s-en" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 +#: perllib/FixMyStreet/Cobrand/Default.pm:664 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/UK.pm:214 +#: perllib/FixMyStreet/Cobrand/UK.pm:215 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 -#: perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" @@ -2479,25 +2365,22 @@ msgstr "RSS-straum for problem innanfor %s bydel" msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" -#: templates/web/base/report/display.html:50 +#: templates/web/base/report/display_tools.html:34 #: templates/web/fixmystreet/alert/updates.html:9 -#: templates/web/fixmystreet/report/display.html:58 msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" #: templates/web/base/alert/updates.html:9 -#: templates/web/base/report/display.html:41 +#: templates/web/base/report/display_tools.html:36 #: templates/web/fixmystreet/alert/updates.html:14 -#: templates/web/fixmystreet/report/display.html:60 msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" #. ("%s is the site name") #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:33 -#, fuzzy msgid "Recent local problems, %s" -msgstr "Nye lokale problem, FiksGataMi." +msgstr "" #: templates/web/base/reports/index.html:24 msgid "Recently <br>fixed" @@ -2515,8 +2398,8 @@ msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:62 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:67 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" @@ -2536,7 +2419,7 @@ msgstr "" msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/fixmystreet/report/display.html:32 +#: templates/web/base/report/display_tools.html:8 msgid "Report abuse" msgstr "" @@ -2545,7 +2428,8 @@ msgid "Report on %s" msgstr "Rapport på %s" #: templates/web/base/report/new/fill_in_details_form.html:1 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +#: templates/web/base/report/new/login_success_form.html:1 +#: templates/web/base/report/new/oauth_email_form.html:1 msgid "Report your problem" msgstr "" @@ -2554,9 +2438,8 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:585 -#: templates/web/base/contact/index.html:50 -#: templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: templates/web/base/contact/index.html:57 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -2565,43 +2448,41 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 -#: templates/web/base/contact/index.html:52 -#: templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 +#: templates/web/base/contact/index.html:59 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" #: templates/web/zurich/admin/report_edit-sdm.html:58 #: templates/web/zurich/admin/report_edit.html:86 -#, fuzzy msgid "Reported by:" -msgstr "Rapportert %s" +msgstr "" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:569 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:591 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:577 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:599 +#: perllib/FixMyStreet/DB/Result/Problem.pm:587 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:573 +#: perllib/FixMyStreet/DB/Result/Problem.pm:561 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:581 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -2611,9 +2492,8 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit.html:55 -#, fuzzy msgid "Reported:" -msgstr "Rapportert %s" +msgstr "" #: templates/web/base/around/index.html:2 #: templates/web/base/js/translation_strings.html:41 @@ -2623,13 +2503,13 @@ msgstr "Rapportert %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1277 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1286 #: perllib/FixMyStreet/Cobrand/Zurich.pm:384 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +#: perllib/FixMyStreet/Cobrand/UK.pm:328 perllib/FixMyStreet/Cobrand/UK.pm:332 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2666,15 +2546,17 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1500 -#: templates/web/base/admin/report_edit.html:88 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1508 +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:64 #: templates/web/zurich/admin/report_edit.html:116 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1495 -#: templates/web/base/admin/report_edit.html:89 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1504 +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:65 #: templates/web/zurich/admin/report_edit.html:117 msgid "Rotate Right" msgstr "" @@ -2684,7 +2566,6 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" @@ -2737,16 +2618,14 @@ msgid "Select an area" msgstr "" #: templates/web/base/alert/_list.html:10 -#, fuzzy msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -msgstr "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." +msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:835 -#, fuzzy msgid "Sent report back" -msgstr "Opne rapportar" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:708 +#: perllib/FixMyStreet/DB/Result/Problem.pm:696 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -2759,15 +2638,13 @@ msgstr "Sendt:" msgid "Service:" msgstr "Teneste:" -#: templates/web/fixmystreet/report/display.html:38 +#: templates/web/base/report/display_tools.html:14 msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:193 -#: templates/web/base/report/update-form.html:158 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 -#: templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/form_user_loggedin.html:23 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/update/form_name.html:15 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" @@ -2779,9 +2656,9 @@ msgstr "" msgid "Show pins" msgstr "Vis nåler" +#: templates/web/base/auth/general.html:100 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:40 -#: templates/web/base/auth/general.html:61 +#: templates/web/base/auth/general.html:76 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 msgid "Sign in" @@ -2808,7 +2685,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:42 +#: templates/web/base/alert/index.html:40 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -2818,7 +2695,7 @@ msgstr "Nokre bilete av nyleg melde problem" msgid "Some text to localize" msgstr "Noko tekst å omsetja" -#: perllib/FixMyStreet/Cobrand/UK.pm:78 +#: perllib/FixMyStreet/Cobrand/UK.pm:79 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer." @@ -2830,22 +2707,33 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:221 -#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:216 +#: perllib/FixMyStreet/Geocode.pm:38 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: templates/web/base/auth/general.html:9 +#: templates/web/base/report/display.html:21 +#: templates/web/base/report/new/fill_in_details_form.html:23 +#, fuzzy +msgid "Sorry, we could not log you in. Please fill in the form below." +msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." + +#: perllib/FixMyStreet/Geocode/Bing.pm:35 #: perllib/FixMyStreet/Geocode/Google.pm:45 #: perllib/FixMyStreet/Geocode/Zurich.pm:88 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." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:134 -#, fuzzy msgid "Sorry, we couldn't save your image(s), please try again." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301 +#, fuzzy +msgid "Sorry, you can not log in with Facebook. Please try again later." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." #: templates/web/base/admin/stats.html:64 @@ -2856,13 +2744,12 @@ msgstr "" #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 -#: templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/report/update/form_update.html:32 msgid "State" msgstr "Tilstand" #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 -#: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:73 #: templates/web/zurich/admin/report_edit.html:101 #: templates/web/zurich/admin/report_edit.html:155 @@ -2870,7 +2757,7 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1282 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1291 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:73 @@ -2892,7 +2779,7 @@ msgstr "" msgid "Street View" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406 +#: perllib/FixMyStreet/Script/Reports.pm:184 msgid "Subcategory: %s" msgstr "" @@ -2900,30 +2787,25 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/fixmystreet/contact/index.html:98 +#: templates/web/base/contact/index.html:90 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:19 -#: templates/web/base/contact/index.html:88 -#: templates/web/base/report/new/fill_in_details_form.html:53 #: templates/web/zurich/admin/report_edit.html:39 msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:137 -#: templates/web/base/report/new/fill_in_details_form.html:159 -#: templates/web/base/report/new/fill_in_details_form.html:96 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:36 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:39 +#: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:96 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:95 -#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/report_edit.html:101 +#: templates/web/base/admin/update_edit.html:75 #: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:137 #: templates/web/zurich/admin/report_edit.html:268 @@ -2931,7 +2813,7 @@ msgstr "Send inn" msgid "Submit changes" msgstr "Send inn endringar" -#: templates/web/base/questionnaire/index.html:97 +#: templates/web/base/questionnaire/index.html:106 msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" @@ -2947,9 +2829,8 @@ msgid "Submitted" msgstr "" #: templates/web/base/alert/updates.html:17 -#: templates/web/base/report/display.html:46 +#: templates/web/base/report/display_tools.html:41 #: templates/web/fixmystreet/alert/updates.html:23 -#: templates/web/fixmystreet/report/display.html:65 msgid "Subscribe" msgstr "Abonner" @@ -2957,7 +2838,7 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1275 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1284 #: perllib/FixMyStreet/Cobrand/Zurich.pm:383 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 @@ -2976,7 +2857,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1279 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1288 msgid "Survey" msgstr "" @@ -2990,9 +2871,8 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:394 #: templates/web/zurich/header.html:77 -#, fuzzy msgid "Templates" -msgstr "Oppdateringar" +msgstr "" #: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 @@ -3013,7 +2893,7 @@ msgstr "Tekst:" msgid "Thank you for reporting this issue!" msgstr "" -#: templates/web/base/tokens/error.html:7 +#: templates/web/base/tokens/error.html:6 msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it." msgstr "" "Takk for at du freistar å stadfesta oppdateringa di eller problemet\n" @@ -3051,23 +2931,23 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:71 +#: perllib/FixMyStreet/Cobrand/UK.pm:72 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:726 +#: perllib/FixMyStreet/App/Controller/Admin.pm:724 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:718 +#: perllib/FixMyStreet/App/Controller/Admin.pm:716 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:125 +#: perllib/FixMyStreet/App/Controller/Report.pm:127 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:119 +#: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -3098,7 +2978,7 @@ msgid "" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" -#: templates/web/base/open311/index.html:90 +#: templates/web/base/open311/index.html:82 msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-attributten agency_responsible vert brukt for å lista opp administrasjonane som mottok problemrapporten, noko som ikkje heilt passar med korleis attributten er definert i Open311 v2-spesifikasjonen." @@ -3119,12 +2999,12 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 -#: perllib/FixMyStreet/App/Controller/Reports.pm:79 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:61 +#: perllib/FixMyStreet/App/Controller/Reports.pm:80 msgid "The error was: %s" msgstr "Feilen var: %s" -#: templates/web/base/open311/index.html:86 +#: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." @@ -3171,8 +3051,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Passorda er ikkje like" -#: templates/web/base/errors/page_error_404_not_found.html:10 -#: templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:9 msgid "The requested URL '%s' was not found on this server" msgstr "Fann ikkje URL-en «%s» på denne tenaren" @@ -3182,12 +3061,11 @@ msgstr "Den enklaste meldinga er den geografiske:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 -#: templates/web/base/report/new/fill_in_details_form.html:18 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:13 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315 +#: perllib/FixMyStreet/Script/Reports.pm:92 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn" @@ -3204,18 +3082,18 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:76 +#: perllib/FixMyStreet/App/Controller/Reports.pm:77 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/Contact.pm:137 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:769 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 -#: templates/web/base/auth/general.html:26 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:764 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:138 +#: templates/web/base/auth/general.html:43 #: templates/web/zurich/auth/general.html:28 msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." msgstr "" @@ -3224,7 +3102,7 @@ msgstr "" 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:272 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:336 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3232,7 +3110,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:300 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -3246,7 +3124,7 @@ msgid "" " " msgstr "" -#: templates/web/base/open311/index.html:77 +#: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." @@ -3268,18 +3146,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:413 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:416 +#: perllib/FixMyStreet/Script/Reports.pm:194 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:995 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:920 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:990 #: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 -#: perllib/FixMyStreet/Cobrand/UK.pm:43 +#: perllib/FixMyStreet/Cobrand/UK.pm:44 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3291,56 +3169,37 @@ msgstr "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databas msgid "This is a summary of all reports on this site." msgstr "" -#: templates/web/zurich/auth/token.html:8 -msgid "This may be because the link is too old or already used, or the address was not copied correctly." -msgstr "" - -#: templates/web/base/report/banner.html:15 -msgid "This problem has been closed" -msgstr "Dette problemet er lukka" - -#: templates/web/base/report/banner.html:12 -#: templates/web/base/report/update-form.html:48 -#: templates/web/fixmystreet/report/update-form.html:46 +#: templates/web/base/report/update/form_update.html:52 msgid "This problem has been fixed" msgstr "Dette problemet er løyst" -#: templates/web/base/report/update-form.html:43 -#: templates/web/fixmystreet/report/update-form.html:40 +#: templates/web/base/report/update/form_update.html:46 msgid "This problem has not been fixed" msgstr "Dette problemet har ikkje vorte løyst" -#: templates/web/base/report/banner.html:19 -msgid "This problem is in progress" -msgstr "Dette problemet er under arbeid" - -#: templates/web/base/report/banner.html:9 -msgid "This problem is old and of unknown status." -msgstr "Dette problemet er gammalt og med ukjend status." - #: perllib/FixMyStreet/Cobrand/Zurich.pm:168 #: perllib/FixMyStreet/Cobrand/Zurich.pm:169 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86 +#: perllib/FixMyStreet/Script/Alerts.pm:94 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84 +#: perllib/FixMyStreet/Script/Alerts.pm:92 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88 +#: perllib/FixMyStreet/Script/Alerts.pm:96 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326 +#: perllib/FixMyStreet/Script/Reports.pm:105 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:308 +#: perllib/FixMyStreet/Script/Reports.pm:85 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." @@ -3351,7 +3210,7 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1278 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1287 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3363,9 +3222,8 @@ msgid "Title" msgstr "Tittel" #: templates/web/zurich/admin/template_edit.html:20 -#, fuzzy msgid "Title:" -msgstr "Tittel" +msgstr "" #: templates/web/base/alert/index.html:25 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" @@ -3375,11 +3233,11 @@ msgstr "" msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +#: perllib/FixMyStreet/Script/Reports.pm:91 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" -#: templates/web/base/admin/index.html:61 +#: templates/web/base/admin/index.html:54 #: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/stats.html:24 #: templates/web/base/admin/stats.html:43 @@ -3397,10 +3255,8 @@ msgstr "" #: templates/web/base/admin/report_blocks.html:1 #: templates/web/base/admin/report_blocks.html:12 -#: templates/web/base/report/update-form.html:30 -#: templates/web/base/report/update-form.html:33 -#: templates/web/fixmystreet/report/update-form.html:28 -#: templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/report/update/form_update.html:34 +#: templates/web/base/report/update/form_update.html:37 msgid "Unable to fix" msgstr "" @@ -3413,7 +3269,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: templates/web/fixmystreet/report/banner.html:9 +#: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" @@ -3421,17 +3277,18 @@ msgstr "" msgid "Unknown alert type" msgstr "Ukjend varsel-type" +#: perllib/FixMyStreet/App/Controller/Photo.pm:110 #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:103 -#: perllib/FixMyStreet/App/Controller/Report.pm:109 -#: perllib/FixMyStreet/App/Controller/Report.pm:112 +#: perllib/FixMyStreet/App/Controller/Report.pm:105 +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +#: perllib/FixMyStreet/App/Controller/Report.pm:114 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/fixmystreet/report/update-form.html:19 +#: templates/web/base/report/update/form_update.html:25 msgid "Update" msgstr "" @@ -3439,13 +3296,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" -#: templates/web/base/contact/index.html:21 -#: templates/web/fixmystreet/contact/index.html:36 +#: templates/web/base/contact/index.html:28 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" -#: templates/web/base/contact/index.html:23 -#: templates/web/fixmystreet/contact/index.html:38 +#: templates/web/base/contact/index.html:30 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" @@ -3454,7 +3309,7 @@ msgstr "Oppdateringa under vart lagt til av %s %s" msgid "Update body" msgstr "" -#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/index.html:48 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringar" @@ -3479,20 +3334,16 @@ msgstr "Ei oppdatering gjenopna problemet" msgid "Update statuses" msgstr "Oppdater tilstanden" -#: templates/web/base/report/update-form.html:22 -msgid "Update:" -msgstr "Oppdatering:" - #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1045 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1103 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1147 -#: perllib/FixMyStreet/App/Controller/Admin.pm:822 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1156 +#: perllib/FixMyStreet/App/Controller/Admin.pm:821 #: perllib/FixMyStreet/Cobrand/Zurich.pm:771 #: perllib/FixMyStreet/Cobrand/Zurich.pm:796 #: perllib/FixMyStreet/Cobrand/Zurich.pm:866 @@ -3500,13 +3351,12 @@ msgid "Updated!" msgstr "Oppdatert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:3 -#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/base/report/update.html:5 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:132 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3516,12 +3366,9 @@ msgstr "Oppdateringar av {{title}}" #. ("%s is the site name") #: templates/web/base/report/display.html:0 -#: templates/web/base/report/display.html:5 -#: templates/web/fixmystreet/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:9 -#, fuzzy +#: templates/web/base/report/display.html:9 msgid "Updates to this problem, %s" -msgstr "Oppdateringar til dette problemet, FiksGataMi" +msgstr "" #: templates/web/base/admin/body.html:182 msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body." @@ -3529,15 +3376,14 @@ msgstr "" #: templates/web/zurich/admin/report_edit-sdm.html:48 #: templates/web/zurich/admin/report_edit.html:67 -#, fuzzy msgid "Used map" -msgstr "brukte kart" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1424 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1433 msgid "User flagged" msgstr "Brukar flagga" @@ -3545,7 +3391,7 @@ msgstr "Brukar flagga" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1280 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1289 #: perllib/FixMyStreet/Cobrand/Zurich.pm:399 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 @@ -3576,7 +3422,6 @@ msgid "Viewing a location" msgstr "Ser på ein stad" #: templates/web/base/report/display.html:0 -#: templates/web/fixmystreet/report/display.html:0 msgid "Viewing a problem" msgstr "Ser på eit problem" @@ -3589,25 +3434,24 @@ msgstr "Bydelar innanfor denne administrasjonen" msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her." -#: templates/web/zurich/auth/token.html:7 -msgid "We have not been able to confirm your account - sorry." -msgstr "" - -#: templates/web/zurich/auth/token.html:17 -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 din." +#: templates/web/base/auth/general.html:6 +#: templates/web/base/report/display.html:27 +#: templates/web/base/report/new/oauth_email_form.html:5 +#, fuzzy +msgid "We need your email address, please give it below." +msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 -#: templates/web/fixmystreet/report/update-form.html:77 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 msgid "We never show your email" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +#: templates/web/base/report/new/form_user_loggedin.html:31 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:422 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss." @@ -3624,10 +3468,6 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/contact/blurb.html:8 -msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" -msgstr "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/base/contact/submit.html:7 msgid "We’ll get back to you as soon as we can." msgstr "" @@ -3636,7 +3476,7 @@ msgstr "" msgid "What was your experience of getting the problem fixed?" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +#: templates/web/base/report/new/form_report.html:19 msgid "What’s the issue, and where is it?" msgstr "" @@ -3649,7 +3489,11 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:640 +#: templates/web/base/js/translation_strings.html:50 +msgid "Whoa there Testino! Three photos are enough." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" @@ -3664,7 +3508,7 @@ msgstr "" msgid "Wish" msgstr "" -#: templates/web/base/open311/index.html:92 +#: templates/web/base/open311/index.html:84 msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>." msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a href=\"%s\">MaPit</a>." @@ -3672,7 +3516,7 @@ msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja et msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" -#: templates/web/base/questionnaire/index.html:87 +#: templates/web/base/questionnaire/index.html:96 msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner deg om å sjekka status?" @@ -3681,7 +3525,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting." #: templates/web/base/report/new/fill_in_details_form.html:4 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." msgstr "" @@ -3704,27 +3547,24 @@ msgstr "År" #: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:51 -#: templates/web/base/questionnaire/index.html:90 +#: templates/web/base/questionnaire/index.html:99 msgid "Yes" msgstr "Ja" -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 -#: templates/web/fixmystreet/report/update-form.html:91 +#: templates/web/base/report/new/form_user_loggedout_password.html:5 +#: templates/web/base/report/update/form_user_loggedout_password.html:4 msgid "Yes I have a password" msgstr "" -#: templates/web/base/contact/index.html:39 -#: templates/web/fixmystreet/contact/index.html:54 +#: templates/web/base/contact/index.html:46 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/contact/index.html:41 -#: templates/web/fixmystreet/contact/index.html:56 +#: templates/web/base/contact/index.html:48 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" -#: templates/web/base/contact/index.html:15 -#: templates/web/fixmystreet/contact/index.html:30 +#: templates/web/base/contact/index.html:22 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:" @@ -3737,7 +3577,7 @@ msgstr "" msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" -#: templates/web/fixmystreet/contact/index.html:121 +#: templates/web/base/contact/index.html:113 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -3748,8 +3588,8 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:10 -#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:12 +#: templates/web/base/report/new/councils_text_none.html:14 #: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." @@ -3767,21 +3607,16 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n" -#: templates/web/base/questionnaire/index.html:77 -#: templates/web/base/report/new/fill_in_details_form.html:75 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 -msgid "You have already attached a photo to this report, attaching another one will replace it." -msgstr "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved eit anna vil byta ut dette." - -#: templates/web/base/report/update-form.html:59 -#: templates/web/fixmystreet/report/update-form.html:56 -msgid "You have already attached a photo to this update, attaching another one will replace it." -msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Å leggja ved eit anna vil byta ut dette." - -#: templates/web/zurich/report/new/fill_in_details_form.html:61 +#: templates/web/base/report/new/form_report.html:32 +#: templates/web/zurich/report/new/fill_in_details_form.html:55 msgid "You have already attached photos to this report. Note that you can attach a maximum of 3 to this report (if you try to upload more, the oldest will be removed)." msgstr "" +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/base/report/update/form_update.html:14 +msgid "You have already attached photos to this update. Note that you can attach a maximum of 3 to this update (if you try to upload more, the oldest will be removed)." +msgstr "" + #: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" @@ -3796,9 +3631,8 @@ msgstr "" msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/report/display.html:20 -#: templates/web/base/report/new/fill_in_details.html:37 -#: templates/web/fixmystreet/report/display.html:17 +#: templates/web/base/report/display.html:17 +#: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:" @@ -3827,53 +3661,42 @@ msgid "Your Reports" msgstr "Rapportane dine" #: templates/web/base/alert/_list.html:89 +#: templates/web/base/contact/index.html:83 +#: templates/web/base/report/display_tools.html:38 +#: templates/web/base/report/display_tools.html:40 +#: templates/web/base/report/new/form_user_loggedin.html:3 +#: templates/web/base/report/new/form_user_loggedout_email.html:1 +#: templates/web/base/report/update/form_user_loggedout_email.html:1 #: templates/web/fixmystreet/alert/updates.html:19 #: templates/web/fixmystreet/alert/updates.html:22 -#: templates/web/fixmystreet/contact/index.html:91 -#: templates/web/fixmystreet/report/display.html:62 -#: templates/web/fixmystreet/report/display.html:64 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 -#: templates/web/fixmystreet/report/update-form.html:76 #: templates/web/zurich/report/new/fill_in_details_form.html:76 msgid "Your email" msgstr "" -#: templates/web/base/auth/general.html:28 -#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/base/auth/general.html:45 +#: templates/web/base/report/update/form_user_loggedout_email.html:7 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:106 -#: templates/web/base/report/update-form.html:81 -msgid "Your email:" -msgstr "E-posten din" - -#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7 +#: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:51 -#: templates/web/fixmystreet/contact/index.html:84 -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 -#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/base/auth/general.html:90 +#: templates/web/base/contact/index.html:76 +#: templates/web/base/report/new/form_user_loggedin.html:18 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/update/form_name.html:11 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:86 msgid "Your name" msgstr "" -#: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:186 -#: templates/web/base/report/update-form.html:152 -msgid "Your name:" -msgstr "Namnet ditt:" - -#: templates/web/base/auth/general.html:39 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 -#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/base/auth/general.html:75 +#: templates/web/base/report/new/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3882,15 +3705,16 @@ msgstr "" msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 -#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:27 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:92 msgid "Your phone number" msgstr "" #: templates/web/base/questionnaire/index.html:14 +#, fuzzy msgid "Your report" -msgstr "" +msgstr "Oppdateringane dine" #: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29 msgid "Your reports" @@ -3900,23 +3724,17 @@ msgstr "Oppdateringane dine" msgid "Your updates" msgstr "Oppdateringane dine" -#: templates/web/base/contact/index.html:81 -msgid "Your email:" -msgstr "E-posten din:" - #: templates/web/base/reports/_list-filters.html:3 -#, fuzzy msgid "all reports" -msgstr "Alle rapportar" +msgstr "" #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "av %s" #: templates/web/base/reports/_list-filters.html:5 -#, fuzzy msgid "closed reports" -msgstr "Lukka rapportar" +msgstr "" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 @@ -3938,17 +3756,16 @@ msgid "edit user" msgstr "" #: templates/web/base/reports/_list-filters.html:6 -#, fuzzy msgid "fixed reports" -msgstr "Løyste rapportar" +msgstr "" -#: templates/web/base/admin/index.html:33 +#: templates/web/base/status/stats.html:20 #: templates/web/zurich/admin/index.html:5 msgid "from %s different users" -msgstr "frå %d ulike brukarar" +msgstr "frå %s ulike brukarar" -#: templates/web/base/report/_item.html:17 -#: templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item.html:15 +#: templates/web/zurich/report/_item.html:14 msgid "last updated %s" msgstr "" @@ -4040,10 +3857,8 @@ msgstr "opna på nytt" msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:12 -#: templates/web/base/report/new/fill_in_details_form.html:15 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/fill_in_details_form.html:9 msgid "the local council" msgstr "den lokale administrasjonen" @@ -4052,7 +3867,7 @@ msgstr "den lokale administrasjonen" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398 +#: perllib/FixMyStreet/Script/Reports.pm:176 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -4061,9 +3876,8 @@ msgid "today" msgstr "i dag" #: templates/web/base/reports/_list-filters.html:4 -#, fuzzy msgid "unfixed reports" -msgstr "Løyste rapportar" +msgstr "" #: templates/web/base/admin/report_edit.html:32 msgid "used map" @@ -4082,7 +3896,7 @@ msgstr "brukaren er eigaren av problemet" msgid "ward" msgstr "bydel" -#: templates/web/base/front/stats.html:17 +#: templates/web/base/front/stats.html:13 #, perl-format msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" @@ -4110,7 +3924,7 @@ msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:29 +#: templates/web/base/front/stats.html:25 #, perl-format msgid "<big>%s</big> update on reports" msgid_plural "<big>%s</big> updates on reports" @@ -4131,14 +3945,14 @@ msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: templates/web/base/front/stats.html:12 +#: templates/web/base/front/stats.html:8 #, perl-format msgid "<big>%s</big> report in past week" msgid_plural "<big>%s</big> reports in past week" msgstr[0] "<big>%s</big> rapport siste veke" msgstr[1] "<big>%s</big> rapportar siste veke" -#: templates/web/base/front/stats.html:23 +#: templates/web/base/front/stats.html:19 #, perl-format msgid "<big>%s</big> fixed in past month" msgid_plural "<big>%s</big> fixed in past month" @@ -4159,95 +3973,80 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." -#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" -#~ msgstr "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>" - -#~ msgid "<strong>No</strong>, I do not, let me sign in by email:" -#~ msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" - -#~ msgid "Closest nearby problems <small>(within %skm)</small>" -#~ msgstr "Dei næraste problema <small>(innanfor %skm)</small>" - -#~ msgid "Contact FixMyStreet" -#~ msgstr "Kontakt FiksGataMi" - -#~ msgid "FixMyStreet admin:" -#~ msgstr "FiksGataMi-administrator:" - -#~ msgid "New local reports on reportemptyhomes.com" -#~ msgstr "Nye lokale rapportar på reportemptyhomes.com" - -#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -#~ msgstr "Nye rapportar for {{COUNCIL}} innanfor {{WARD}} bydel på reportemptyhomes.com" +#~ msgid "(we never show your email)" +#~ msgstr "(vi viser aldri e-postadressa di)" -#~ msgid "New reports on reportemptyhomes.com" -#~ msgstr "Nye rapportar på reportemptyhomes.com" +#~ msgid "<strong>No</strong>, let me confirm my report by email:" +#~ msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" -#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" -#~ msgstr "Nye rapportar på reportemptyhomes.com nær postnummer {{POSTCODE}}" +#~ msgid "<strong>No</strong>, let me confirm my update by email:" +#~ msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" -#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -#~ msgstr "Nye rapportar til {{COUNCIL}} på reportemptyhomes.com" +#~ msgid "Email me updates" +#~ msgstr "Send meg oppdateringar" -#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -#~ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com" +#~ msgid "Enter a new password:" +#~ msgstr "Skriv inn eit nytt passord:" -#~ msgid "No problems found." -#~ msgstr "Fann ingen problem." +#~ msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n" +#~ msgstr "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n" -#~ msgid "No problems have been reported yet." -#~ msgstr "Ingen problem er rapporterte" +#~ msgid "If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way." +#~ msgstr "Viss du brukar vevbasert e-post eller har filter for søppel-e-post på e-postkontoen din, kan du i visse tilfelle måtta sjå etter meldingane våre der." -#~ msgid "Now to submit your report… do you have a FixMyStreet password?" -#~ msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" +#~ msgid "Message:" +#~ msgstr "Melding:" -#~ msgid "Now to submit your update… do you have a FixMyStreet password?" -#~ msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?" +#~ msgid "More problems nearby" +#~ msgstr "Fleire problem i nærleiken" -#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." -#~ msgstr "Kjeldekoda vår er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengeleg på GitHub</a>." +#~ msgid "Nearly Done! Now check your email..." +#~ msgstr "Nesten ferdig! No må du sjekka e-posten din …" -#~ msgid "Please take a look at the updates that have been left." -#~ msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." +#~ msgid "Offensive? Unsuitable? Tell us" +#~ msgstr "Støytande? Upassende? Sei frå" -#~ msgid "Problems within %s, FixMyStreet" -#~ msgstr "Problem innanfor %s, FiksGataMi" +#~ msgid "Photo:" +#~ msgstr "Bilete:" -#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com" -#~ msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" +#~ msgid "Please check your email" +#~ msgstr "Ver venleg og sjekk e-posten du oppgav" -#~ msgid "Reported %s, to %s" -#~ msgstr "Rapportert %s, til %s" +#~ 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 "" +#~ "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>" -#~ msgid "Reports on and around the map" -#~ msgstr "Problem i og rundt kartet" +#~ msgid "This problem has been closed" +#~ msgstr "Dette problemet er lukka" -#~ msgid "Sign in by email" -#~ msgstr "Logg inn via epost" +#~ msgid "This problem is in progress" +#~ msgstr "Dette problemet er under arbeid" -#~ msgid "Signed in as %s" -#~ msgstr "Logga inn som %s" +#~ msgid "This problem is old and of unknown status." +#~ msgstr "Dette problemet er gammalt og med ukjend status." -#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -#~ msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem fram — så ver tålmodig." +#~ msgid "Update:" +#~ msgstr "Oppdatering:" -#~ msgid "The details of your problem are available on the right hand side of this page." -#~ msgstr "Detaljane om problemet ditt er tilgjengelege på høgre kant av denne sida." +#~ 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 din." -#~ msgid "The latest local reports reported by users" -#~ msgstr "Dei siste lokale rapportane rapportert av brukarar" +#~ msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:" +#~ msgstr "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>:" -#~ msgid "The latest properties reported back to use by users" -#~ msgstr "Dei siste eigedomane rapportert tilbake i bruk av brukarar" +#~ msgid "You have already attached a photo to this report, attaching another one will replace it." +#~ msgstr "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved eit anna vil byta ut dette." -#~ msgid "The latest reports for {{COUNCIL}} reported by users" -#~ msgstr "Dei siste rapportane for {{COUNCIL}} rapportert av brukarar" +#~ msgid "You have already attached a photo to this update, attaching another one will replace it." +#~ msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Å leggja ved eit anna vil byta ut dette." -#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -#~ msgstr "Dei siste rapportane for {{COUNCIL}} innanfor {{WARD}} bydel rapportert av brukarar" +#~ msgid "Your email:" +#~ msgstr "E-posten din" -#~ msgid "The latest reports within {{NAME}}'s boundary reported by users" -#~ msgstr "Dei siste rapportane innanfor grensa til {{NAME}} rapportert av brukarar" +#~ msgid "Your name:" +#~ msgstr "Namnet ditt:" -#~ msgid "Your email address:" -#~ msgstr "e-postadressa di:" +#~ msgid "Your email:" +#~ msgstr "E-posten din:" |