aboutsummaryrefslogtreecommitdiffstats
path: root/locale/nb_NO.UTF-8
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2016-03-02 14:58:23 +0000
committerMatthew Somerville <matthew@mysociety.org>2016-03-02 14:58:23 +0000
commit2fc65ef99e7591f4f570c5102f46583a0ce9a793 (patch)
treec30c3c3da3adb22261ddadccc4f6f26d7ba1af37 /locale/nb_NO.UTF-8
parent3ef78780e20e1ede6631a2243c7f337bea46b269 (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/nb_NO.UTF-8')
-rw-r--r--locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po1381
1 files changed, 570 insertions, 811 deletions
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index e603727b3..d9daeb663 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -5,7 +5,8 @@
#
# Translators:
# Guttorm Flatabø <post@guttormflatabo.com>, 2013
-# oeyrvin <oeyrvin@hagan.no>, 2015
+# Jan Høydahl <jh@cominvent.com>, 2016
+# Ole-Erik Yrvin <oeyrvin@gmail.com>, 2015
# Ørjan Vøllestad <orjanv@gmail.com>, 2014
# pere <pere-transifex@hungry.com>, 2012,2015
# pere <pere-transifex@hungry.com>, 2015
@@ -14,9 +15,9 @@ 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-10-15 09:47+0000\n"
-"Last-Translator: pere <pere-transifex@hungry.com>\n"
+"POT-Creation-Date: 2016-03-02 13:09+0000\n"
+"PO-Revision-Date: 2016-01-06 11:44+0000\n"
+"Last-Translator: Jan Høydahl <jh@cominvent.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/mysociety/fixmystreet/language/nb_NO/)\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
@@ -24,45 +25,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 bekreftede varsler, %d ubekreftede"
-
-#: 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 &ndash; %s confirmed, %s unconfirmed"
-msgstr "%d administrasjonskontakter &ndash; %d bekreftet, %d ubekreftet"
-
#: templates/web/base/admin/edit-league.html:12
msgid "%d edits by %s"
msgstr "%d redigeringer av %s"
-#: templates/web/base/admin/index.html:34
-#: templates/web/base/status/index.html:12
-msgid "%s live updates"
-msgstr "%d aktive oppdateringer"
-
-#: templates/web/base/admin/index.html:36
-#: templates/web/base/status/index.html:14
-msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
-msgstr "%d spørreskjema sendt &ndash; %d besvart (%s%%)"
-
#: templates/web/base/pagination.html:10
msgid "%d to %d of %d"
msgstr "%d til %d av %d"
@@ -75,37 +55,56 @@ msgstr "%s - oppsummeringsrapporter"
#. ("%s here is the site name")
#: templates/web/base/admin/header.html:10
msgid "%s admin:"
-msgstr ""
+msgstr "%s administrator:"
+
+#: templates/web/base/status/stats.html:26
+#, fuzzy
+msgid "%s bodies"
+msgstr "Administrasjoner"
+
+#: templates/web/base/status/stats.html:24
+msgid "%s confirmed alerts, %s unconfirmed"
+msgstr "%s bekreftede varsler, %s ubekreftede"
+
+#: templates/web/base/status/stats.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%s council contacts &ndash; %s confirmed, %s unconfirmed"
+msgstr "%s administrasjonskontakter &ndash; %s bekreftet, %s ubekreftet"
#. ("%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-strømmer og e-postlister om lokale problemer, dette inkluderer problemer meldt innenfor en bestemt bydel eller administrasjon, eller et område med problemer\n"
+"%s har ulike RSS-strømmer og e-post-varsler om lokale problemer, inkludert problemer meldt innenfor en bestemt bydel eller administrasjon, eller et område med problemer\n"
"innen en angitt distanse fra en bestemt 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-strømmer og e-postlister om lokale problemer, dette inkluderer problemer meldt innenfor en bestemt bydel eller administrasjon, eller et område med problemer\n"
+"%s har ulike RSS-strømmer og e-post-varsler om lokale problemer, inkludert problemer meldt innenfor en bestemt bydel eller administrasjon, eller et område med problemer\n"
"innen en angitt distanse fra en bestemt posisjon."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:695
+#: templates/web/base/status/stats.html:23
+msgid "%s live updates"
+msgstr "%s aktive oppdateringer"
+
+#: templates/web/base/status/stats.html:25
+msgid "%s questionnaires sent &ndash; %s answered (%s%%)"
+msgstr "%s spørreskjema sendt &ndash; %s besvart (%s%%)"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:683
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%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"
@@ -113,17 +112,17 @@ msgid ""
"will be sent to the district council, so will appear in both of the district\n"
"council&rsquo;s alerts, but will only appear in the \"Within the boundary\" alert\n"
"for the county council."
-msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige administrasjoner, problemer som gjelder flere administrasjoner blir sendt til alle de det gjelder."
+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 "%s, rapportert %s"
-#: 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, innefor bydel %s"
@@ -131,9 +130,9 @@ msgstr "%s, innefor bydel %s"
msgid "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
msgstr "&copy; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere"
-#: templates/web/zurich/report/new/fill_in_details_form.html:53
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "(Defect &amp; location of defect)"
-msgstr ""
+msgstr "(Feil & lokasjon for feil)"
#: templates/web/base/admin/report_blocks.html:41
#: templates/web/base/admin/users.html:31
@@ -142,15 +141,13 @@ msgstr "(Epost i misbrukstabellen)"
#: templates/web/zurich/admin/report_edit-sdm.html:60
#: templates/web/zurich/admin/report_edit.html:88
-#, fuzzy
msgid "(No name)"
-msgstr "Ditt navn"
+msgstr "(Uten navn)"
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:95
-#, fuzzy
msgid "(No phone number)"
-msgstr "Ditt telefonnummer"
+msgstr "(Uten telefonnummer)"
#: templates/web/base/alert/_list.html:24
msgid "(a default distance which covers roughly 200,000 people)"
@@ -158,17 +155,16 @@ msgstr "(en standardavstand som dekker en befolkning 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-strømmen tilpasses, innenfor"
+msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor %s)"
-#: 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 "(lukket)"
-#: 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øst)"
@@ -176,37 +172,28 @@ msgstr "(løst)"
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)"
-#: templates/web/base/report/_item.html:21
+#: templates/web/base/report/_item.html:19
msgid "(not sent to council)"
msgstr "(ikke 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 "(valgfritt)"
-#: templates/web/fixmystreet/report/public_label.html:1
+#: templates/web/base/report/public_label.html:1
msgid "(public)"
msgstr "(offentlig)"
-#: 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 din e-postadresse eller telefonnummer)"
-
-#: templates/web/base/report/update-form.html:159
-msgid "(we never show your email)"
-msgstr "(vi viser aldri din e-postadresse)"
-
-#: 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 "-- Velg en 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 "-- Velg en eiendomsstype --"
@@ -223,54 +210,41 @@ msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_T
#. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
#: templates/web/base/reports/_list-filters.html:27
msgid "<label>Show %s</label> <label>about %s</label>"
-msgstr ""
+msgstr "<label>Vis %s</label> <label>om %s</label>"
-#: 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 problemer"
+msgstr "<strong>%s</strong> aktive problemer"
-#: 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 "<strong>Nei</strong> La meg bekrefte min rapport med e-post"
-#: 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 "<strong>Nei</strong> La meg bekrefte min oppdatering med e-post"
-#: 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 "<strong>Nei</strong>, la meg logge inn med e-post:"
-#: 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 bekrefte min rapport 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 bekrefte min oppdatering 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>, jeg har et 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 "Handling planlagt"
@@ -301,14 +275,13 @@ msgstr "Legg til ny kategori"
msgid "Add user"
msgstr "Legg til bruker"
-#: templates/web/base/my/my.html:52
+#: templates/web/base/my/my.html:56
msgid "Added %s"
msgstr "La til %s"
#: templates/web/base/report/new/category_extras.html:9
-#, fuzzy
msgid "Additional Information"
-msgstr "Avventer moderasjon"
+msgstr "Tilleggsinformasjon"
#: templates/web/base/auth/change_password.html:29
msgid "Again:"
@@ -322,8 +295,7 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Varsel %d koblet ut (opprettet %s)"
-#: templates/web/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 fremtidige oppdateringer"
@@ -333,9 +305,8 @@ msgid "All Reports"
msgstr "Alle rapporter"
#: templates/web/zurich/admin/stats.html:5
-#, fuzzy
msgid "All Reports as CSV"
-msgstr "Alle rapporter"
+msgstr "Alle rapporter som CSV"
#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:32
#: templates/web/zurich/admin/index-dm.html:12
@@ -356,10 +327,8 @@ msgstr "All informasjonen du har lagt inn her vil bli sendt 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 bli sendt til <strong>%s</strong>."
@@ -381,6 +350,10 @@ msgstr "Anonym:"
msgid "Are you a developer?"
msgstr "Er du en utvikler?"
+#: 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
@@ -393,9 +366,8 @@ msgid "As this is a staging site and %s is false, reports made on this site will
msgstr "Da reproduksjonsstedet og %s ikke stemmer, vil meldingen som er laget her, bli sendt til problemrapportøren, og ikke til kontakten som er gitt for meldingformålet."
#: templates/web/zurich/admin/report_edit.html:213
-#, fuzzy
msgid "Assign to competent body:"
-msgstr "Tildel til ekstern administrasjon:"
+msgstr "Tildel til kompetent administrasjon:"
#: templates/web/zurich/admin/report_edit.html:173
#: templates/web/zurich/admin/stats.html:36
@@ -414,16 +386,16 @@ msgstr "Tildelt underavdeling:"
msgid "Assigned to %s"
msgstr "Tildelt %s"
-#: 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 blir %d forespørsler returnert i hver spørring. De returnerte forespørslene blir sortert på requested_datetime, så en må gjøre flere søk med rullerende start_date og end_date for å få tak i alle forespørslene."
-#: templates/web/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 øyeblikket er det kun søk etter og å se på rapporter som fungerer."
#: 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 "Avventer moderasjon"
@@ -435,7 +407,7 @@ msgstr "Tilbake"
msgid "Ban email address"
msgstr "Bannlys epostadresse"
-#: 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"
@@ -458,14 +430,14 @@ msgstr "PÃ¥ dato"
#: templates/web/base/auth/token.html:21 templates/web/base/email_sent.html:18
msgid "Can&rsquo;t find our email? Check your spam folder&nbsp;&ndash; that&rsquo;s the solution 99% of the time."
-msgstr ""
+msgstr "Finner du ikke e-posten? Sjekk mappen for uønsket post. Det løser problemet i 99% av tilfellene."
#: templates/web/base/around/_report_banner.html:5
msgid "Can't see the map? <em>Skip this step</em>"
msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>."
#: 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
@@ -476,8 +448,8 @@ msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>."
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øsningsrate fordelt på kategori for problemer > 4 uker gamle"
@@ -490,7 +462,7 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:402
+#: perllib/FixMyStreet/Script/Reports.pm:180
msgid "Category: %s"
msgstr "Kategori: %s"
@@ -541,7 +513,7 @@ msgstr "Velg et <strong>kategorinavn</strong> som gir mening for innbyggerne (f.
#: templates/web/zurich/admin/response_templates_select.html:6
msgid "Choose a template"
-msgstr ""
+msgstr "Velg en mal"
#: templates/web/base/admin/stats.html:65
#: templates/web/base/admin/stats.html:71
@@ -549,25 +521,25 @@ msgid "Click here or enter as dd/mm/yyyy"
msgstr "Klikk her eller tast inn dato på formatet dd/mm/åååå"
#: 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 "Klikk i kartet for å rapportere et problem"
#: templates/web/base/email_sent.html:13
msgid "Click the link in our confirmation email to activate your alert."
-msgstr ""
+msgstr "Klikk lenken i bekreftelses-eposten for å aktivere ditt varsel."
#: templates/web/base/email_sent.html:9
msgid "Click the link in our confirmation email to publish your problem."
-msgstr ""
+msgstr "Klikk lenken i bekreftelses-eposten for å publisere ditt problem."
#: templates/web/base/email_sent.html:11
msgid "Click the link in our confirmation email to publish your update."
-msgstr ""
+msgstr "Klikk lenken i bekreftelses-eposten for å publisere din oppdatering."
#: templates/web/base/auth/token.html:18
msgid "Click the link in our confirmation email to sign in."
-msgstr ""
+msgstr "Klikk lenken i bekreftelses-eposten for å logge inn."
#: perllib/FixMyStreet/Cobrand/Zurich.pm:196
#: perllib/FixMyStreet/Cobrand/Zurich.pm:969
@@ -576,7 +548,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
@@ -584,7 +556,7 @@ msgstr ""
msgid "Closed"
msgstr "Lukket"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:794
+#: perllib/FixMyStreet/DB/Result/Problem.pm:779
msgid "Closed by council"
msgstr "(ikke rapportert til administrasjonen)"
@@ -610,7 +582,7 @@ msgstr "Merkevaresamarbeidsdata:"
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 "Oppsett"
@@ -623,13 +595,14 @@ msgstr "Sett opp endepunkt"
msgid "Confirm"
msgstr "Bekreft"
-#: 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 "Bekreft 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
+#, fuzzy
+msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated."
msgstr "Bekreft via epost under, og oppgi et nytt passord der. NÃ¥r du har bekreftet vil passordet ditt bli oppdatert."
#: templates/web/base/questionnaire/creator_fixed.html:1
@@ -659,35 +632,27 @@ msgid "Confirmed:"
msgstr "Bekreftet:"
#. ("%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 "Kontakt %s"
#: 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 prosjektgruppen"
#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit.html:59
-#, fuzzy
msgid "Coordinates:"
msgstr "Koordinater:"
-#: 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 ikke finne bruker"
@@ -705,7 +670,7 @@ msgstr "Administrasjon"
msgid "Council contacts for %s"
msgstr "Administrasjonskontakter for %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:693
+#: perllib/FixMyStreet/DB/Result/Problem.pm:681
msgid "Council ref:&nbsp;%s"
msgstr "administrasjonsreferanse:&nbsp;%s"
@@ -720,7 +685,7 @@ msgstr "Administrasjon:"
msgid "Count"
msgstr "Antall"
-#: 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 en rapport"
@@ -730,9 +695,8 @@ msgid "Create category"
msgstr "Lag kategori"
#: templates/web/zurich/admin/template_edit.html:29
-#, fuzzy
msgid "Create template"
-msgstr "Lag en rapport"
+msgstr "Lag mal"
#: templates/web/base/admin/problem_row.html:34
#: templates/web/zurich/admin/templates.html:10
@@ -758,7 +722,7 @@ msgstr "I øyeblikket er ikke laget noen instanser."
#: perllib/FixMyStreet/Cobrand/Zurich.pm:834
#: templates/web/zurich/admin/report_edit-sdm.html:109
msgid "Customer not contactable"
-msgstr ""
+msgstr "Kunden kan ikke kontaktes"
#: templates/web/base/dashboard/index.html:5
#: templates/web/base/dashboard/index.html:7
@@ -769,10 +733,10 @@ msgstr "Oversikt"
msgid "Dealt with by subdivision within 5 working days"
msgstr "Behandlet av underavdeling innen 5 arbeidsdager"
-#: 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 ""
+msgstr "Slett mal"
#: templates/web/base/admin/bodies.html:27
#: templates/web/base/admin/body.html:177
@@ -782,7 +746,7 @@ msgstr ""
msgid "Deleted"
msgstr "Slettet"
-#: 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
@@ -790,12 +754,11 @@ msgid "Description"
msgstr "Beskrivelse"
#: 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 "Detaljer"
#: 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
@@ -808,21 +771,19 @@ msgstr "Delegert"
#: 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 ikke kart"
+msgstr "Brukte ikke kart"
#: templates/web/base/admin/edit-league.html:8
msgid "Diligency prize league table"
msgstr "Arbeidshester"
#. ("%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 et FiksGataMi-passord?"
@@ -830,16 +791,18 @@ msgstr "Har du et FiksGataMi-passord?"
msgid "Don&rsquo;t know"
msgstr "Vet ikke"
-#: templates/web/fixmystreet/contact/index.html:118
+#: templates/web/base/contact/index.html:110
msgid "Don't like forms?"
msgstr "Liker ikke skjemaer?"
+#: 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 "Duplikat"
@@ -892,7 +855,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
@@ -900,7 +863,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 "Epost lagt til misbruksliste"
@@ -916,7 +879,7 @@ msgstr "Epostvarsel laget"
msgid "Email alert deleted"
msgstr "Epostvarsel slettet"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1393
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1402
msgid "Email already in abuse list"
msgstr "Epost allerede i misbrukslisten"
@@ -924,41 +887,36 @@ msgstr "Epost allerede i misbrukslisten"
msgid "Email me new local problems"
msgstr "Send meg e-post om lokale problemer"
-#: templates/web/base/report/display.html:38
-msgid "Email me updates"
-msgstr "Send meg oppdateringer"
-
#: 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 "E-post: %s"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:639
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:634
msgid "Empty flat or maisonette"
msgstr "Tom leilighet"
-#: 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 offentlig bygning - skole, sykehus, etc."
@@ -997,7 +955,7 @@ msgstr "Endepunkt"
msgid "Enter a Z&uuml;rich street name"
msgstr "Skriv inn et veinavn i Z&uuml;rich"
-#: perllib/FixMyStreet/Cobrand/UK.pm:13
+#: perllib/FixMyStreet/Cobrand/UK.pm:14
msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted"
@@ -1015,14 +973,9 @@ msgstr "Skriv inn et veinavn og sted"
msgid "Enter a nearby street name and area, postal code or district in Delhi"
msgstr "Velg et nærliggende gatenavn og område, postnummer eller distrikt i Delhi"
-#: 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 et 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 "Skriv inn et nytt passord"
@@ -1032,28 +985,28 @@ msgid "Enter details of the problem"
msgstr "Legg inn detaljer 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"
#: templates/web/base/reports/_list-filters.html:12
msgid "Everything"
-msgstr ""
+msgstr "Alt"
#: templates/web/base/admin/body.html:14
#: templates/web/base/admin/category_edit.html:18
msgid "Example postcode %s"
msgstr "Eksempel-postnummer %s"
-#: templates/web/base/open311/index.html:94
+#: templates/web/base/open311/index.html:86
msgid "Examples:"
msgstr "Eksempler:"
-#: 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 "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har vært galt..."
@@ -1061,9 +1014,8 @@ msgstr "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har væ
#: perllib/FixMyStreet/Cobrand/Zurich.pm:922
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:12
-#, fuzzy
msgid "Extern"
-msgstr "Ekstern URL"
+msgstr "Ekstern"
#: templates/web/base/admin/body-form.html:81
msgid "External URL"
@@ -1095,17 +1047,15 @@ msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit bod
msgid "FixMyStreet"
msgstr "FiksGataMi"
-#: 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øst"
@@ -1132,7 +1082,7 @@ msgstr "Merk som slettet"
msgid "Flag user"
msgstr "Flag bruker"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1281
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1290
#: templates/web/base/admin/users.html:19
msgid "Flagged"
msgstr "Flagget:"
@@ -1163,36 +1113,31 @@ msgstr "Følg en bydelslenke for å kun se rapporter innenfor 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 "For mer informasjon, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruker Mapit</a>."
-#: 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 "Glemt passordet ditt?"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:752
-#, fuzzy
msgid "Forwarded to external body"
-msgstr "Tildel til ekstern administrasjon:"
+msgstr "Tildelt til ekstern administrasjon"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:753
-#, fuzzy
msgid "Forwarded wish to external body"
-msgstr "Tildel til ekstern administrasjon:"
+msgstr "Ønsket er sendt videre til ekstern administrasjon"
-#: 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 spurte spørsmål"
-#: 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 "FÃ¥ oppdateringer"
@@ -1225,7 +1170,7 @@ msgstr "Søk"
msgid "Going to send questionnaire?"
msgstr "Skal det sendes spørreskjema?"
-#: 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"
@@ -1242,7 +1187,7 @@ msgid "Have you ever reported a problem to a council before, or is this your fir
msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?"
#: 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"
@@ -1293,7 +1238,7 @@ msgstr "Hvordan rapportere et problem"
msgid "How to send successful reports"
msgstr "Hvordan sende inn rapporter som løses"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:754
+#: perllib/FixMyStreet/App/Controller/Admin.pm:752
msgid "I am afraid you cannot confirm unconfirmed reports."
msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter."
@@ -1311,10 +1256,6 @@ msgstr "Jeg oppdaterte akkurat et problem på @fiksgatami"
msgid "I'm afraid we couldn't locate your problem in the database.\n"
msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
-#: perllib/FixMyStreet/App/Controller/Tokens.pm: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 "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n"
-
#: templates/web/base/admin/flagged.html:14
#: templates/web/base/admin/list_updates.html:6
#: templates/web/base/admin/reports.html:11
@@ -1343,25 +1284,16 @@ msgstr "Hvis to eller flere instanser er lokalisert på samme sted, kombinerer
msgid "If you get some more information about the status of your problem, please come back to the site and leave an update."
msgstr "Hvis du får mer informasjon om status for problemet ditt, vær så snill å kom tilbake til nettstedet og legg igjen en oppdatering."
-#: 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 "Hvis du sender inn et problem hit, så vil emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> bli rapportert 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 "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post på din e-postkonto, kan du i noen tilfellet måtte se etter våre meldinger 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 ""
-"Hvis du ønsker å legge til en offentlig kommentar på problemet, legg den til her\n"
-"(denne blir ikke sendt til administrasjonen). Du kan for eksempel\n"
-"dele din erfaring med hvordan ditt problem ble løst."
+msgstr "Hvis du ønsker å legge til en offentlig kommentar på problemet, legg den til her (denne blir ikke sendt til administrasjonen)."
#: 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."
@@ -1407,10 +1339,8 @@ msgstr "Ugyldig valg av feed"
#: 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"
@@ -1418,7 +1348,7 @@ msgstr "Under arbeid"
msgid "In abuse table?"
msgstr "I misbrukstabell?"
-#: 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ølgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)."
@@ -1426,7 +1356,7 @@ msgstr "I tillegg er følgende attributter som ikke 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"
@@ -1461,7 +1391,7 @@ msgstr "Interne referanser"
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"
@@ -1469,7 +1399,7 @@ msgstr "Ugyldig slutt-dato"
msgid "Invalid format %s specified."
msgstr "Ugyldig format %s oppgitt."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1197
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1206
msgid "Invalid start date"
msgstr "Ugyldig startdato"
@@ -1477,14 +1407,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økes"
-#: 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 "Det er ofte raskest å <a href=\"%s\">sjekke FAQ-en vår</a> og se om svaret er der."
@@ -1494,19 +1422,17 @@ msgstr "Den er på tur mot myndigheten akkurat nå."
#: perllib/FixMyStreet/Cobrand/Zurich.pm:184
msgid "Jurisdiction Unknown"
-msgstr ""
+msgstr "Ukjent område"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:927
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:15
msgid "Jurisdiction unknown"
-msgstr ""
+msgstr "Ukjent område"
-#: 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 "Husk min innlogging på denne datamaskinen"
@@ -1564,6 +1490,7 @@ msgid "MAP"
msgstr "KART"
#: templates/web/base/js/translation_strings.html:45
+#: templates/web/base/maps/google-ol.html:13
msgid "Map"
msgstr "Kart"
@@ -1583,23 +1510,17 @@ msgstr "Merket fikset/lukket i løpet av de siste åtte ukene"
msgid "Marked fixed/closed more than eight weeks ago"
msgstr "Merket fikset/lukket mer enn åtte uker siden"
-#: templates/web/fixmystreet/contact/index.html:106
+#: templates/web/base/contact/index.html:98
msgid "Message"
msgstr "Melding"
#: templates/web/zurich/admin/report_edit.html:284
-#, fuzzy
msgid "Message to competent body:"
-msgstr "Tildel til ekstern administrasjon:"
+msgstr "Melding til kompetent administrasjon:"
#: templates/web/zurich/admin/report_edit.html:282
-#, fuzzy
msgid "Message to external body:"
-msgstr "Tildel til ekstern administrasjon:"
-
-#: templates/web/base/contact/index.html:97
-msgid "Message:"
-msgstr "Melding:"
+msgstr "Melding til ekstern administrasjon:"
#: perllib/FixMyStreet/App/Controller/Open311.pm:445
msgid "Missing jurisdiction_id"
@@ -1613,10 +1534,6 @@ msgstr "Moderert av avdeling innen en arbeidsdag"
msgid "Month"
msgstr "MÃ¥ned"
-#: templates/web/base/report/display.html:34
-msgid "More problems nearby"
-msgstr "Flere problemer i nærheten"
-
#: templates/web/base/admin/bodies.html:21
#: templates/web/base/admin/body-form.html:18
#: templates/web/base/admin/flagged.html:16
@@ -1624,11 +1541,11 @@ msgstr "Flere problemer i nærheten"
#: 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
@@ -1642,7 +1559,7 @@ msgstr "Navn"
msgid "Name:"
msgstr "Navn:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:328
+#: perllib/FixMyStreet/Script/Reports.pm:107
msgid "Name: %s"
msgstr "Navn: %s"
@@ -1651,16 +1568,16 @@ msgstr "Navn: %s"
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Nærmeste navngitte vei 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ærmeste 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ærmeste vei til nålen plassert på kartet (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"
@@ -1668,12 +1585,7 @@ msgstr ""
"Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av Bing Maps) er: %s\n"
"\n"
-#: templates/web/zurich/email_sent.html:5
-msgid "Nearly Done! Now check your email..."
-msgstr "Nesten ferdig! Nå må du sjekke 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&hellip;"
msgstr "Nesten ferdig! Nå må du sjekke e-posten din..."
@@ -1699,9 +1611,8 @@ msgid "New local problems on FixMyStreet"
msgstr "Nye lokale problemer på FiksGataMi"
#: templates/web/zurich/admin/report_edit-sdm.html:117
-#, fuzzy
msgid "New note to DM:"
-msgstr "Nytt internt notat:"
+msgstr ""
#: db/alert_types.pl:38
msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
@@ -1733,9 +1644,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 "Ny mal"
#: templates/web/base/pagination.html:13
msgid "Next"
@@ -1752,8 +1662,8 @@ msgstr "Neste"
#: 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"
@@ -1824,10 +1734,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 "Ikke ansvarlig"
@@ -1835,9 +1743,8 @@ msgstr "Ikke ansvarlig"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:937
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:13
-#, fuzzy
msgid "Not contactable"
-msgstr "Ikke ansvarlig"
+msgstr "Kan ikke kontaktes"
#: templates/web/zurich/admin/report_edit-sdm.html:108
msgid "Not for my subdivision"
@@ -1867,7 +1774,7 @@ msgstr "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporte
msgid "Note:"
msgstr "Merk:"
-#: templates/web/base/open311/index.html:73
+#: templates/web/base/open311/index.html:65
msgid "Note: <strong>%s</strong>"
msgstr "Note: <strong>%d</strong>"
@@ -1875,13 +1782,15 @@ msgstr "Note: <strong>%d</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&hellip;"
msgstr "På tide å sende din rapport&hellip;"
-#: 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&hellip;"
msgstr "På tide å registrere din oppdatering&hellip;"
@@ -1889,11 +1798,6 @@ msgstr "På tide å registrere din oppdatering&hellip;"
msgid "OK"
msgstr "OK"
-#: templates/web/base/report/display.html:28
-#: templates/web/base/report/update.html:17
-msgid "Offensive? Unsuitable? Tell us"
-msgstr "Støtende? Upassende? Gi oss beskjed"
-
#: templates/web/base/reports/index.html:23
msgid "Old / unknown <br>problems"
msgstr "Gamle / ukjente <br>problemer"
@@ -1910,7 +1814,7 @@ msgstr "Eldre <br>løste"
msgid "Older <br>problems"
msgstr "Eldre <br>problemer"
-#: 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 "Enlinjers oppsummering"
@@ -1921,8 +1825,7 @@ msgstr "Enlinjers oppsummering"
#: 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
@@ -1937,15 +1840,15 @@ msgstr "Åpen i mer enn fire uker, med en oppdatering i løpet av de siste åtte
msgid "Open, but not had any update in eight weeks"
msgstr "Åpen, men har ikke hatt noen oppdateringer på åtte uker"
-#: 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-tjener"
-#: templates/web/base/open311/index.html:80
+#: templates/web/base/open311/index.html:72
msgid "Open311 initiative web page"
msgstr "Open311-initiativets nettside"
-#: templates/web/base/open311/index.html:81
+#: templates/web/base/open311/index.html:73
msgid "Open311 specification"
msgstr "Open311-spesifikasjon"
@@ -1957,15 +1860,15 @@ msgstr "Eller problemer meldt til:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn 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 "Annet"
@@ -1974,7 +1877,7 @@ msgid "Owner"
msgstr "Eier"
#: 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 "Fant ikke siden"
@@ -1988,16 +1891,16 @@ msgstr "Forelder"
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 "Passord (valgfritt)"
#: 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:"
@@ -2009,45 +1912,37 @@ msgstr "Permalink"
msgid "Phone number"
msgstr "Telefonnummer"
-#: 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 "Telefonnummer (valgfritt)"
-#: 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 "Bilde"
-#: perllib/FixMyStreet/App/Controller/Photo.pm:221
-#, fuzzy
+#: perllib/FixMyStreet/App/Controller/Photo.pm:187
msgid "Photo is required."
-msgstr "Denne informasjonen er påkrevd"
+msgstr "Foto er påkrevd."
#: templates/web/base/admin/category_edit.html:48
-#, fuzzy
msgid "Photo required"
-msgstr "Denne informasjonen er påkrevd"
-
-#: 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 "Bilde:"
+msgstr "Foto kreves"
-#: templates/web/base/alert/list.html:26
+#: templates/web/base/alert/list.html:23
msgid "Photos of recent nearby reports"
msgstr "Bilder av nye problemer i nærheten"
@@ -2076,20 +1971,16 @@ msgstr "Vær høflig, poengtert og kortfattet."
msgid "Please check the passwords and try again"
msgstr "Vennligst sjekk passordene og prøv igjen"
-#: templates/web/zurich/auth/token.html:16
-msgid "Please check your email"
-msgstr "Vennligst 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 "Vennligst sjekk at du har skrevet en 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"
@@ -2103,9 +1994,7 @@ msgstr "Velg en type egenskap"
msgid "Please correct the errors below"
msgstr "Husk å rette opp feilene nedenfor."
-#: 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"
@@ -2120,11 +2009,17 @@ msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the s
msgstr "Ikke vær ufin &mdash; å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne."
#: 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 "Vennligst legg til en melding"
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1091
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1146
+#, fuzzy
+msgid "Please enter a name"
+msgstr "Legg inn ditt navn"
+
#: templates/web/base/auth/change_password.html:12
#: templates/web/base/auth/change_password.html:15
#: templates/web/base/js/translation_strings.html:19
@@ -2137,10 +2032,10 @@ msgstr "Skriv inn et passord"
msgid "Please enter a subject"
msgstr "Vennligst legg inn et 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"
@@ -2157,9 +2052,9 @@ msgid "Please enter some details"
msgstr "Legg inn opplysninger 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
@@ -2167,7 +2062,7 @@ msgstr "Legg inn opplysninger om problemet"
msgid "Please enter your email"
msgstr "Legg inn din e-post"
-#: 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 "Vennligst tast inn din e-postadresse"
@@ -2176,15 +2071,15 @@ msgstr "Vennligst tast inn din e-postadresse"
msgid "Please enter your first name"
msgstr "Vennligst tast inn ditt fornavn"
-#: 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 "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under"
#: 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 "Legg inn ditt navn"
@@ -2211,12 +2106,11 @@ msgstr "Du kan også <a href=\"%s\">logge inn igjen</a> eller gå tilbake til <a
msgid "Please fill in details of the problem below."
msgstr "Vennligst fyll ut detaljer 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 "Vennligst fyll ut detaljer om problemet."
-#: 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 ""
@@ -2227,20 +2121,24 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema"
-#: templates/web/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 "Vær oppmerksom på at oppdateringer ikke blir videresendt til administrasjonen."
-#: 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 "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt så vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy\">personvernpolicy</a>"
+#: templates/web/base/report/new/oauth_email_form.html:4
+#, fuzzy
+msgid "Please note your report has <strong>not yet been sent</strong>."
+msgstr "Merk at din rapport <strong>ennå ikke er sendt</strong. Velg en kategori og legg til mer 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 din rapport <strong>ennå ikke er sendt</strong. Velg en kategori og legg til mer 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:"
@@ -2260,9 +2158,8 @@ msgid "Please say whether you've ever reported a problem to your council before"
msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere"
#: templates/web/zurich/admin/report_edit.html:208
-#, fuzzy
msgid "Please select a body."
-msgstr "Velg en administrasjon"
+msgstr "Velg en administrasjon."
#: perllib/FixMyStreet/App/Controller/Alert.pm:80
msgid "Please select the feed you want"
@@ -2279,6 +2176,7 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
#: 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 "Vennligst last opp kun JPEG-bilder"
@@ -2286,18 +2184,14 @@ msgstr "Vennligst last opp kun JPEG-bilder"
msgid "Please write a message"
msgstr "Skriv inn en 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 "Vennligst skriv inn din oppdatering her"
-#: 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"
@@ -2315,7 +2209,7 @@ msgstr "Sendt inn av %s %s"
#: templates/web/base/front/footer-marketing.html:12
msgid "Powered by <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
-msgstr ""
+msgstr "Drevet av <a class=\"platform-logo\" href=\"http://fixmystreet.org/\">FixMyStreet Platform</a>"
#: templates/web/base/pagination.html:7
msgid "Previous"
@@ -2325,14 +2219,11 @@ msgstr "Forrige"
msgid "Privacy"
msgstr "Personvern"
-#: 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 ""
+msgstr "Personvern og cookies"
#: templates/web/base/admin/body.html:202
#: templates/web/base/admin/body.html:85
@@ -2358,12 +2249,12 @@ msgstr "Problem %s bekreftet"
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 problemer"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1055
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1058
msgid "Problem marked as open."
msgstr "Problem markert som åpent."
@@ -2379,11 +2270,11 @@ msgstr "Problemer"
msgid "Problems in this area"
msgstr "Problemer i dette området"
-#: templates/web/fixmystreet/report/display.html:43
+#: templates/web/base/report/display_tools.html:19
msgid "Problems nearby"
msgstr "Problemer i nærheten"
-#: templates/web/fixmystreet/report/display.html:41
+#: templates/web/base/report/display_tools.html:17
msgid "Problems on the map"
msgstr "Problemer på kartet"
@@ -2395,24 +2286,23 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi"
msgid "Problems within %.1fkm of this location"
msgstr "Problemer innenfor %.1fkm av denne posisjonen"
-#: perllib/FixMyStreet/Cobrand/Default.pm: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 "Problemer innenfor %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 "Problemer innenfor %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 "Problemer innenfor %s"
+msgstr "Problemer innenfor %s, %s"
#: templates/web/base/alert/_list.html:42
msgid "Problems within the boundary of:"
@@ -2426,19 +2316,16 @@ msgstr "Eiendomsadresse:"
msgid "Property type:"
msgstr "Type egenskap:"
-#: 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 en 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 "Det er valgfritt å oppgi navn og passord, men hvis du gjør det kan du enklere rapportere problemer, legge igjen oppdateringer og håndtere rapportene dine."
-#: 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 valgfritt å oppgi et passord, men hvis du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter"
@@ -2474,18 +2361,17 @@ msgstr "Spørreskjema 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-strøm"
-#: 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-strøm 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-strøm for %s bydel, %s"
@@ -2493,11 +2379,11 @@ msgstr "RSS-strøm 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-strøm fra %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-strøm av %s, innenfor %s bydel"
@@ -2509,15 +2395,15 @@ msgstr "RSS-strøm med problemer i nærheten"
msgid "RSS feed of problems in this %s"
msgstr "RSS-strøm for problemer i denne %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm: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-strøm for problemer innenfor %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-strøm for problemer innenfor %s bydel"
@@ -2526,23 +2412,20 @@ msgstr "RSS-strøm for problemer innenfor %s bydel"
msgid "RSS feed of recent local problems"
msgstr "RSS-strøm med nylige lokale problemer"
-#: templates/web/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-strøm med oppdateringer 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 oppdateringer 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 "Nylige lokale problemer, FiksGataMi."
@@ -2562,16 +2445,15 @@ msgstr "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer
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 bilde (kan ikke gjøres om!)"
#: templates/web/zurich/admin/report_edit.html:243
-#, fuzzy
msgid "Reply to user:"
-msgstr "rediger bruker"
+msgstr "Svar til bruker:"
#: templates/web/fixmystreet/header_logo.html:2
msgid "Report"
@@ -2584,7 +2466,7 @@ msgstr "Rapport"
msgid "Report a problem"
msgstr "Rapporter et problem"
-#: templates/web/fixmystreet/report/display.html:32
+#: templates/web/base/report/display_tools.html:8
msgid "Report abuse"
msgstr "Rapporter misbruk"
@@ -2593,7 +2475,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 "Rapporter problemet ditt"
@@ -2602,9 +2485,8 @@ msgstr "Rapporter problemet ditt"
msgid "Report, view, or discuss local problems"
msgstr "Rapporter, finn eller diskuter lokale problemer"
-#: 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"
@@ -2613,43 +2495,41 @@ msgstr "Rapportert anonymt %s"
msgid "Reported before"
msgstr "Rapportert tidligere"
-#: 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 "Rapportert av:"
#: templates/web/zurich/report/_main.html:2
msgid "Reported in the %s category"
msgstr "Rapportert i kategorien %s"
-#: 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"
@@ -2659,9 +2539,8 @@ msgstr "Rapportert i løpet av de siste fire ukene"
#: templates/web/zurich/admin/report_edit-sdm.html:36
#: templates/web/zurich/admin/report_edit.html:55
-#, fuzzy
msgid "Reported:"
-msgstr "Rapportert %s"
+msgstr "Rapportert:"
#: templates/web/base/around/index.html:2
#: templates/web/base/js/translation_strings.html:41
@@ -2671,13 +2550,13 @@ msgstr "Rapportert %s"
msgid "Reporting a problem"
msgstr "Legger til et 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 "Rapporter"
-#: 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 "Rapportene begrenses til %s tegn. Rapporten må forkortes."
@@ -2698,7 +2577,7 @@ msgstr "Send rapport på nytt"
#: templates/web/zurich/admin/templates.html:1
#: templates/web/zurich/admin/templates.html:3
msgid "Response Templates for %s"
-msgstr ""
+msgstr "Svarmaler for %s"
#: templates/web/base/js/translation_strings.html:28
msgid "Right place?"
@@ -2714,25 +2593,26 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Veioperatør for denne navngitte veien (fra 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 "Roter til venstre"
-#: 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 "Roter til høyre"
#: templates/web/zurich/admin/report_edit.html:388
msgid "Rotating this photo will discard unsaved changes to the report."
-msgstr ""
+msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten."
#: templates/web/base/js/translation_strings.html:46
-#: templates/web/base/maps/google-ol.html:13
msgid "Satellite"
msgstr "Satelitt"
@@ -2785,16 +2665,14 @@ msgid "Select an area"
msgstr "Velg et område"
#: 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 "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, eller skriv inn din e-postadresse for å abonnere på et e-postvarsel."
+msgstr ""
#: perllib/FixMyStreet/Cobrand/Zurich.pm:835
-#, fuzzy
msgid "Sent report back"
-msgstr "Ã…pne rapporter"
+msgstr "Rapport sendt tilbake"
-#: 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 senere"
@@ -2807,15 +2685,13 @@ msgstr "Sendt:"
msgid "Service:"
msgstr "Tjeneste:"
-#: templates/web/fixmystreet/report/display.html:38
+#: templates/web/base/report/display_tools.html:14
msgid "Share"
msgstr "Dele"
-#: 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 mitt navn offentlig"
@@ -2827,9 +2703,9 @@ msgstr "Vis gamle"
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"
@@ -2859,7 +2735,7 @@ msgstr ""
"</strong> for å indikere at rapportene blir sendt\n"
"fra din FiksGataMi installasjon."
-#: templates/web/base/alert/index.html:42
+#: templates/web/base/alert/index.html:40
msgid "Some photos of recent reports"
msgstr "Noen bilder av nylig meldte problemer"
@@ -2869,35 +2745,46 @@ msgstr "Noen bilder av nylig meldte problemer"
msgid "Some text to localize"
msgstr "Noe tekst å oversette"
-#: 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 "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi ikke dekker."
#: templates/web/base/auth/token.html:8
msgid "Sorry, that wasn&rsquo;t a valid link"
-msgstr ""
+msgstr "Beklager, det var ikke en gyldig lenke"
#: templates/web/base/tokens/abuse.html:5
msgid "Sorry, there has been an error confirming your problem."
msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte 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 "Beklager, vi kunne ikke finne det stedet."
-#: 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 "Beklager, vi kunne ikke tolke den posisjonen. Vennligst 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 "Beklager, vi kunne ikke tolke den posisjonen. Vennligst 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 "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt."
+msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen."
+
+#: perllib/FixMyStreet/App/Controller/AuthSS.pm:301
+#, fuzzy
+msgid "Sorry, you can not log in with Facebook. Please try again later."
+msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere."
#: templates/web/base/admin/stats.html:64
msgid "Start Date:"
@@ -2907,13 +2794,12 @@ msgstr "Start-dato:"
#: 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
@@ -2921,7 +2807,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
@@ -2941,9 +2827,9 @@ msgstr "Fortsatt åpen via spørreskjema, %s"
#: templates/web/zurich/admin/report_edit-sdm.html:25
#: templates/web/zurich/admin/report_edit.html:26
msgid "Street View"
-msgstr ""
+msgstr "Gatevisning"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:406
+#: perllib/FixMyStreet/Script/Reports.pm:184
msgid "Subcategory: %s"
msgstr "Underkategori: %s"
@@ -2951,30 +2837,25 @@ msgstr "Underkategori: %s"
msgid "Subdivision/Body"
msgstr "Underavdeling/administrasjon"
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/base/contact/index.html:90
msgid "Subject"
msgstr "Emne"
#: 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
@@ -2982,7 +2863,7 @@ msgstr "Send inn"
msgid "Submit changes"
msgstr "Send inn endringer"
-#: templates/web/base/questionnaire/index.html:97
+#: templates/web/base/questionnaire/index.html:106
msgid "Submit questionnaire"
msgstr "Send inn spørreskjema"
@@ -2998,9 +2879,8 @@ msgid "Submitted"
msgstr "Sendt inn"
#: 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"
@@ -3008,7 +2888,7 @@ msgstr "Abonner"
msgid "Subscribe me to an email alert"
msgstr "Jeg ønsker å abonnere 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
@@ -3027,7 +2907,7 @@ msgstr "Oppsummering"
msgid "Summary reports"
msgstr "Oppsummeringsrapporter"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1279
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1288
msgid "Survey"
msgstr "Spørreundersøkelse"
@@ -3037,13 +2917,12 @@ msgstr "Resultater fra spørreundersøkelsen"
#: templates/web/zurich/admin/template_edit.html:7
msgid "Template &laquo;%s&raquo;"
-msgstr ""
+msgstr "Mal &laquo;%s&raquo;"
#: perllib/FixMyStreet/Cobrand/Zurich.pm:394
#: templates/web/zurich/header.html:77
-#, fuzzy
msgid "Templates"
-msgstr "Oppdateringer"
+msgstr "Maler"
#: templates/web/base/admin/list_updates.html:12
#: templates/web/zurich/admin/templates.html:9
@@ -3064,7 +2943,7 @@ msgstr "Tekst:"
msgid "Thank you for reporting this issue!"
msgstr "Takk for at du rapporterte dette problemet!"
-#: 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 forsøker å bekrefte din oppdatering eller ditt problem. Vi ser ut til å ha en feil hos oss, så <a href=\"%s\">vær så snill å fortelle oss hva som skjedde</a> så skal vi se på saken."
@@ -3099,23 +2978,23 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen."
#: 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 ble ikke gjenkjent, beklager."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:726
+#: perllib/FixMyStreet/App/Controller/Admin.pm:724
msgid "That problem has been marked as sent."
msgstr "Det problemer har blitt markert som sendt."
-#: 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 nå bli sendt 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 "Den rapporten kan ikke ses på %s."
-#: 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 blitt fjernet fra FiksGataMi."
@@ -3154,7 +3033,7 @@ msgstr ""
"<Strong>Sendemetoden</strong> bestemmer hvordan problemmeldinger blir sendt til administrasjonen.\n"
"Hvis du lar dette stå tomt, <strong>er sendemetoden som standard til e-post</strong>."
-#: 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-atributten agency_responsible brukes for å liste opp administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med hvordan atributten er definert i Open311 v2-spesifikasjonen."
@@ -3181,12 +3060,12 @@ msgstr ""
msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
msgstr "The diligency prize league tabellen viser redaktørenes aktivitet, (hvem som har redigert flest)."
-#: 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 "De følgende Open311 v2-atributtene blir returnert for hver forespørsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name."
@@ -3222,7 +3101,7 @@ msgstr "De siste problemer innenfor grensen til {{NAME}} rapportert av brukere"
#: templates/web/base/auth/token.html:9
msgid "The link might have expired, or maybe you didn&rsquo;t quite copy and paste it correctly."
-msgstr ""
+msgstr "Denne lenken har kanskje gått ut på tid, eller kanskje du ikke kopierte og limte den inn korrekt."
#: templates/web/base/admin/body-form.html:58
msgid "The list of available areas is being provided by the MapIt service at %s."
@@ -3233,8 +3112,7 @@ msgstr "Listen over tilgjengelige områder kommer fra MapIt-tjenesten på %s."
msgid "The passwords do not match"
msgstr "Passordene er ikke 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 "Den forespurte URL '%s' ble ikke funnet på denne tjeneren"
@@ -3244,12 +3122,11 @@ msgstr "Den enkleste meldingen er vår 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 "Oppsummeringen og beskrivelsen vil også offentliggjøres (se våre <a href=\"/privacy\">personvernregler</a>)."
-#: 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 "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt stedet de skrev inn"
@@ -3268,18 +3145,18 @@ msgstr ""
msgid "There are no reports to show."
msgstr "Det er ingen rapporter å vise."
-#: 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 var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen senere."
#: 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 "Det var problemer med å vise denne siden. Vennligst prøv igjen senere."
-#: 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 &lsquo;sign in by email&rsquo; section of the form."
msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet"
@@ -3288,7 +3165,7 @@ msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt
msgid "There was a problem with your email/password combination. Please try again."
msgstr "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøke 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 problemer med din oppdatering. Vær så snill å forsøke igjen."
@@ -3296,7 +3173,7 @@ msgstr "Det var problemer med din oppdatering. Vær så snill å forsøke igjen
msgid "There were problems with your report. Please see below."
msgstr "Det var problemer med din rapport. Vennligst se under."
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:371
msgid "There were problems with your update. Please see below."
msgstr "Det var problemer med din oppdatering. Vennligst se under."
@@ -3314,7 +3191,7 @@ msgstr ""
"For mer informasjon om Open311, se\n"
"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>denne artikkelen</a>."
-#: 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 ennå ikke stabil. Den vil endre seg uten advarsel i fremtiden."
@@ -3341,18 +3218,18 @@ msgstr ""
"Denne instansen får bare rapporter for problemer som er lokalisert i <strong>area covered</strong>.\n"
"En instans vil ikke få noen meldinger om det ikke dekker minst ett område."
-#: 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 har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det. Vær så snill å ignorere den hvis dere ikke er korrekt administrasjon for å håndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan legge det til i vårt system."
-#: 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 har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær så snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å håndtere denne saken."
-#: 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åkrevd"
@@ -3364,56 +3241,37 @@ msgstr "Dette er et utviklernettsted. Ting kan knekke når som helst og database
msgid "This is a summary of all reports on this site."
msgstr "Dette er en opplisting av alle problemene i denne tjenesten."
-#: 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 "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig."
-
-#: templates/web/base/report/banner.html:15
-msgid "This problem has been closed"
-msgstr "Dette problemet er lukket"
-
-#: 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øst"
-#: 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 ikke blitt løst"
-#: 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 gammelt og med ukjent 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 "Denne rapporten avventer moderasjon"
-#: 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 tiden markert som lukket."
-#: 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 tiden markert som fikset."
-#: 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 tiden markert som åpen."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:326
+#: perllib/FixMyStreet/Script/Reports.pm:105
msgid "This report was submitted anonymously"
msgstr "Denne rapporten ble rapportert anonymt"
-#: 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 nettsiden inneholder også et bilde av problemet, sendt inn av brukeren."
@@ -3422,9 +3280,9 @@ msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av bru
#: templates/web/zurich/admin/report_edit.html:104
#: templates/web/zurich/admin/report_edit.html:148
msgid "Time spent (in minutes):"
-msgstr ""
+msgstr "Tid brukt (i minutter):"
-#: 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"
@@ -3436,24 +3294,22 @@ msgid "Title"
msgstr "Tittel"
#: templates/web/zurich/admin/template_edit.html:20
-#, fuzzy
msgid "Title:"
-msgstr "Tittel"
+msgstr "Tittel:"
#: templates/web/base/alert/index.html:25
-#, fuzzy
msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:"
-msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted"
+msgstr "Du finner lokale problemer ved å søke på ditt postnummer eller veinavn og sted"
#: templates/web/base/alert/index.html:27
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted"
-#: 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 å se et kart med en mer 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
@@ -3471,10 +3327,8 @@ msgstr "Forsøk å sende epost direkte til oss:"
#: 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 "Kan ikke fikses"
@@ -3487,7 +3341,7 @@ msgstr "Kan ikke fikses"
msgid "Unconfirmed"
msgstr "Ubekreftet"
-#: templates/web/fixmystreet/report/banner.html:9
+#: templates/web/base/report/banner.html:9
msgid "Unknown"
msgstr "Ukjent"
@@ -3495,17 +3349,18 @@ msgstr "Ukjent"
msgid "Unknown alert type"
msgstr "Ukjent varsel-type"
+#: perllib/FixMyStreet/App/Controller/Photo.pm:110
#: templates/web/base/js/translation_strings.html:39
msgid "Unknown error"
msgstr "Ukjent feil"
-#: 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 "Ukjent problem-Id"
-#: templates/web/fixmystreet/report/update-form.html:19
+#: templates/web/base/report/update/form_update.html:25
msgid "Update"
msgstr "Oppdatering"
@@ -3513,13 +3368,11 @@ msgstr "Oppdatering"
msgid "Update %s created for problem %d; by %s"
msgstr "Oppdatering %s opprettet 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 "Oppdateringen under 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 "Oppdateringen under lagt til av %s %s"
@@ -3528,7 +3381,7 @@ msgstr "Oppdateringen under lagt til av %s %s"
msgid "Update body"
msgstr "Oppdater administrasjon"
-#: templates/web/base/admin/index.html:55
+#: templates/web/base/admin/index.html:48
msgid "Update breakdown by state"
msgstr "Tilstandsfordeling for oppdateringer"
@@ -3553,20 +3406,16 @@ msgstr "En oppdatering gjennåpnet 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 "Oppdatert"
-#: 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
@@ -3574,13 +3423,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 "Oppdateringer"
-#: 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 "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst."
@@ -3590,10 +3438,7 @@ msgstr "Oppdateringer 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 "Oppdateringer til dette problemet, FiksGataMi"
@@ -3603,15 +3448,14 @@ msgstr "Bruk <strong>notater</strong> for å notere detaljer som skal vises frem
#: 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 "Brukte kart"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1452
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1461
msgid "User flag removed"
msgstr "Brukerflagg fjernet"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1424
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1433
msgid "User flagged"
msgstr "Bruker flagget"
@@ -3619,7 +3463,7 @@ msgstr "Bruker flagget"
msgid "User search finds matches in users' names and email addresses."
msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. "
-#: 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
@@ -3650,7 +3494,6 @@ msgid "Viewing a location"
msgstr "Ser på et sted"
#: templates/web/base/report/display.html:0
-#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
msgstr "Ser på et problem"
@@ -3663,25 +3506,24 @@ msgstr "Bydeler innenfor 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 fant mer en ett treff for den plassen. Vi viser opp til ti treff, så forsøk et annet søk hvis din plass ikke er her."
-#: templates/web/zurich/auth/token.html:7
-msgid "We have not been able to confirm your account - sorry."
-msgstr "Vi har ikke klart å bekrefte din konto - beklager."
-
-#: 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 en epost som inneholder link for å bekrefte din konto."
+#: 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 din e-postadresse eller ditt telefonnummer"
-#: 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 "Vi viser aldri din e-postadresse"
-#: 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 "Vi viser aldri din e-postadresse eller ditt telefonnummer"
-#: 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 være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, så ta kontakt med oss."
@@ -3698,19 +3540,15 @@ msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til våre <a hr
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr "Det gjør oss triste å høre at problemet ikke er løst. Hva med å forsøke å skrive til dine lokale representanter?"
-#: 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 ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:"
-
#: templates/web/base/contact/submit.html:7
msgid "We’ll get back to you as soon as we can."
msgstr "Vi tar kontakt med deg så snart vi kan."
#: templates/web/base/questionnaire/index.html:71
msgid "What was your experience of getting the problem fixed?"
-msgstr ""
+msgstr "Hvilken erfaring hadde du med å få løst dette problemet?"
-#: 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 "Hva er problemet og hvor skjer det?"
@@ -3723,7 +3561,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 "Hel blokk med tomme leiligheter"
@@ -3736,9 +3578,9 @@ msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sett opp flere varsler</a> grati
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:14
msgid "Wish"
-msgstr ""
+msgstr "Ønske"
-#: 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øker etter forespørsler, så er det også mulig å søke etter agency_responsible for å begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søketermen er administrasjons-IDen som oppgitt av <a href=\"%s\">MaPit</a>."
@@ -3746,7 +3588,7 @@ msgstr "Når du søker etter forespørsler, så er det også mulig å søke ette
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 "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri programvare og <a href=\"http://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>."
-#: 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 tenke deg å motta en ny forespørsel om 4 uker, som minner deg om å sjekke status?"
@@ -3755,7 +3597,6 @@ msgid "Writing your message entirely in block capitals makes it hard to read, as
msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig å lese. Det samme gjelder manglende 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 "Feil sted? Bare klikk på nytt i kartet."
@@ -3778,27 +3619,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 "Ja, jeg har et passord"
-#: 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 "Du klager over at denne problemrapporten ble moderert uten grunn:"
-#: 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ølgende problem er støtende, inneholder personlig informasjon eller lignende:"
-#: 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ølgende oppdatering er støtende, inneholder personlig informasjon, eller lignende:"
@@ -3811,7 +3649,7 @@ msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>."
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter."
-#: 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 "Du kan kontakte teknisk støtte via <a href='mailto:%s'>%s</a>"
@@ -3824,8 +3662,8 @@ msgstr ""
"Du kan flagge alle meldinger eller brukere ved å redigere dem, og de blir ført opp på denne siden.\n"
"For eksempel kan dette være nyttig hvis du ønsker å holde et øye med en bruker som tidligere har lagt ut uegnede meldinger. "
-#: 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>."
@@ -3843,20 +3681,16 @@ msgstr "Du avviste; vennligst fyll inn boksen ovenfor"
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 allerede besvart dette spørreskjemaet. Hvis du har spørsmål, vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt problem</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 allerede lagt ved et bilde til dette problemet. Ã… legge ved et annet vil bytte 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 allerede lagt ved et bilde til denne oppdateringen. Ã… legge ved et annet vil bytte 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 ""
+msgstr "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)."
+
+#: templates/web/base/questionnaire/index.html:83
+#: templates/web/base/report/update/form_update.html:14
+#, fuzzy
+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 "Du har allerede lagt ved bilder til denne rapporten. Merk at du kan maksimalt legge ved 3 til rapporten (hvis du laster opp flere blir det eldste slettet)."
#: templates/web/base/auth/sign_out.html:4
#: templates/web/zurich/auth/sign_out.html:3
@@ -3872,9 +3706,8 @@ msgstr "Du har plassert problemet ved punktet i kartet som er markert med en grÃ
msgid "You have successfully confirmed your email address."
msgstr "Du har nå lykkes med å bekrefte din e-postadresse."
-#: 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 lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:"
@@ -3905,53 +3738,42 @@ msgid "Your Reports"
msgstr "Dine rapporter"
#: 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 "Din e-post"
-#: 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 "Din e-postadresse"
-#: templates/web/base/report/new/fill_in_details_form.html:106
-#: templates/web/base/report/update-form.html:81
-msgid "Your email:"
-msgstr "Din e-post"
-
-#: 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 "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a href=\"/faq#privacy\">personvernsregler.</a>"
-#: 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 "Ditt navn"
-#: 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 "Ditt navn:"
-
-#: 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 "Ditt passord"
@@ -3960,15 +3782,16 @@ msgstr "Ditt passord"
msgid "Your password has been changed"
msgstr "Ditt passord har blitt endret"
-#: 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 "Ditt telefonnummer"
#: templates/web/base/questionnaire/index.html:14
+#, fuzzy
msgid "Your report"
-msgstr "Dine rapporter"
+msgstr "Dine oppdateringer"
#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:29
msgid "Your reports"
@@ -3978,23 +3801,17 @@ msgstr "Dine oppdateringer"
msgid "Your updates"
msgstr "Dine oppdateringer"
-#: templates/web/base/contact/index.html:81
-msgid "Your&nbsp;email:"
-msgstr "Din&nbsp;e-post:"
-
#: templates/web/base/reports/_list-filters.html:3
-#, fuzzy
msgid "all reports"
-msgstr "Alle rapporter"
+msgstr "alle rapporter"
#: 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 "Fiksede rapporter"
+msgstr "lukkede rapporter"
#: templates/web/base/reports/body.html:6
#: templates/web/base/reports/body.html:7
@@ -4016,17 +3833,16 @@ msgid "edit user"
msgstr "rediger bruker"
#: templates/web/base/reports/_list-filters.html:6
-#, fuzzy
msgid "fixed reports"
-msgstr "Fiksede rapporter"
+msgstr "løste rapporter"
-#: 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 "fra %d forskjellige brukere"
+msgstr "fra %s forskjellige brukere"
-#: 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 "sist oppdatert %s"
@@ -4118,10 +3934,8 @@ msgstr "åpnet på nytt"
msgid "sign out"
msgstr "logg ut"
-#: 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"
@@ -4130,7 +3944,7 @@ msgstr "den lokale administrasjonen"
msgid "there is no pin shown as the user did not use the map"
msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:398
+#: perllib/FixMyStreet/Script/Reports.pm:176
msgid "this type of local problem"
msgstr "denne type lokalt problem"
@@ -4139,9 +3953,8 @@ msgid "today"
msgstr "idag"
#: templates/web/base/reports/_list-filters.html:4
-#, fuzzy
msgid "unfixed reports"
-msgstr "Fiksede rapporter"
+msgstr "uløste rapporter"
#: templates/web/base/admin/report_edit.html:32
msgid "used map"
@@ -4160,7 +3973,7 @@ msgstr "bruker er eier 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"
@@ -4188,7 +4001,7 @@ msgid_plural "%d minutes"
msgstr[0] "%d minutt"
msgstr[1] "%d minutter"
-#: 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"
@@ -4209,14 +4022,14 @@ msgid_plural "%d weeks"
msgstr[0] "%d uke"
msgstr[1] "%d uker"
-#: 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 uke"
msgstr[1] "<big>%s</big> rapporter siste uke"
-#: 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"
@@ -4237,140 +4050,86 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
msgstr[0] "Vi har ennå <strong>ikke</strong> detaljene for den andre administrasjonen som dekker dette stedet."
msgstr[1] "Vi har ennå <strong>ikke</strong> detaljene for de andre administrasjonene som dekker dette stedet."
-#~ msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
-#~ msgstr "(Ta det med ro; vi tar vare på varselet ditt mens du sjekker e-posten din.)"
-
-#~ msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
-#~ msgstr "(Ta det med ro &mdash; vi tar vare på problemrapporten din mens du sjekker e-posten din.)"
-
-#~ msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
-#~ msgstr "(Ta det med ro &mdash; vi tar vare på oppdateringen din mens du sjekker e-posten din.)"
-
-#~ msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
-#~ msgstr "<small>Hvis du ikke kan se 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 gjør jeg ikke. La meg logge inn med e-post:"
-
-#~ msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
-#~ msgstr "Er du en <strong>utvikler</strong>? Kunne du tenke deg å bidra til FiksGataMi?"
-
-#~ msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
-#~ msgstr "De nærmeste problemene <small>(innenfor&nbsp;%skm)</small>"
-
-#~ msgid "Contact FixMyStreet"
-#~ msgstr "Kontakt FiksGataMi"
-
-#~ msgid "Do you have a FixMyBarangay password?"
-#~ msgstr "Har du et FixMyBarangay-passord?"
-
-#~ msgid "FixMyStreet admin:"
-#~ msgstr "FiksGataMi-administrator:"
-
-#~ msgid "If you do not, your alert will not be activated."
-#~ msgstr "Hvis du ikke gjør dette vil ikke ditt varsel bli aktivert"
-
-#~ msgid "If you do not, your problem will not be posted."
-#~ msgstr "Hvis du ikke gjør dette vil ikke din rapport bli publisert"
-
-#~ msgid "If you do not, your update will not be posted."
-#~ msgstr "Hvis du ikke gjør dette vil ikke din oppdatering bli publisert"
-
-#~ msgid "New local reports on reportemptyhomes.com"
-#~ msgstr "Nye lokale rapporter på reportemptyhomes.com"
-
-#~ msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
-#~ msgstr "Nye rapporter for {{COUNCIL}} innenfor {{WARD}} bydel på reportemptyhomes.com"
-
-#~ msgid "New reports on reportemptyhomes.com"
-#~ msgstr "Nye rapporter på reportemptyhomes.com"
-
-#~ msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
-#~ msgstr "Nye rapporter på reportemptyhomes.com nær postnummer {{POSTCODE}}"
-
-#~ msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
-#~ msgstr "Nye rapporter til {{COUNCIL}} på reportemptyhomes.com"
-
-#~ msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
-#~ msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com"
+#~ msgid "(we never show your email address or phone number)"
+#~ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)"
-#~ msgid "New update:"
-#~ msgstr "Ny oppdatering:"
+#~ msgid "(we never show your email)"
+#~ msgstr "(vi viser aldri din e-postadresse)"
-#~ msgid "No problems found."
-#~ msgstr "Ingen problemer ble funnet."
+#~ msgid "<strong>No</strong>, let me confirm my report by email:"
+#~ msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:"
-#~ msgid "No problems have been reported yet."
-#~ msgstr "Ingen problemer er rapportert"
+#~ msgid "<strong>No</strong>, let me confirm my update by email:"
+#~ msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:"
-#~ msgid "Now to submit your report&hellip; do you have a FixMyStreet password?"
-#~ msgstr "På tide å sende din rapport&hellip; har du et FiksGataMi-passord?"
+#~ msgid "Email me updates"
+#~ msgstr "Send meg oppdateringer"
-#~ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
-#~ msgstr "På tide å registrere din oppdatering&hellip; har du et FiksGataMi-passord?"
+#~ msgid "Enter a new password:"
+#~ msgstr "Skriv inn et nytt passord:"
-#~ msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
-#~ msgstr "Vår kildekode er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengelig på GitHub</a>."
+#~ 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 "Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n"
-#~ msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
-#~ msgstr "Vennligst <a class=\"tab_link\" href=\"#report\">se over</a> oppdateringene som har blitt lagt inn."
+#~ 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 "Hvis du bruker web-basert e-post eller har filtre for søppel-e-post på din e-postkonto, kan du i noen tilfellet måtte se etter våre meldinger der."
-#~ msgid "Please take a look at the updates that have been left."
-#~ msgstr "Vennligst se over oppdateringene som har blitt lagt inn."
+#~ msgid "Message:"
+#~ msgstr "Melding:"
-#~ msgid "Problems within %s, FixMyStreet"
-#~ msgstr "Problemer innenfor %s, Fiksgatami"
+#~ msgid "More problems nearby"
+#~ msgstr "Flere problemer i nærheten"
-#~ msgid "Properties recently reported as put back to use on reportemptyhomes.com"
-#~ msgstr "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com"
+#~ msgid "Nearly Done! Now check your email..."
+#~ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..."
-#~ msgid "Publish the response"
-#~ msgstr "Publiser svar"
+#~ msgid "Offensive? Unsuitable? Tell us"
+#~ msgstr "Støtende? Upassende? Gi oss beskjed"
-#~ msgid "Reported %s, to %s"
-#~ msgstr "Rapportert %s, til %s"
+#~ msgid "Photo:"
+#~ msgstr "Bilde:"
-#~ msgid "Reports on and around the map"
-#~ msgstr "Problemer i og rundt kartet"
+#~ msgid "Please check your email"
+#~ msgstr "Vennligst sjekk e-posten du oppgav"
-#~ msgid "Sign in by email"
-#~ msgstr "Logg inn via epost"
+#~ 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 "Vennligst merk at oppdateringer ikke blir sendt til administrasjonen. Hvis du legger igjen navnet ditt så vil det være offentlig tilgjengelig. Din informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy\">personvernpolicy</a>"
-#~ msgid "Signed in as %s"
-#~ msgstr "Logget inn som %s"
+#~ msgid "This may be because the link is too old or already used, or the address was not copied correctly."
+#~ msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller at lenken ikke ble kopiert riktig."
-#~ msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
-#~ msgstr "E-postbekreftelsen <strong>kan</strong> bruke noen minutter før den kommer frem &mdash; så vær tålmodig."
+#~ msgid "This problem has been closed"
+#~ msgstr "Dette problemet er lukket"
-#~ msgid "The details of your problem are available from the other tab above."
-#~ msgstr "Detaljene om ditt problem er tilgjengelig under den andre fanen ovenfor."
+#~ msgid "This problem is in progress"
+#~ msgstr "Dette problemet er under arbeid"
-#~ msgid "The details of your problem are available on the right hand side of this page."
-#~ msgstr "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden."
+#~ msgid "This problem is old and of unknown status."
+#~ msgstr "Dette problemet er gammelt og med ukjent status."
-#~ msgid "The latest local reports reported by users"
-#~ msgstr "De siste lokale rapporter rapportert av brukere"
+#~ msgid "Update:"
+#~ msgstr "Oppdatering:"
-#~ msgid "The latest properties reported back to use by users"
-#~ msgstr "De siste eiendommer rapportert tilbake i bruk av brukere"
+#~ msgid "We have not been able to confirm your account - sorry."
+#~ msgstr "Vi har ikke klart å bekrefte din konto - beklager."
-#~ msgid "The latest reports for {{COUNCIL}} reported by users"
-#~ msgstr "De siste rapporter for {{COUNCIL}} rapportert av brukere"
+#~ msgid "We have sent you an email containing a link to confirm your account."
+#~ msgstr "Vi har sendt deg en epost som inneholder link for å bekrefte din konto."
-#~ msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
-#~ msgstr "De siste rapporter for {{COUNCIL}} innenfor {{WARD}} bydel rapportert av brukere"
+#~ 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 ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:"
-#~ msgid "The latest reports within {{NAME}}'s boundary reported by users"
-#~ msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere"
+#~ msgid "You have already attached a photo to this report, attaching another one will replace it."
+#~ msgstr "Du har allerede lagt ved et bilde til dette problemet. Ã… legge ved et annet vil bytte ut dette."
-#~ msgid "To <strong>report a problem</strong>, click on the map at the correct location."
-#~ msgstr "For å <strong>rapportere et problem</strong>, klikk på riktig sted på kartet."
+#~ msgid "You have already attached a photo to this update, attaching another one will replace it."
+#~ msgstr "Du har allerede lagt ved et bilde til denne oppdateringen. Ã… legge ved et annet vil bytte ut dette."
-#~ msgid "User"
-#~ msgstr "Bruker"
+#~ msgid "Your email:"
+#~ msgstr "Din e-post"
-#~ msgid "You must now click the link in the email we've just sent you."
-#~ msgstr "Du må nå åpne lenken i e-posten vi akkurat sendte deg."
+#~ msgid "Your name:"
+#~ msgstr "Ditt navn:"
-#~ msgid "Your email address:"
-#~ msgstr "Din e-postadresse:"
+#~ msgid "Your&nbsp;email:"
+#~ msgstr "Din&nbsp;e-post:"