diff options
Diffstat (limited to 'locale/nn_NO.UTF-8/LC_MESSAGES')
| -rw-r--r-- | locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 977 |
1 files changed, 524 insertions, 453 deletions
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 842068dea..6137b7505 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-11-06 12:38+0000\n" +"POT-Creation-Date: 2018-12-19 17:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety <transifex@mysociety.org>, 2017\n" "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n" @@ -18,13 +18,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:673 -#: perllib/FixMyStreet/DB/Result/Problem.pm:675 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 +#: perllib/FixMyStreet/DB/Result/Problem.pm:680 #: perllib/FixMyStreet/Script/Reports.pm:188 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -158,7 +158,7 @@ msgstr "" msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/report/new/form_user_loggedin.html:38 +#: templates/web/base/report/new/form_user_loggedin.html:39 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "(optional)" msgstr "(valfritt)" @@ -178,9 +178,9 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" @@ -210,7 +210,7 @@ msgstr "" msgid "<label for=\"statuses\">Show</label> %s reports <label for=\"filter_categories\">about</label> %s" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:95 msgid "<span>%s</span> saved." msgstr "" @@ -219,31 +219,22 @@ msgstr "" msgid "<strong>%s</strong> live problems" msgstr "<strong>%s</strong> aktive problem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:11 msgid "<strong>No</strong> Let me confirm my report by email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:5 msgid "<strong>No</strong> Let me confirm my report by email/text" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:9 msgid "<strong>No</strong> Let me confirm my update by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#: templates/web/base/report/form/user_loggedout_by_email_heading.html:3 msgid "<strong>No</strong> Let me confirm my update by email/text" msgstr "" -#: templates/web/base/auth/general.html:112 -#: templates/web/zurich/auth/general.html:41 -msgid "<strong>No</strong> let me sign in by email" -msgstr "" - -#: templates/web/base/auth/general.html:110 -msgid "<strong>No</strong> let me sign in by email or text" -msgstr "" - #: templates/web/base/report/_inspect.html:197 msgid "<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" @@ -252,12 +243,15 @@ msgstr "" msgid "<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:81 -#: templates/web/base/report/new/form_user_loggedout_password.html:3 -#: templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/report/form/user_loggedout_password.html:4 msgid "<strong>Yes</strong> I have a password" msgstr "<strong>Ja</strong>, eg har eit passord" +#: templates/web/base/report/new/form_user.html:8 +#, fuzzy +msgid "About the problem" +msgstr "Rapporter eit problem" + #: templates/web/base/auth/generate_token.html:54 msgid "Activate two-factor authentication" msgstr "" @@ -319,9 +313,9 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:35 msgid "Add to shortlist" msgstr "" @@ -331,16 +325,15 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:167 +#: perllib/FixMyStreet/Cobrand/Default.pm:744 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Default.pm:746 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:742 +#: perllib/FixMyStreet/Cobrand/Default.pm:745 msgid "Add/edit response templates" msgstr "" @@ -348,7 +341,7 @@ msgstr "" msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:152 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -368,7 +361,8 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s" msgid "Alert %d disabled (created %s)" msgstr "Varsel %d kobla ut (oppretta %s)" -#: templates/web/base/report/update/form_name.html:39 +#: templates/web/base/report/form/user_loggedout_by_email.html:50 +#: templates/web/base/report/update/form_user_loggedin.html:35 msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" @@ -436,34 +430,36 @@ msgstr "" msgid "An update marked this problem as fixed." msgstr "Ei oppdatering markerte dette problemet som løyst." -#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/problem_row.html:20 msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/report/new/form_user_loggedin.html:21 -#: templates/web/base/report/update/form_name.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:22 +#: templates/web/base/report/update/form_user_loggedin.html:19 #, fuzzy msgid "Anonymous user" msgstr "Anonym" #: templates/web/base/admin/report_edit.html:130 +#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/update_edit.html:96 msgid "Anonymous:" msgstr "Anonym:" -#: templates/web/base/report/new/form_user_loggedin.html:24 -#: templates/web/base/report/update/form_name.html:14 +#: templates/web/base/report/new/form_user_loggedin.html:25 +#: templates/web/base/report/update/form_user_loggedin.html:16 msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:70 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:90 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -500,7 +496,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:741 msgid "Assign users to areas" msgstr "" @@ -533,6 +529,10 @@ msgstr "" msgid "Automated" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:723 +msgid "Automatically populate report subject/detail" +msgstr "" + #: templates/web/base/admin/report-category.html:8 msgid "Available categories" msgstr "" @@ -545,12 +545,12 @@ msgstr "" msgid "Avoid personal information and vehicle number plates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:344 +#: perllib/FixMyStreet/DB/Result/Problem.pm:349 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:40 msgid "Back" msgstr "" @@ -564,10 +564,8 @@ msgid "Ban user" msgstr "Flagg brukar" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:740 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:166 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: perllib/FixMyStreet/Cobrand/Default.pm:743 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 @@ -604,7 +602,6 @@ msgid "Can't see the map? <em>Skip this step</em>" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:281 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -637,7 +634,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -647,6 +644,7 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/base/admin/report_edit.html:126 +#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -700,7 +698,7 @@ msgstr "" msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:89 msgid "Clear offline data" msgstr "" @@ -728,6 +726,10 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:7 +msgid "Click the map or drag the pin to adjust the location" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 #: perllib/FixMyStreet/Cobrand/Zurich.pm:158 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161 @@ -740,7 +742,7 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:861 +#: perllib/FixMyStreet/DB/Result/Problem.pm:866 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -770,18 +772,17 @@ msgid "Cobrand:" msgstr "Merkevaresamarbeid:" #: templates/web/base/admin/extra-metadata-form.html:24 -#: templates/web/base/auth/2faform.html:18 +#: templates/web/base/auth/2faform.html:17 #: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:61 msgid "Collapse map" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:277 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -795,8 +796,7 @@ msgstr "Stadfest" msgid "Confirm account" msgstr "Stadfest konto" -#: templates/web/base/report/new/form_user_loggedout_password.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:20 +#: templates/web/base/report/form/user_loggedout_password.html:30 msgid "Confirm by email instead, providing a new password at that point. When you confirm, your password will be updated." msgstr "" @@ -815,7 +815,7 @@ msgstr "Stadfesting" msgid "Confirmed" msgstr "Stadfesta" -#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/list_updates.html:40 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:79 msgid "Confirmed:" @@ -826,16 +826,20 @@ msgstr "Stadfesta:" msgid "Contact %s" msgstr "" -#: templates/web/base/contact/index.html:1 -#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/index.html:4 +#: templates/web/base/contact/index.html:5 #: templates/web/base/contact/submit.html:1 msgid "Contact Us" msgstr "Kontakt oss" -#: templates/web/base/contact/index.html:12 +#: templates/web/base/contact/index.html:15 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" +#: templates/web/base/report/form/user.html:8 +msgid "Continue" +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -845,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2074 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2103 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:47 msgid "Could not look up location" msgstr "" @@ -886,6 +890,11 @@ msgstr "Oppretta" msgid "Create a report" msgstr "Lag ein rapport" +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:5 +#, fuzzy +msgid "Create an account" +msgstr "Logg inn eller opprett ein konto" + #: templates/web/base/admin/contact-form.html:156 #: templates/web/zurich/admin/contact-form.html:49 msgid "Create category" @@ -895,18 +904,15 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:158 +#: perllib/FixMyStreet/Cobrand/Default.pm:726 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:159 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:157 +#: perllib/FixMyStreet/Cobrand/Default.pm:725 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -924,7 +930,7 @@ msgstr "Oppretta" msgid "Created %d new users" msgstr "" -#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/report_edit.html:78 #: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 @@ -950,7 +956,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -978,6 +984,10 @@ msgstr "" msgid "Default priority" msgstr "" +#: perllib/FixMyStreet/Cobrand/Default.pm:728 +msgid "Default to creating reports/updates as the council" +msgstr "" + #: templates/web/base/report/_inspect.html:93 msgid "Defect type" msgstr "" @@ -987,7 +997,7 @@ msgstr "" msgid "Delete" msgstr "Sletta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" @@ -999,8 +1009,8 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/_main.html:115 -#: templates/web/base/report/update.html:51 +#: templates/web/base/report/_main.html:119 +#: templates/web/base/report/update.html:54 msgid "Describe why you are moderating this" msgstr "" @@ -1016,17 +1026,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:354 +#: perllib/FixMyStreet/App/Controller/Report.pm:377 msgid "Detailed information is limited to %d characters." msgstr "" #: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/js/translation_strings.html:42 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 +#: templates/web/base/admin/report_edit.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1058,8 +1069,8 @@ msgstr "" msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:120 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:124 +#: templates/web/base/report/update.html:57 msgid "Discard changes" msgstr "" @@ -1068,11 +1079,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/new/form_user_loggedout.html:25 -#: templates/web/base/report/new/oauth_email_form.html:18 -#: templates/web/base/report/update-form.html:34 -#: templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/report/form/user_loggedout.html:5 msgid "Do you have a %s password?" msgstr "" @@ -1084,7 +1091,7 @@ msgstr "" msgid "Don’t know" msgstr "Veit ikkje" -#: templates/web/base/contact/index.html:119 +#: templates/web/base/contact/index.html:122 msgid "Don't like forms?" msgstr "" @@ -1092,7 +1099,7 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/js/translation_strings.html:69 msgid "Drag and drop photos here or <u>click to upload</u>" msgstr "" @@ -1133,34 +1140,36 @@ msgstr "Rediger" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:163 -#, fuzzy -msgid "Edit other users' details" -msgstr "Ver venleg og legg inn opplysningar om problemet" - -#: perllib/FixMyStreet/Cobrand/Default.pm:736 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:164 +#: perllib/FixMyStreet/Cobrand/Default.pm:739 msgid "Edit other users' permissions" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:718 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:156 msgid "Edit report category" msgstr "" +#: templates/web/base/report/new/form_user.html:13 +#, fuzzy +msgid "Edit report details" +msgstr "Ver venleg og legg inn opplysningar om problemet" + #: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Edit report priority" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:717 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:155 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Edit users' details/search for their reports" msgstr "" +#: templates/web/base/report/update/form_user.html:8 +#, fuzzy +msgid "Edit your update" +msgstr "Oppdateringane dine" + #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:15 #: templates/web/base/admin/report_edit.html:6 @@ -1193,20 +1202,20 @@ msgstr "Oppdatert av" #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:14 -#: templates/web/zurich/auth/general.html:44 +#: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 -#: templates/web/base/report/new/form_user_loggedin.html:38 -#: templates/web/base/report/update/form_name.html:23 +#: templates/web/base/report/new/form_user_loggedin.html:39 +#: templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:20 +#: templates/web/base/report/form/user_loggedout_by_email.html:42 +#: templates/web/base/report/new/form_user_loggedin.html:60 #, fuzzy msgid "Email address (optional)" msgstr "E-post lagd til misbrukliste" @@ -1219,6 +1228,14 @@ msgstr "" msgid "Email alert deleted" msgstr "" +#: templates/web/base/auth/general.html:99 +msgid "Email me a link or text me a code to sign in" +msgstr "" + +#: templates/web/base/auth/general.html:101 +msgid "Email me a link to sign in" +msgstr "" + #: templates/web/base/admin/user-form.html:25 msgid "Email verified:" msgstr "" @@ -1296,11 +1313,6 @@ msgstr "" msgid "Enter a nearby UK postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/KiitC.pm:148 -#, fuzzy -msgid "Enter a nearby UK postcode, street name and area, or asset name" -msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" - #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" @@ -1350,11 +1362,11 @@ msgstr "" msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:60 msgid "Expand map" msgstr "" -#: templates/web/base/report/new/form_report.html:52 +#: templates/web/base/report/new/form_report.html:53 msgid "Explain what’s wrong" msgstr "" @@ -1396,6 +1408,8 @@ msgstr "" #: templates/web/base/admin/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/report_edit.html:202 +#: templates/web/base/admin/update_edit.html:97 msgid "Extra data:" msgstr "" @@ -1417,6 +1431,11 @@ msgstr "" msgid "Fields" msgstr "" +#: templates/web/base/report/form/user_loggedout_password.html:25 +#: templates/web/base/report/form/user_loggedout_password.html:8 +msgid "Fill in your details manually." +msgstr "" + #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" @@ -1494,17 +1513,22 @@ msgstr "" msgid "For more information, see <a href='https://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" -#: templates/web/base/auth/general.html:96 -#: templates/web/base/report/new/form_user_loggedout_password.html:20 -#: templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/create.html:1 templates/web/base/auth/create.html:3 +#, fuzzy +msgid "Forgot password" +msgstr "Byt passord" + +#: templates/web/base/auth/general.html:91 +#: templates/web/base/report/form/user_loggedout_password.html:24 +#: templates/web/base/report/form/user_loggedout_password.html:29 msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 msgid "Forwarded wish to external body" msgstr "" @@ -1562,7 +1586,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:740 msgid "Grant access to the admin" msgstr "" @@ -1630,7 +1654,7 @@ msgstr "Skjult" msgid "Hide all reports and updates" msgstr "Vis alle rapporterte problem" -#: templates/web/base/report/_main.html:111 +#: templates/web/base/report/_main.html:115 msgid "Hide entire report" msgstr "" @@ -1653,11 +1677,11 @@ msgstr "" #: templates/web/base/around/display_location.html:60 #: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:66 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:18 msgid "Hide update completely?" msgstr "" @@ -1682,7 +1706,7 @@ msgstr "" msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "How to send successful reports" msgstr "" @@ -1742,7 +1766,7 @@ msgid "" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:107 +#: templates/web/base/contact/index.html:110 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1852,7 +1876,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:722 msgid "Instruct contractors to fix problems" msgstr "" @@ -1872,8 +1896,8 @@ msgstr "Ugyldig agency_responsible-verdi %s" msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:264 -#: perllib/FixMyStreet/App/Controller/Report.pm:423 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 +#: perllib/FixMyStreet/App/Controller/Report.pm:446 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1885,13 +1909,6 @@ msgstr "" msgid "It’s on its way to the council right now." msgstr "" -#: templates/web/base/auth/general.html:92 -#: 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:30 -msgid "Keep me signed in on this computer" -msgstr "Hugs mi innlogging på denne datamaskina" - #: templates/web/base/admin/extra-metadata-form.html:71 msgid "Key" msgstr "" @@ -1931,6 +1948,7 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" +#: templates/web/base/admin/report_edit.html:200 #: templates/web/base/report/_inspect.html:36 #: templates/web/base/report/_item.html:93 msgid "Latitude/Longitude:" @@ -1957,7 +1975,7 @@ msgstr "Vis alle rapporterte problem" msgid "Loading reports…" msgstr "Oppdateringane dine" -#: templates/web/base/report/new/category_wrapper.html:8 +#: templates/web/base/report/new/category_wrapper.html:9 msgid "Loading..." msgstr "Lastar …" @@ -1983,23 +2001,22 @@ msgstr "Lokale varsel" msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" -#: templates/web/base/auth/general.html:24 -#: templates/web/base/report/new/form_user_loggedout.html:6 -#: templates/web/base/report/update/form_user_loggedout.html:7 +#: templates/web/base/auth/general.html:29 +#: templates/web/base/report/form/user.html:13 msgid "Log in with Facebook" msgstr "" -#: templates/web/base/auth/general.html:32 -#: templates/web/base/report/new/form_user_loggedout.html:14 -#: templates/web/base/report/update/form_user_loggedout.html:15 +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/form/user.html:19 msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:74 msgid "Log in with email/text" msgstr "" @@ -2011,7 +2028,7 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:52 +#: templates/web/base/js/translation_strings.html:55 msgid "MAP" msgstr "" @@ -2019,7 +2036,7 @@ msgstr "" msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:724 msgid "Manage shortlist" msgstr "" @@ -2027,7 +2044,7 @@ msgstr "" msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:57 msgid "Map" msgstr "" @@ -2039,11 +2056,11 @@ msgstr "" msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:100 +#: templates/web/base/contact/index.html:103 msgid "Message" msgstr "" @@ -2063,24 +2080,25 @@ msgstr "" msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:716 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:154 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:137 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:15 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:75 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/_main.html:79 #: templates/web/base/report/_update_state.html:19 msgid "Moderated by %s at %s" msgstr "" @@ -2089,6 +2107,11 @@ msgstr "" msgid "Moderated by division within one working day" msgstr "" +#: templates/web/base/admin/report_edit.html:188 +#: templates/web/base/admin/update_edit.html:86 +msgid "Moderation history" +msgstr "" + #: templates/web/base/dashboard/index.html:102 #: templates/web/zurich/admin/stats/index.html:9 msgid "Month" @@ -2114,9 +2137,9 @@ msgstr "" #: templates/web/base/admin/user_import.html:23 #: templates/web/base/admin/user_import.html:46 #: templates/web/base/admin/users.html:16 -#: templates/web/base/report/new/form_user_name.html:1 +#: templates/web/base/report/form/user_name.html:2 #: templates/web/zurich/admin/body-form.html:4 -#: templates/web/zurich/auth/general.html:50 +#: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "Namn" @@ -2129,6 +2152,11 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" +#: perllib/FixMyStreet/Cobrand/Rutland.pm:16 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:24 +msgid "Names are limited to %d characters in length." +msgstr "" + #: templates/web/base/report/_inspect.html:50 msgid "Navigate to this problem" msgstr "" @@ -2195,6 +2223,8 @@ msgid "New note to DM:" msgstr "" #: templates/web/base/auth/change_password.html:47 +#: templates/web/base/auth/create.html:49 +#: templates/web/base/report/form/user_loggedout_by_email.html:54 msgid "New password:" msgstr "" @@ -2280,11 +2310,18 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1211 +#: templates/web/base/report/form/user.html:5 +#, fuzzy +msgid "Next:" +msgstr "Tekst:" + +#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/category_edit.html:4 -#: templates/web/base/admin/list_updates.html:32 -#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 @@ -2297,6 +2334,11 @@ msgstr "" msgid "No" msgstr "Nei" +#: templates/web/base/report/form/user_loggedout_password.html:7 +#, fuzzy +msgid "No account?" +msgstr "Stadfest konto" + #: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" @@ -2305,7 +2347,7 @@ msgstr "" msgid "No body" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:372 +#: perllib/FixMyStreet/DB/Result/Problem.pm:377 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -2338,7 +2380,7 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:48 msgid "No result returned" msgstr "" @@ -2410,16 +2452,6 @@ msgstr "" msgid "Notice" msgstr "" -#: templates/web/base/report/new/oauth_email_form.html:17 -msgid "Now to submit your report…" -msgstr "" - -#: templates/web/base/report/update-form.html:33 -#: templates/web/base/report/update/form_user_loggedout.html:2 -#: templates/web/base/report/update/form_user_loggedout.html:23 -msgid "Now to submit your update…" -msgstr "" - #: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" @@ -2428,15 +2460,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:54 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:91 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:85 +#: templates/web/base/js/translation_strings.html:88 msgid "Offline update data saved" msgstr "" @@ -2488,6 +2520,14 @@ msgstr "Open311-spesifikasjon" msgid "Options" msgstr "" +#: templates/web/base/report/new/fill_in_details_form.html:8 +msgid "Or <a href=\"/\">search for a different location</a>" +msgstr "" + +#: templates/web/base/report/form/private_details.html:6 +msgid "Or sign in with password to prefill this information." +msgstr "" + #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" msgstr "" @@ -2496,15 +2536,15 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1339 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 -#: perllib/FixMyStreet/DB/Result/Problem.pm:600 -#: perllib/FixMyStreet/DB/Result/Problem.pm:607 -#: perllib/FixMyStreet/DB/Result/Problem.pm:622 -#: perllib/FixMyStreet/DB/Result/Problem.pm:631 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 +#: perllib/FixMyStreet/DB/Result/Problem.pm:627 +#: perllib/FixMyStreet/DB/Result/Problem.pm:636 #: perllib/FixMyStreet/Script/Reports.pm:182 #: perllib/FixMyStreet/Script/Reports.pm:189 msgid "Other" @@ -2541,15 +2581,13 @@ msgstr "" msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:24 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 -#: templates/web/zurich/auth/general.html:22 -#: templates/web/zurich/auth/general.html:53 +#: templates/web/base/report/form/user_loggedout_by_email.html:55 +#: templates/web/zurich/auth/general.html:20 +#: templates/web/zurich/auth/general.html:46 msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:63 msgid "Permalink" msgstr "" @@ -2567,16 +2605,21 @@ msgid "Phone Reporter:" msgstr "" #: templates/web/base/auth/change_phone.html:36 -#: templates/web/base/report/new/form_user_loggedin.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:52 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:15 +#: templates/web/base/report/form/user_loggedout_by_email.html:13 +#: templates/web/base/report/form/user_loggedout_by_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:53 msgid "Phone number (optional)" msgstr "" +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:28 +msgid "Phone numbers are limited to %s characters in length." +msgstr "" + #: templates/web/base/admin/user-form.html:29 msgid "Phone verified:" msgstr "" @@ -2587,12 +2630,14 @@ msgstr "" msgid "Phone:" msgstr "Telefon:" +#: templates/web/base/admin/report_edit.html:198 +#: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 #: templates/web/base/questionnaire/index.html:95 -#: templates/web/base/report/new/form_report.html:28 -#: templates/web/base/report/new/form_report.html:43 -#: templates/web/base/report/new/form_report.html:45 +#: templates/web/base/report/new/form_report.html:29 +#: templates/web/base/report/new/form_report.html:44 +#: templates/web/base/report/new/form_report.html:46 #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 @@ -2606,7 +2651,7 @@ msgstr "Telefon:" msgid "Photo" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +#: perllib/FixMyStreet/App/Controller/Photo.pm:196 msgid "Photo is required." msgstr "" @@ -2614,12 +2659,12 @@ msgstr "" msgid "Photo required" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:112 +#: perllib/FixMyStreet/App/Controller/Photo.pm:113 msgid "Photo upload failed." msgstr "" #: templates/web/base/questionnaire/index.html:78 -#: templates/web/base/report/new/form_report.html:28 +#: templates/web/base/report/new/form_report.html:29 #: templates/web/base/report/update/form_update.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:20 msgid "Photos" @@ -2640,7 +2685,7 @@ msgid "Pick your ward" msgstr "" #: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Place pin on map" msgstr "" @@ -2660,7 +2705,7 @@ msgstr "Ver venleg og sjekk passorda og prøv igjen" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1425 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2670,15 +2715,15 @@ msgid "Please check your phone number is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" #: perllib/FixMyStreet/App/Controller/Admin.pm:315 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:964 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:999 -#: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 +#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: templates/web/base/js/translation_strings.html:16 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/App/Controller/Auth.pm:379 -#: perllib/FixMyStreet/App/Controller/Auth.pm:405 +#: perllib/FixMyStreet/App/Controller/Auth.pm:387 +#: perllib/FixMyStreet/App/Controller/Auth.pm:413 msgid "Please choose a less commonly-used password" msgstr "" @@ -2700,12 +2745,12 @@ msgid "Please do not be abusive — abusing your council devalues the s msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:316 -#: perllib/FixMyStreet/DB/Result/Comment.pm:148 +#: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1423 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2714,8 +2759,8 @@ msgstr "Ver venleg og skriv ei melding" msgid "Please enter a mobile number" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1450 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 msgid "Please enter a name" msgstr "" @@ -2725,22 +2770,22 @@ msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:124 -#: perllib/FixMyStreet/DB/Result/Problem.pm:366 +#: perllib/FixMyStreet/DB/Result/Problem.pm:371 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1447 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1559 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 #: perllib/FixMyStreet/App/Controller/Admin.pm:329 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:16 -#: templates/web/base/js/translation_strings.html:20 +#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" @@ -2749,14 +2794,14 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1454 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1553 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 #, fuzzy msgid "Please enter a valid email or phone number" msgstr "Ver venleg og legg til ein gyldig e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:8 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 +#: templates/web/base/js/translation_strings.html:9 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" @@ -2766,39 +2811,39 @@ msgstr "Ver venleg og legg inn opplysningar om problemet" #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:15 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:18 +#: templates/web/base/js/translation_strings.html:22 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:14 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:122 -#: perllib/FixMyStreet/DB/Result/Comment.pm:145 -#: perllib/FixMyStreet/DB/Result/Problem.pm:377 +#: perllib/FixMyStreet/DB/Result/Comment.pm:146 +#: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:33 +#: templates/web/base/js/translation_strings.html:36 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:31 +#: templates/web/base/js/translation_strings.html:34 msgid "Please enter your title" msgstr "" @@ -2827,8 +2872,8 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" -#: perllib/FixMyStreet/App/Controller/Auth.pm:402 -#: templates/web/base/js/translation_strings.html:26 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 +#: templates/web/base/js/translation_strings.html:29 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2840,7 +2885,7 @@ msgstr "" msgid "Please note your report has <strong>not yet been sent</strong>." msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/base/report/new/fill_in_details_form.html:23 #: templates/web/zurich/report/new/sidebar.html:5 msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit." msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kategori og legg til meir informasjon under før du sender inn." @@ -2854,12 +2899,12 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Report.pm:383 +#: perllib/FixMyStreet/App/Controller/Report.pm:406 #, fuzzy msgid "Please provide a duplicate ID or public update for this report." msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Report.pm:365 +#: perllib/FixMyStreet/App/Controller/Report.pm:388 msgid "Please provide a public update for this report." msgstr "" @@ -2892,15 +2937,15 @@ msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:114 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:148 -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:150 -#: templates/web/base/js/translation_strings.html:68 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 +#: templates/web/base/js/translation_strings.html:71 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1457 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1556 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 msgid "Please verify at least one of email/phone" msgstr "" @@ -2908,9 +2953,7 @@ msgstr "" msgid "Please write a message" msgstr "Skriv inn ei melding" -#: templates/web/base/report/update-form.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:21 -#: templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:38 msgid "Post" msgstr "Send inn" @@ -2919,19 +2962,19 @@ msgstr "Send inn" msgid "Postcode or street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" -#: perllib/FixMyStreet/DB/Result/Comment.pm:231 +#: perllib/FixMyStreet/DB/Result/Comment.pm:221 msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:268 +#: perllib/FixMyStreet/DB/Result/Comment.pm:258 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:256 +#: perllib/FixMyStreet/DB/Result/Comment.pm:246 msgid "Posted by <strong>%s</strong> (%s) at %s" msgstr "Lagt inn av <strong>%s</strong> (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:258 +#: perllib/FixMyStreet/DB/Result/Comment.pm:248 msgid "Posted by <strong>%s</strong> at %s" msgstr "Lagt inn av <strong>%s</strong> %s" @@ -2966,14 +3009,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 #: templates/web/base/report/_inspect.html:13 -#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" -#: templates/web/base/report/new/form_user.html:2 -msgid "Private details" -msgstr "" - #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2996,7 +3035,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1381 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -3005,7 +3044,6 @@ msgid "Problem state change based on survey results" msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" #: perllib/FixMyStreet/Cobrand/Default.pm:715 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:153 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -3032,7 +3070,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:852 +#: perllib/FixMyStreet/Cobrand/Default.pm:855 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3058,26 +3096,26 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:67 +#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidra med ei oppdatering" -#: templates/web/base/report/update/form_name.html:10 +#: templates/web/base/report/update/form_user_loggedin.html:12 msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:124 -msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#, fuzzy +msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports." +msgstr "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:29 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:16 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" -#: templates/web/base/report/new/form_report.html:12 +#: templates/web/base/report/new/form_report.html:13 msgid "Public details" msgstr "" @@ -3146,7 +3184,7 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: perllib/FixMyStreet/Cobrand/Default.pm:853 +#: perllib/FixMyStreet/Cobrand/Default.pm:856 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3171,7 +3209,7 @@ msgstr "RSS-straum med oppdateringar for dette problemet" msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:773 +#: perllib/FixMyStreet/DB/Result/Problem.pm:778 msgid "Received by %s moments later" msgstr "" @@ -3218,9 +3256,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:23 +#: templates/web/base/report/_main.html:31 msgid "Remove from shortlist" msgstr "" @@ -3252,14 +3290,14 @@ msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:80 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/base/js/translation_strings.html:78 +#: templates/web/base/js/translation_strings.html:81 #: templates/web/base/main_nav_items.html:4 #, fuzzy msgid "Report a problem here" @@ -3270,14 +3308,14 @@ msgstr "Rapporter eit problem" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:79 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 #, fuzzy msgid "Report another problem here" msgstr "Rapporter eit problem" -#: templates/web/base/report/new/form_user_loggedin.html:17 +#: templates/web/base/report/new/form_user_loggedin.html:18 msgid "Report as" msgstr "" @@ -3305,8 +3343,8 @@ msgstr "Rapporter, finn eller diskuter lokale problem" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 -#: templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 +#: templates/web/base/contact/index.html:58 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" @@ -3315,8 +3353,8 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:635 -#: templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 +#: templates/web/base/contact/index.html:60 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3325,31 +3363,31 @@ msgstr "Publisert av %s %s" msgid "Reported by:" msgstr "" -#: templates/web/zurich/report/_main.html:2 +#: templates/web/zurich/report/_main.html:4 msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:613 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 +#: perllib/FixMyStreet/DB/Result/Problem.pm:637 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:610 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:629 +#: perllib/FixMyStreet/DB/Result/Problem.pm:634 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:602 +#: perllib/FixMyStreet/DB/Result/Problem.pm:607 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:624 +#: perllib/FixMyStreet/DB/Result/Problem.pm:629 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3360,7 +3398,7 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:50 +#: templates/web/base/js/translation_strings.html:53 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 #: templates/web/zurich/report/new/fill_in_details_form.html:4 @@ -3369,17 +3407,22 @@ msgstr "Legger til eit problem" #: perllib/FixMyStreet/Cobrand/Default.pm:660 #: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:286 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:334 perllib/FixMyStreet/Cobrand/UK.pm:336 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 +#: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" +#: templates/web/base/js/translation_strings.html:10 +msgid "Reports are limited to {0} characters in length. Please shorten your report" +msgstr "" + #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" msgstr "" @@ -3401,7 +3444,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:92 msgid "Reports saved offline." msgstr "" @@ -3463,20 +3506,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:39 +#: templates/web/base/report/update.html:42 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:101 +#: templates/web/base/report/_main.html:105 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:54 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:34 -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:37 +#: templates/web/base/js/translation_strings.html:51 msgid "Right place?" msgstr "" @@ -3488,15 +3531,15 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2152 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2148 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3507,7 +3550,7 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:58 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" @@ -3521,8 +3564,8 @@ msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 #: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:53 +#: templates/web/base/report/_main.html:123 +#: templates/web/base/report/update.html:56 #: templates/web/zurich/admin/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" @@ -3537,7 +3580,7 @@ msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:93 msgid "Saving reports offline" msgstr "" @@ -3577,13 +3620,12 @@ msgstr "" msgid "Security" msgstr "" +#: templates/web/base/report/form/private_details.html:14 #: templates/web/base/report/new/councils_text_private.html:7 -#: templates/web/base/report/new/form_user.html:6 msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:160 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 msgid "See user detail for reports created as the council" msgstr "" @@ -3614,7 +3656,7 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:111 +#: templates/web/base/contact/index.html:114 msgid "Send" msgstr "" @@ -3631,11 +3673,11 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:776 +#: perllib/FixMyStreet/DB/Result/Problem.pm:781 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -3668,9 +3710,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:22 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:143 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:34 msgid "Shortlist" msgstr "" @@ -3678,19 +3720,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:136 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:141 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:30 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:146 +#: templates/web/base/report/_main.html:151 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:23 msgid "Show Photo?" msgstr "" @@ -3702,7 +3744,7 @@ msgstr "" msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:20 msgid "Show name publicly?" msgstr "" @@ -3715,17 +3757,17 @@ msgstr "" msgid "Show older reports" msgstr "Oppdateringane dine" -#: templates/web/base/report/_main.html:85 +#: templates/web/base/report/_main.html:89 msgid "Show photo" msgstr "" #: templates/web/base/around/display_location.html:58 #: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:62 +#: templates/web/base/report/_main.html:66 msgid "Show reporter’s name" msgstr "" @@ -3733,20 +3775,20 @@ msgstr "" msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:129 -#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/create.html:57 +#: templates/web/base/auth/general.html:4 #: templates/web/base/auth/general.html:87 #: templates/web/base/main_nav_items.html:14 -#: templates/web/zurich/auth/general.html:25 +#: templates/web/zurich/auth/general.html:23 #: templates/web/zurich/auth/general.html:8 msgid "Sign in" msgstr "Logg inn" -#: templates/web/base/auth/general.html:100 +#: templates/web/base/auth/create.html:22 msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" -#: templates/web/base/auth/general.html:98 +#: templates/web/base/auth/create.html:20 msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." msgstr "" @@ -3755,6 +3797,11 @@ msgstr "" msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" +#: templates/web/base/auth/general.html:80 +#, fuzzy +msgid "Sign in with a password" +msgstr "Enter a password" + #: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:73 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" @@ -3797,15 +3844,15 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: templates/web/base/auth/general.html:11 +#: templates/web/base/auth/general.html:16 #: templates/web/base/report/display.html:29 -#: templates/web/base/report/new/fill_in_details_form.html:17 +#: templates/web/base/report/new/fill_in_details_form.html:26 msgid "Sorry, we could not log you in. Please fill in the form below." msgstr "" @@ -3815,7 +3862,7 @@ msgstr "" msgid "Sorry, we could not parse that location. Please try again." msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt." -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:131 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:137 msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" @@ -3858,13 +3905,13 @@ msgstr "" #: templates/web/base/dashboard/index.html:101 #: templates/web/base/report/_inspect.html:103 #: templates/web/base/report/_item.html:101 -#: templates/web/base/report/update/form_update.html:39 +#: templates/web/base/report/update/form_update.html:41 #: templates/web/zurich/admin/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1210 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1211 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 msgid "State and external status code cannot be used simultaneously." msgstr "" @@ -3884,15 +3931,14 @@ msgid "State:" msgstr "Tilstand:" #: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:276 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" #: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3922,7 +3968,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:37 +#: templates/web/base/report/new/category.html:38 #, fuzzy msgid "Subcategory" msgstr "Kategori" @@ -3931,21 +3977,22 @@ msgstr "Kategori" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:97 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 +#: templates/web/base/admin/report_edit.html:196 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" -#: templates/web/base/auth/2faform.html:21 +#: templates/web/base/auth/2faform.html:20 #: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:68 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 -#: templates/web/base/report/new/form_user_loggedout_password.html:11 +#: templates/web/base/report/form/user_loggedout_by_email.html:69 +#: templates/web/base/report/form/user_loggedout_password.html:33 +#: templates/web/base/report/new/form_user_loggedin.html:71 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send inn" @@ -3997,8 +4044,7 @@ msgid "Summarise your changes" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:270 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 @@ -4033,18 +4079,22 @@ msgstr "" msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" +#: templates/web/base/report/form/private_details.html:2 +#: templates/web/base/report/form/user.html:5 +msgid "Tell us about you" +msgstr "" + #: templates/web/zurich/admin/template_edit.html:7 msgid "Template «%s»" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 #: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -4055,6 +4105,7 @@ msgstr "Tekst-utgåve" #: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 +#: templates/web/base/admin/update_edit.html:94 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 msgid "Text:" @@ -4091,7 +4142,7 @@ msgstr "" msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:155 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:161 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." @@ -4105,7 +4156,6 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:104 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:114 #: perllib/FixMyStreet/Cobrand/UK.pm:73 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." @@ -4118,28 +4168,28 @@ msgstr "" msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." -#: perllib/FixMyStreet/App/Controller/Report.pm:138 +#: perllib/FixMyStreet/App/Controller/Report.pm:161 msgid "That report cannot be viewed on %s." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:128 +#: perllib/FixMyStreet/App/Controller/Report.pm:151 msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 #, fuzzy msgid "That user has been logged out." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1984 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1998 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 msgid "That user’s reports and updates have been hidden." msgstr "" @@ -4279,7 +4329,7 @@ msgstr "" msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2023 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 #, fuzzy msgid "The user has been sent a login email" msgstr "Den rapporten har vorte fjerna frå FiksGataMi." @@ -4297,7 +4347,7 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1238 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4314,14 +4364,18 @@ msgstr "" msgid "There was a problem with your email/password combination. Please try again." msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:853 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142 -#: templates/web/base/auth/general.html:51 -#: templates/web/zurich/auth/general.html:18 +#: templates/web/base/auth/_username_error.html:0 +#: templates/web/base/auth/_username_error.html:14 +#, fuzzy +msgid "There was a problem with your login information." +msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:857 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:146 msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:350 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:354 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -4329,10 +4383,19 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:391 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:395 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." +#: templates/web/base/report/form/private_details.html:13 +#: templates/web/base/report/new/councils_text_private.html:5 +msgid "These details will be sent to the council, but will never be shown online without your permission." +msgstr "" + +#: templates/web/base/report/new/councils_text_private.html:3 +msgid "These details will never be shown online without your permission." +msgstr "" + #: templates/web/base/admin/open311-form-fields.html:3 #: templates/web/base/admin/open311-form-fields.html:4 msgid "" @@ -4357,15 +4420,6 @@ msgstr "" msgid "These will be sent to <strong>%s</strong> and also published online for others to see, in accordance with our <a href=\"%s\">privacy policy</a>." msgstr "" -#: templates/web/base/report/new/councils_text_private.html:5 -#: templates/web/base/report/new/form_user.html:5 -msgid "These will be sent to the council, but will never be shown online." -msgstr "" - -#: templates/web/base/report/new/councils_text_private.html:3 -msgid "These will never be shown online." -msgstr "" - #: templates/web/base/open311/index.html:69 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." @@ -4396,10 +4450,10 @@ msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden f msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1013 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1074 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1091 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1137 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -4438,7 +4492,7 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:142 #: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/zurich/report/_main.html:12 +#: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4454,7 +4508,7 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: templates/web/base/report/display.html:59 +#: templates/web/base/report/display.html:58 #, fuzzy msgid "This report is now closed to updates." msgstr "Denne rapporten er for tida markert som open." @@ -4471,7 +4525,6 @@ msgid "Time spent (in minutes):" msgstr "" #: perllib/FixMyStreet/Cobrand/Default.pm:642 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:271 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4555,7 +4608,7 @@ msgstr "" msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 msgid "Trusted to make reports that don't need to be inspected" msgstr "" @@ -4565,7 +4618,7 @@ msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Try again" msgstr "" @@ -4601,7 +4654,7 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: templates/web/base/report/banner.html:9 +#: templates/web/base/report/banner.html:13 msgid "Unknown" msgstr "" @@ -4609,18 +4662,18 @@ msgstr "" msgid "Unknown alert type" msgstr "Ukjend varsel-type" -#: perllib/FixMyStreet/App/Controller/Photo.pm:118 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:49 msgid "Unknown error" msgstr "" #: perllib/FixMyStreet/App/Controller/Develop.pm:159 #: perllib/FixMyStreet/App/Controller/Develop.pm:178 #: perllib/FixMyStreet/App/Controller/My.pm:200 -#: perllib/FixMyStreet/App/Controller/Report.pm:113 -#: perllib/FixMyStreet/App/Controller/Report.pm:119 -#: perllib/FixMyStreet/App/Controller/Report.pm:122 +#: perllib/FixMyStreet/App/Controller/Report.pm:136 +#: perllib/FixMyStreet/App/Controller/Report.pm:142 +#: perllib/FixMyStreet/App/Controller/Report.pm:145 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" @@ -4639,7 +4692,7 @@ msgstr "" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/admin/user-alerts.html:58 -#: templates/web/base/report/update/form_update.html:29 +#: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4647,11 +4700,11 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" -#: templates/web/base/contact/index.html:28 +#: templates/web/base/contact/index.html:31 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" -#: templates/web/base/contact/index.html:30 +#: templates/web/base/contact/index.html:33 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" @@ -4691,24 +4744,24 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:262 +#: perllib/FixMyStreet/DB/Result/Comment.pm:252 #, fuzzy msgid "Updated by <strong>%s</strong> (%s) at %s" msgstr "Lagt inn av <strong>%s</strong> (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:264 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 #, fuzzy msgid "Updated by <strong>%s</strong> at %s" msgstr "Lagt inn av <strong>%s</strong> %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1375 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1490 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1699 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 #: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 msgid "Updated!" msgstr "Oppdatert!" @@ -4719,7 +4772,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:154 +#: perllib/FixMyStreet/DB/Result/Comment.pm:155 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -4774,28 +4827,28 @@ msgstr "" msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1935 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1945 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 #, fuzzy msgid "User added to abuse list" msgstr "E-post lagd til misbrukliste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1468 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1580 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1932 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1942 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 #, fuzzy msgid "User already in abuse list" msgstr "E-post allereie i misbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2107 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2078 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 msgid "User flagged" msgstr "Brukar flagga" @@ -4821,10 +4874,8 @@ msgid "User:" msgstr "Brukarar" #: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:162 -#: perllib/FixMyStreet/Cobrand/KiitC.pm:292 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brukarar" @@ -4871,6 +4922,10 @@ msgstr "" msgid "View wards" msgstr "andre område:" +#: perllib/FixMyStreet/Cobrand/Default.pm:720 +msgid "View/Mark private reports" +msgstr "" + #: templates/web/base/around/display_location.html:0 #: templates/web/base/around/display_location.html:37 msgid "Viewing a location" @@ -4902,7 +4957,7 @@ msgstr "" msgid "We have sent a confirmation code to your phone. Please enter it below:" msgstr "" -#: templates/web/base/auth/general.html:8 +#: templates/web/base/auth/general.html:13 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." @@ -4964,7 +5019,7 @@ msgstr "" msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:68 msgid "Whoa there Testino! Three photos are enough." msgstr "" @@ -4992,17 +5047,15 @@ msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting." -#: templates/web/base/report/new/fill_in_details_form.html:4 -msgid "Wrong location? Just click again on the map." -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1210 +#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 +#: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 -#: templates/web/base/admin/list_updates.html:32 -#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/list_updates.html:36 #: templates/web/base/admin/problem_row.html:20 #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 @@ -5016,11 +5069,11 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:45 +#: templates/web/base/contact/index.html:48 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:94 msgid "You are offline" msgstr "" @@ -5028,11 +5081,11 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" -#: templates/web/base/contact/index.html:22 +#: templates/web/base/contact/index.html:25 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:" -#: templates/web/base/report/display.html:60 +#: templates/web/base/report/display.html:59 msgid "You can <a href=\"%s\">make a new report in the same location</a>." msgstr "" @@ -5049,7 +5102,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:125 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" msgstr "" @@ -5071,11 +5124,11 @@ msgstr "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i % msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:43 +#: templates/web/base/js/translation_strings.html:46 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:96 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>." msgstr "" @@ -5083,7 +5136,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n" -#: templates/web/base/report/new/form_report.html:37 +#: templates/web/base/report/new/form_report.html:38 #: templates/web/zurich/report/new/fill_in_details_form.html:30 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 "" @@ -5161,11 +5214,11 @@ msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/contact/index.html:80 +#: templates/web/base/auth/create.html:37 +#: templates/web/base/auth/general.html:49 +#: templates/web/base/contact/index.html:85 #: templates/web/base/report/display_tools.html:46 -#: templates/web/base/report/new/form_user_loggedout_email.html:6 -#: templates/web/base/report/update/form_user_loggedout_email.html:6 +#: templates/web/base/report/form/user_loggedout_email.html:7 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5174,9 +5227,9 @@ msgstr "" msgid "Your email address" msgstr "" -#: templates/web/base/auth/general.html:42 -#: templates/web/base/report/new/form_user_loggedout_email.html:2 -#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#: templates/web/base/auth/create.html:35 +#: templates/web/base/auth/general.html:47 +#: templates/web/base/report/form/user_loggedout_email.html:3 msgid "Your email or mobile" msgstr "" @@ -5184,9 +5237,7 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/base/auth/general.html:115 -#: templates/web/base/contact/index.html:74 -#: templates/web/base/report/update/form_name.html:27 +#: templates/web/base/contact/index.html:79 msgid "Your name" msgstr "" @@ -5202,13 +5253,13 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:83 +#: templates/web/base/js/translation_strings.html:86 msgid "Your offline reports" msgstr "" +#: templates/web/base/auth/create.html:49 #: templates/web/base/auth/general.html:83 -#: templates/web/base/report/new/form_user_loggedout_password.html:5 -#: templates/web/base/report/update/form_user_loggedout_password.html:4 +#: templates/web/base/report/form/user_loggedout_password.html:17 msgid "Your password" msgstr "" @@ -5217,15 +5268,15 @@ msgstr "" msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" -#: templates/web/base/auth/general.html:133 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:25 -#: templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/create.html:52 +#: templates/web/base/report/form/user_loggedout_by_email.html:61 +#: templates/web/base/report/form/user_loggedout_by_email.html:63 +#: templates/web/zurich/auth/general.html:56 msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:87 +#: templates/web/base/contact/index.html:92 msgid "Your phone number" msgstr "" @@ -5247,7 +5298,12 @@ msgstr "" msgid "Your token has been generated" msgstr "Passordet ditt har vorte endra" -#: templates/web/base/js/translation_strings.html:84 +#: templates/web/base/report/update/form_user.html:6 +#, fuzzy +msgid "Your update" +msgstr "Oppdateringane dine" + +#: templates/web/base/js/translation_strings.html:87 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5259,8 +5315,8 @@ msgstr "Oppdateringane dine" msgid "Your verification code is %s" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:19 -#: templates/web/base/report/update/form_name.html:12 +#: templates/web/base/report/new/form_user_loggedin.html:20 +#: templates/web/base/report/update/form_user_loggedin.html:14 msgid "Yourself" msgstr "" @@ -5278,13 +5334,15 @@ msgid "all" msgstr "" #: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:114 -#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 #: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 +#: templates/web/base/admin/report_edit.html:194 +#: templates/web/base/admin/update_edit.html:92 msgid "an administrator" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:272 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "and a defect raised" msgstr "" @@ -5310,7 +5368,7 @@ msgstr "" msgid "e.g. ‘10 inch pothole on Example St, near post box’" msgstr "" -#: templates/web/base/report/new/form_report.html:57 +#: templates/web/base/report/new/form_report.html:58 msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" @@ -5348,6 +5406,15 @@ msgstr "" msgid "not the council's responsibility" msgstr "" +#: templates/web/base/auth/general.html:6 +#, fuzzy +msgid "or <a href=\"%s\">create an account</a>" +msgstr "Logg inn eller opprett ein konto" + +#: templates/web/base/auth/create.html:13 +msgid "or <a href=\"%s\">sign in</a>" +msgstr "" + #: templates/web/base/alert/index.html:40 #: templates/web/base/around/postcode_form.html:27 msgid "or locate me automatically" @@ -5384,12 +5451,12 @@ msgstr "" msgid "the database id of the body to associate that user with, e.g. <code>2217</code> for Buckinghamshire." msgstr "" -#: templates/web/base/report/new/form_report.html:15 +#: templates/web/base/report/new/form_report.html:16 msgid "the local council" msgstr "den lokale administrasjonen" #: templates/web/base/report/_report_meta_info.html:5 -#: templates/web/zurich/report/_main.html:5 +#: templates/web/zurich/report/_main.html:7 msgid "there is no pin shown as the user did not use the map" msgstr "" @@ -5406,11 +5473,11 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:97 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:98 msgid "updates" msgstr "" @@ -5426,12 +5493,12 @@ msgstr "brukaren er frå same administrasjon som problemet – %d" msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2051 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 #, fuzzy msgid "user not in abuse list" msgstr "E-post allereie i misbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2049 +#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 #, fuzzy msgid "user removed from abuse list" msgstr "E-post lagd til misbrukliste" @@ -5602,8 +5669,12 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "Enter a password" -#~ msgstr "Enter a password" +#, fuzzy +#~ msgid "Enter a nearby UK postcode, street name and area, or asset name" +#~ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" + +#~ msgid "Keep me signed in on this computer" +#~ msgstr "Hugs mi innlogging på denne datamaskina" #~ msgid "Password:" #~ msgstr "Passord:" |