aboutsummaryrefslogtreecommitdiffstats
path: root/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po')
-rw-r--r--locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po842
1 files changed, 484 insertions, 358 deletions
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 878465ba2..82e6ee1d5 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: 2017-12-15 17:48+0000\n"
+"POT-Creation-Date: 2018-02-12 15:46+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"
@@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: perllib/FixMyStreet/DB/Result/Problem.pm:650
-#: perllib/FixMyStreet/Script/Reports.pm:196
+#: perllib/FixMyStreet/Script/Reports.pm:193
msgid " and "
msgstr " og "
@@ -87,8 +87,8 @@ msgstr ""
msgid "%s live updates"
msgstr "%s aktive oppdateringar"
-#: templates/web/base/dashboard/index.html:159
-#: templates/web/base/dashboard/index.html:163
+#: templates/web/base/dashboard/index.html:160
+#: templates/web/base/dashboard/index.html:164
msgid "%s opened, %s closed, %s fixed"
msgstr ""
@@ -122,7 +122,7 @@ msgstr ""
msgid "(a-z and space only)"
msgstr ""
-#: templates/web/zurich/report/_item.html:19
+#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(lukka)"
@@ -131,7 +131,7 @@ msgstr "(lukka)"
msgid "(covers roughly 200,000 people)"
msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)"
-#: templates/web/zurich/report/_item.html:17
+#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(løyst)"
@@ -151,6 +151,7 @@ msgstr ""
msgid "(not sent to council)"
msgstr "(ikkje rapportert til administrasjonen)"
+#: templates/web/base/report/new/form_user_loggedin.html:38
#: templates/web/zurich/report/new/fill_in_details_form.html:59
msgid "(optional)"
msgstr "(valfritt)"
@@ -166,7 +167,7 @@ msgid "(we also have RSS feeds for problems within %s)"
msgstr "RSS-straum for problem innanfor %s"
#: perllib/FixMyStreet/App/Controller/Report/New.pm:252
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:688
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:685
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
msgid "-- Pick a category --"
msgstr "-- Vel ein kategori --"
@@ -196,7 +197,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:78
+#: templates/web/base/js/translation_strings.html:84
msgid "<span>%s</span> saved."
msgstr ""
@@ -221,12 +222,12 @@ msgstr ""
msgid "<strong>No</strong> Let me confirm my update by email/text"
msgstr ""
-#: templates/web/base/auth/general.html:110
-#: templates/web/zurich/auth/general.html:51
+#: 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:108
+#: templates/web/base/auth/general.html:110
msgid "<strong>No</strong> let me sign in by email or text"
msgstr ""
@@ -238,12 +239,16 @@ 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:79
+#: 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
msgid "<strong>Yes</strong> I have a password"
msgstr "<strong>Ja</strong>, eg har eit passord"
+#: templates/web/base/auth/generate_token.html:54
+msgid "Activate two-factor authentication"
+msgstr ""
+
#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50
msgid "Add"
msgstr ""
@@ -313,15 +318,18 @@ msgstr ""
msgid "Add user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/ACV.pm:108
+#: perllib/FixMyStreet/Cobrand/Default.pm:736
msgid "Add/edit problem categories"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/ACV.pm:110
+#: perllib/FixMyStreet/Cobrand/Default.pm:738
msgid "Add/edit response priorities"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:719
+#: perllib/FixMyStreet/Cobrand/ACV.pm:109
+#: perllib/FixMyStreet/Cobrand/Default.pm:737
msgid "Add/edit response templates"
msgstr ""
@@ -337,7 +345,7 @@ msgstr ""
msgid "Admin"
msgstr ""
-#: templates/web/base/auth/change_password.html:39
+#: templates/web/base/auth/change_password.html:51
msgid "Again:"
msgstr "Gjenta:"
@@ -356,12 +364,12 @@ msgstr "Send meg varsel ved framtidige oppdateringar"
#: templates/web/base/dashboard/index.html:30
#: templates/web/base/dashboard/index.html:40
#: templates/web/base/dashboard/index.html:51
-#: templates/web/base/dashboard/index.html:63
+#: templates/web/base/dashboard/index.html:64
#: templates/web/base/reports/_list-filters.html:3
msgid "All"
msgstr ""
-#: templates/web/zurich/reports/index.html:13
+#: templates/web/zurich/reports/index.html:14
msgid "All Reports"
msgstr ""
@@ -430,13 +438,13 @@ msgstr "Anonym:"
msgid "Another user"
msgstr ""
-#: templates/web/base/js/translation_strings.html:59
+#: templates/web/base/js/translation_strings.html:65
msgid "Are you sure you want to cancel this upload?"
msgstr ""
#: templates/web/base/admin/report_edit.html:84
#: templates/web/base/admin/template_edit.html:75
-#: templates/web/base/js/translation_strings.html:73
+#: templates/web/base/js/translation_strings.html:79
#: templates/web/base/report/display_tools.html:6
msgid "Are you sure?"
msgstr ""
@@ -447,7 +455,7 @@ msgstr ""
msgid "Area covered"
msgstr ""
-#: templates/web/base/admin/user-form.html:82
+#: templates/web/base/admin/user-form.html:78
msgid "Area:"
msgstr ""
@@ -473,11 +481,12 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/ACV.pm:105
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
msgid "Assign users to areas"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:219
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:220
msgid "Assigned to %s"
msgstr ""
@@ -489,8 +498,8 @@ msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei ret
msgid "At the moment only searching for and looking at reports work."
msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar."
-#: templates/web/base/admin/user-form.html:96
-#: templates/web/base/admin/user-form.html:97
+#: templates/web/base/admin/user-form.html:92
+#: templates/web/base/admin/user-form.html:93
msgid "Authorised staff users can be associated with the categories in which they operate."
msgstr ""
@@ -515,11 +524,11 @@ msgid "Avoid personal information and vehicle number plates"
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:344
-#: templates/web/zurich/report/_item.html:9
+#: templates/web/zurich/report/_item.html:11
msgid "Awaiting moderation"
msgstr ""
-#: templates/web/base/js/translation_strings.html:31
+#: templates/web/base/js/translation_strings.html:37
msgid "Back"
msgstr ""
@@ -532,9 +541,11 @@ msgstr ""
msgid "Ban user"
msgstr "Flagg brukar"
-#: perllib/FixMyStreet/Cobrand/Default.pm:633
-#: perllib/FixMyStreet/Cobrand/Default.pm:717
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:396
+#: perllib/FixMyStreet/Cobrand/ACV.pm:107
+#: perllib/FixMyStreet/Cobrand/ACV.pm:260
+#: perllib/FixMyStreet/Cobrand/Default.pm:651
+#: perllib/FixMyStreet/Cobrand/Default.pm:735
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:423
#: templates/web/base/admin/bodies.html:1
#: templates/web/base/admin/report_edit.html:55
#: templates/web/zurich/header.html:50
@@ -548,7 +559,7 @@ msgstr ""
msgid "Body"
msgstr ""
-#: templates/web/base/admin/user-form.html:54
+#: templates/web/base/admin/user-form.html:46
msgid "Body:"
msgstr ""
@@ -564,7 +575,8 @@ msgstr ""
msgid "Can't see the map? <em>Skip this step</em>"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:633
+#: perllib/FixMyStreet/Cobrand/ACV.pm:260
+#: perllib/FixMyStreet/Cobrand/Default.pm:651
#: templates/web/base/admin/responsepriorities/list.html:8
#: templates/web/base/admin/templates.html:7
msgid "Categories"
@@ -578,7 +590,7 @@ msgstr ""
#: templates/web/base/admin/body.html:72
#: templates/web/base/admin/contact-form.html:19
#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/dashboard/index.html:99
+#: templates/web/base/dashboard/index.html:100
#: templates/web/base/report/_inspect.html:54
#: templates/web/base/report/_item.html:92
#: templates/web/base/report/new/category.html:12
@@ -591,7 +603,7 @@ msgstr ""
msgid "Category"
msgstr "Kategori"
-#: templates/web/base/dashboard/index.html:102
+#: templates/web/base/dashboard/index.html:103
#, fuzzy
msgid "Category and State"
msgstr "Kategori"
@@ -614,7 +626,7 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/Script/Reports.pm:187
+#: perllib/FixMyStreet/Script/Reports.pm:184
msgid "Category: %s"
msgstr "Kategori: %s"
@@ -629,9 +641,7 @@ msgid "Change email address"
msgstr ""
#: templates/web/base/auth/change_password.html:1
-#: templates/web/base/auth/change_password.html:16
-#: templates/web/base/auth/change_password.html:4
-#: templates/web/base/auth/change_password.html:43
+#: templates/web/base/auth/change_password.html:5
#: templates/web/base/my/my.html:63
msgid "Change password"
msgstr "Byt passord"
@@ -666,7 +676,7 @@ msgstr ""
msgid "Choose another"
msgstr ""
-#: templates/web/base/js/translation_strings.html:72
+#: templates/web/base/js/translation_strings.html:78
msgid "Clear offline data"
msgstr ""
@@ -694,14 +704,14 @@ msgstr ""
msgid "Click the link in that email to sign in."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:194
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:965
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:1004
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:195
#: perllib/FixMyStreet/DB/ResultSet/State.pm:71
#: templates/web/base/admin/states/index.html:103
#: templates/web/base/admin/states/index.html:27
#: templates/web/base/admin/states/index.html:33
-#: templates/web/base/dashboard/index.html:112
+#: templates/web/base/dashboard/index.html:113
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:16
@@ -734,15 +744,17 @@ msgid "Cobrand:"
msgstr "Merkevaresamarbeid:"
#: templates/web/base/admin/extra-metadata-form.html:14
+#: templates/web/base/auth/2faform.html:18
#: templates/web/base/auth/smsform.html:24
msgid "Code"
msgstr ""
-#: templates/web/base/js/translation_strings.html:50
+#: templates/web/base/js/translation_strings.html:56
msgid "Collapse map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:629
+#: perllib/FixMyStreet/Cobrand/ACV.pm:256
+#: perllib/FixMyStreet/Cobrand/Default.pm:647
#: templates/web/base/admin/config_page.html:1
msgid "Configuration"
msgstr ""
@@ -751,6 +763,7 @@ msgstr ""
msgid "Confirm"
msgstr "Stadfest"
+#: templates/web/base/auth/2faform.html:1
#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1
msgid "Confirm account"
msgstr "Stadfest konto"
@@ -800,12 +813,12 @@ msgstr "Kontakt prosjektgruppa"
msgid "Coordinates:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1801
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1830
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1854
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1883
msgid "Could not find user"
msgstr "Kunne ikkje finna brukaren"
-#: templates/web/base/js/translation_strings.html:36
+#: templates/web/base/js/translation_strings.html:42
msgid "Could not look up location"
msgstr ""
@@ -850,15 +863,18 @@ msgstr "Lag kategori"
msgid "Create priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:701
+#: perllib/FixMyStreet/Cobrand/ACV.pm:91
+#: perllib/FixMyStreet/Cobrand/Default.pm:719
msgid "Create reports/updates as anonymous user"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:702
+#: perllib/FixMyStreet/Cobrand/ACV.pm:92
+#: perllib/FixMyStreet/Cobrand/Default.pm:720
msgid "Create reports/updates as the council"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:700
+#: perllib/FixMyStreet/Cobrand/ACV.pm:90
+#: perllib/FixMyStreet/Cobrand/Default.pm:718
msgid "Create reports/updates on a user's behalf"
msgstr ""
@@ -879,12 +895,17 @@ msgstr "Oppretta"
msgid "Created:"
msgstr "Oppretta:"
-#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/change_password.html:40
+#, fuzzy
+msgid "Current password:"
+msgstr "Byt passord"
+
+#: templates/web/base/auth/generate_token.html:46
#, fuzzy
msgid "Current token:"
msgstr "Gjeldande tilstand"
-#: templates/web/base/dashboard/index.html:91
+#: templates/web/base/dashboard/index.html:92
msgid "Currently grouped by %s"
msgstr ""
@@ -893,7 +914,7 @@ msgstr ""
msgid "Currently no bodies have been created."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:830
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:869
#: templates/web/zurich/admin/report_edit-sdm.html:105
msgid "Customer not contactable"
msgstr ""
@@ -905,6 +926,10 @@ msgstr ""
msgid "Dashboard"
msgstr ""
+#: templates/web/base/auth/generate_token.html:54
+msgid "Deactivate two-factor authentication"
+msgstr ""
+
#: templates/web/zurich/admin/stats/index.html:35
msgid "Dealt with by subdivision within 5 working days"
msgstr ""
@@ -954,7 +979,7 @@ msgstr ""
msgid "Detailed information is limited to %d characters."
msgstr ""
-#: templates/web/base/js/translation_strings.html:33
+#: templates/web/base/js/translation_strings.html:39
#: templates/web/zurich/report/new/fill_in_details_form.html:45
msgid "Details"
msgstr ""
@@ -966,7 +991,7 @@ msgstr ""
msgid "Details:"
msgstr "Detaljar:"
-#: templates/web/base/dashboard/index.html:103
+#: templates/web/base/dashboard/index.html:104
msgid "Device and Site"
msgstr ""
@@ -1017,7 +1042,7 @@ msgstr ""
msgid "Down one"
msgstr ""
-#: templates/web/base/js/translation_strings.html:58
+#: templates/web/base/js/translation_strings.html:64
msgid "Drag and drop photos here or <u>click to upload</u>"
msgstr ""
@@ -1058,23 +1083,27 @@ msgstr "Rediger"
msgid "Edit body details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:712
+#: perllib/FixMyStreet/Cobrand/ACV.pm:102
+#: perllib/FixMyStreet/Cobrand/Default.pm:730
msgid "Edit other users' details"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:713
+#: perllib/FixMyStreet/Cobrand/ACV.pm:103
+#: perllib/FixMyStreet/Cobrand/Default.pm:731
msgid "Edit other users' permissions"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:695
+#: perllib/FixMyStreet/Cobrand/ACV.pm:89
+#: perllib/FixMyStreet/Cobrand/Default.pm:713
msgid "Edit report category"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
msgid "Edit report priority"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/ACV.pm:88
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
msgid "Edit reports"
msgstr ""
@@ -1107,8 +1136,8 @@ msgstr "Oppdatert av"
#: templates/web/base/admin/users.html:17
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:15
-#: templates/web/zurich/auth/general.html:24
-#: templates/web/zurich/auth/general.html:54
+#: templates/web/zurich/auth/general.html:14
+#: templates/web/zurich/auth/general.html:44
msgid "Email"
msgstr "E-post"
@@ -1134,7 +1163,7 @@ msgstr ""
msgid "Email alert deleted"
msgstr ""
-#: templates/web/base/admin/user-form.html:22
+#: templates/web/base/admin/user-form.html:21
msgid "Email verified:"
msgstr ""
@@ -1145,10 +1174,6 @@ msgstr ""
msgid "Email:"
msgstr "E-post:"
-#: perllib/FixMyStreet/Script/Reports.pm:111
-msgid "Email: %s"
-msgstr ""
-
#: templates/web/base/admin/open311-form-fields.html:55
#: templates/web/base/admin/open311-form-fields.html:56
msgid ""
@@ -1166,7 +1191,7 @@ msgid ""
" problem must be emailed, while others can be sent over Open311."
msgstr ""
-#: templates/web/base/dashboard/index.html:77
+#: templates/web/base/dashboard/index.html:78
#, fuzzy
msgid "End Date"
msgstr "På dato"
@@ -1175,7 +1200,7 @@ msgstr "På dato"
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:81
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:82
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1194,10 +1219,10 @@ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad"
msgid "Enter a nearby street name and area"
msgstr ""
-#: templates/web/base/auth/general.html:123
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:45
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:17
-#: templates/web/zurich/auth/general.html:65
+#: templates/web/base/auth/general.html:128
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:47
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:20
+#: templates/web/zurich/auth/general.html:58
msgid "Enter a password"
msgstr "Enter a password"
@@ -1232,7 +1257,7 @@ msgstr "Døme:"
msgid "Existing category"
msgstr ""
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:55
msgid "Expand map"
msgstr ""
@@ -1240,12 +1265,12 @@ msgstr ""
msgid "Explain what’s wrong"
msgstr ""
-#: templates/web/base/dashboard/index.html:104
+#: templates/web/base/dashboard/index.html:105
msgid "Export as CSV"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:179
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:918
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:180
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:957
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:12
msgid "Extern"
@@ -1268,7 +1293,7 @@ msgstr ""
msgid "External team"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:656
+#: perllib/FixMyStreet/Cobrand/Default.pm:674
#: templates/web/base/admin/reportextrafields/edit.html:1
#: templates/web/base/admin/reportextrafields/index.html:1
msgid "Extra Fields"
@@ -1307,10 +1332,10 @@ msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit bod
msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35
-#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131
#: templates/web/base/admin/states/index.html:29
#: templates/web/base/admin/stats/fix_rate.html:4
-#: templates/web/base/dashboard/index.html:113
+#: templates/web/base/dashboard/index.html:114
msgid "Fixed"
msgstr "Løyst"
@@ -1332,7 +1357,7 @@ msgstr ""
msgid "Flag user"
msgstr "Flagg brukar"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:645
#: templates/web/base/admin/users.html:20
msgid "Flagged"
msgstr "Flagga:"
@@ -1341,7 +1366,7 @@ msgstr "Flagga:"
msgid "Flagged reports and users"
msgstr ""
-#: templates/web/base/admin/user-form.html:112
+#: templates/web/base/admin/user-form.html:108
msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
msgstr ""
@@ -1349,8 +1374,8 @@ msgstr ""
msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
msgstr ""
-#: templates/web/base/admin/report_edit.html:140
-#: templates/web/base/admin/user-form.html:118
+#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/user-form.html:115
msgid "Flagged:"
msgstr "Flagga:"
@@ -1370,17 +1395,17 @@ msgstr ""
msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
msgstr ""
-#: templates/web/base/auth/general.html:94
+#: 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
msgid "Forgotten your password?"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:748
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:787
msgid "Forwarded to external body"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:749
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:788
msgid "Forwarded wish to external body"
msgstr ""
@@ -1390,11 +1415,7 @@ msgstr ""
msgid "Frequently Asked Questions"
msgstr "Ofte spurde spurnader"
-#: templates/web/base/auth/generate_token.html:1
-#: templates/web/base/auth/generate_token.html:2
-#: templates/web/base/auth/generate_token.html:20
-#: templates/web/base/auth/generate_token.html:33
-#: templates/web/base/my/my.html:65
+#: templates/web/base/auth/generate_token.html:52
msgid "Generate token"
msgstr ""
@@ -1441,7 +1462,8 @@ msgstr "Hald fram"
msgid "Going to send questionnaire?"
msgstr "Skal spørjeskjemaet sendast?"
-#: perllib/FixMyStreet/Cobrand/Default.pm:714
+#: perllib/FixMyStreet/Cobrand/ACV.pm:104
+#: perllib/FixMyStreet/Cobrand/Default.pm:732
msgid "Grant access to the admin"
msgstr ""
@@ -1449,12 +1471,12 @@ msgstr ""
msgid "Graph of problem creation by status over time"
msgstr "Graf over problemoppretting fordelt på status over tid"
-#: templates/web/base/dashboard/index.html:93
+#: templates/web/base/dashboard/index.html:94
#, fuzzy
msgid "Group by %s"
msgstr "av %s"
-#: templates/web/base/dashboard/index.html:98
+#: templates/web/base/dashboard/index.html:99
msgid "Group by:"
msgstr ""
@@ -1487,7 +1509,7 @@ msgstr "Bilete av nye problem i nærleiken"
msgid "Hi %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:911
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:950
#: perllib/FixMyStreet/DB/ResultSet/State.pm:64
#: templates/web/base/admin/update_edit.html:30
#: templates/web/zurich/admin/header.html:1
@@ -1497,6 +1519,11 @@ msgstr ""
msgid "Hidden"
msgstr "Skjult"
+#: templates/web/base/admin/user-form.html:197
+#, fuzzy
+msgid "Hide all reports and updates"
+msgstr "Vis alle rapporterte problem"
+
#: templates/web/base/report/_main.html:105
msgid "Hide entire report"
msgstr ""
@@ -1520,7 +1547,7 @@ msgstr ""
#: templates/web/base/around/display_location.html:60
#: templates/web/base/around/display_location.html:68
-#: templates/web/base/js/translation_strings.html:55
+#: templates/web/base/js/translation_strings.html:61
msgid "Hide pins"
msgstr "Skjul nåler"
@@ -1549,7 +1576,7 @@ msgstr ""
msgid "How to report a problem"
msgstr "Korleis rapportera eit problem"
-#: templates/web/base/js/translation_strings.html:32
+#: templates/web/base/js/translation_strings.html:38
msgid "How to send successful reports"
msgstr ""
@@ -1608,7 +1635,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/auth/generate_token.html:39
+#: templates/web/base/auth/generate_token.html:61
msgid "If you generate a new token the existing token will no longer work."
msgstr ""
@@ -1682,8 +1709,8 @@ msgstr ""
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:197
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:959
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:198
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:998
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:8
msgid "In progress"
@@ -1713,7 +1740,7 @@ msgstr ""
msgid "Inspection required"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:698
+#: perllib/FixMyStreet/Cobrand/Default.pm:716
msgid "Instruct contractors to fix problems"
msgstr ""
@@ -1745,20 +1772,20 @@ msgstr ""
msgid "It’s on its way to the council right now."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:182
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:183
msgid "Jurisdiction Unknown"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:923
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:962
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:15
msgid "Jurisdiction unknown"
msgstr ""
-#: templates/web/base/auth/general.html:90
+#: 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:40
+#: templates/web/zurich/auth/general.html:30
msgid "Keep me signed in on this computer"
msgstr "Hugs mi innlogging på denne datamaskina"
@@ -1822,6 +1849,11 @@ msgstr ""
msgid "List all reported problems"
msgstr "Vis alle rapporterte problem"
+#: templates/web/base/around/on_map_list_items.html:18
+#, fuzzy
+msgid "Loading reports…"
+msgstr "Oppdateringane dine"
+
#: templates/web/base/report/new/category_wrapper.html:8
msgid "Loading..."
msgstr "Lastar …"
@@ -1860,23 +1892,31 @@ msgstr ""
msgid "Log in with Twitter"
msgstr ""
-#: templates/web/base/js/translation_strings.html:65
+#: templates/web/base/js/translation_strings.html:71
msgid "Log in with email"
msgstr ""
-#: templates/web/base/js/translation_strings.html:63
+#: templates/web/base/js/translation_strings.html:69
msgid "Log in with email/text"
msgstr ""
-#: templates/web/base/dashboard/index.html:81
+#: templates/web/base/admin/user-form.html:195
+msgid "Log out of all sessions"
+msgstr ""
+
+#: templates/web/base/dashboard/index.html:82
msgid "Look up"
msgstr ""
-#: templates/web/base/js/translation_strings.html:44
+#: templates/web/base/js/translation_strings.html:50
msgid "MAP"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:699
+#: templates/web/base/admin/user-form.html:196
+msgid "Make anonymous on all reports and updates"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:717
msgid "Manage shortlist"
msgstr ""
@@ -1884,7 +1924,7 @@ msgstr ""
msgid "Manual order"
msgstr ""
-#: templates/web/base/js/translation_strings.html:46
+#: templates/web/base/js/translation_strings.html:52
msgid "Map"
msgstr ""
@@ -1892,11 +1932,11 @@ msgstr ""
msgid "Mark as sent"
msgstr ""
-#: templates/web/base/admin/user-form.html:110
+#: templates/web/base/admin/user-form.html:106
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:697
+#: perllib/FixMyStreet/Cobrand/Default.pm:715
msgid "Markup problem details"
msgstr ""
@@ -1924,7 +1964,8 @@ msgstr "Manglar jurisdiction_id"
msgid "Moderate"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
+#: perllib/FixMyStreet/Cobrand/ACV.pm:87
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
msgid "Moderate report details"
msgstr ""
@@ -1950,7 +1991,7 @@ msgstr ""
msgid "Moderation reason:"
msgstr ""
-#: templates/web/base/dashboard/index.html:101
+#: templates/web/base/dashboard/index.html:102
msgid "Month"
msgstr "Månad"
@@ -1972,12 +2013,12 @@ msgstr ""
#: templates/web/base/admin/states/index.html:108
#: templates/web/base/admin/states/index.html:11
#: templates/web/base/admin/users.html:16
-#: templates/web/base/auth/general.html:113
+#: templates/web/base/auth/general.html:115
#: templates/web/base/report/new/form_user_loggedin.html:49
#: templates/web/base/report/new/form_user_loggedout_by_email.html:11
#: templates/web/base/report/update/form_name.html:27
#: templates/web/zurich/admin/body-form.html:4
-#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/auth/general.html:50
#: templates/web/zurich/report/new/fill_in_details_form.html:59
msgid "Name"
msgstr "Namn"
@@ -1990,10 +2031,6 @@ msgstr "Namn"
msgid "Name:"
msgstr "Namn:"
-#: perllib/FixMyStreet/Script/Reports.pm:110
-msgid "Name: %s"
-msgstr ""
-
#: templates/web/base/report/_inspect.html:44
msgid "Navigate to this problem"
msgstr ""
@@ -2011,8 +2048,8 @@ msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk gener
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:521
-#: perllib/FixMyStreet/Cobrand/Default.pm:549
+#: perllib/FixMyStreet/Cobrand/Default.pm:539
+#: perllib/FixMyStreet/Cobrand/Default.pm:567
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s"
@@ -2030,11 +2067,12 @@ msgstr ""
msgid "Nearly done! Now check your email&hellip;"
msgstr ""
+#: templates/web/base/auth/2faform.html:8
#: templates/web/base/auth/smsform.html:19
msgid "Nearly done! Now check your phone&hellip;"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:129
msgid "New"
msgstr ""
@@ -2063,7 +2101,7 @@ msgstr "Nye lokale problem på FiksGataMi"
msgid "New note to DM:"
msgstr ""
-#: templates/web/base/auth/change_password.html:35
+#: templates/web/base/auth/change_password.html:47
msgid "New password:"
msgstr ""
@@ -2120,7 +2158,7 @@ msgstr ""
msgid "Next"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:1222
+#: perllib/FixMyStreet/Cobrand/Default.pm:1240
#: templates/web/base/admin/category_edit.html:4
#: templates/web/base/admin/list_updates.html:32
#: templates/web/base/admin/list_updates.html:34
@@ -2136,11 +2174,11 @@ msgstr ""
msgid "No"
msgstr "Nei"
-#: templates/web/base/admin/user-form.html:84
+#: templates/web/base/admin/user-form.html:80
msgid "No area"
msgstr ""
-#: templates/web/base/admin/user-form.html:55
+#: templates/web/base/admin/user-form.html:48
msgid "No body"
msgstr ""
@@ -2177,7 +2215,7 @@ msgstr ""
msgid "No reports to show on map, here are some nearby:"
msgstr ""
-#: templates/web/base/js/translation_strings.html:37
+#: templates/web/base/js/translation_strings.html:43
msgid "No result returned"
msgstr ""
@@ -2199,15 +2237,15 @@ msgstr ""
msgid "None"
msgstr "Ingen"
-#: templates/web/base/admin/user-form.html:76
-#: templates/web/base/admin/user-form.html:77
+#: templates/web/base/admin/user-form.html:72
+#: templates/web/base/admin/user-form.html:73
msgid ""
"Normal (public) users should not be associated with any <strong>area</strong>.<br>\n"
" Authorised staff users can be associated with the area in which they operate."
msgstr ""
-#: templates/web/base/admin/user-form.html:46
-#: templates/web/base/admin/user-form.html:47
+#: templates/web/base/admin/user-form.html:38
+#: templates/web/base/admin/user-form.html:39
msgid ""
"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
" Authorised staff users can be associated with the body they represent.<br>\n"
@@ -2215,8 +2253,8 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:186
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:933
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:187
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:972
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:13
msgid "Not contactable"
@@ -2275,15 +2313,15 @@ msgstr ""
msgid "Number of problems reported in each ward, in the last 7 days."
msgstr ""
-#: templates/web/base/js/translation_strings.html:43
+#: templates/web/base/js/translation_strings.html:49
msgid "OK"
msgstr ""
-#: templates/web/base/js/translation_strings.html:74
+#: templates/web/base/js/translation_strings.html:80
msgid "Offline data cleared"
msgstr ""
-#: templates/web/base/js/translation_strings.html:71
+#: templates/web/base/js/translation_strings.html:77
msgid "Offline update data saved"
msgstr ""
@@ -2299,14 +2337,14 @@ msgstr ""
msgid "On behalf of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:174
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:905
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:175
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:944
#: perllib/FixMyStreet/DB/ResultSet/State.pm:70
#: templates/web/base/admin/states/index.html:102
#: templates/web/base/admin/states/index.html:25
#: templates/web/base/admin/states/index.html:32
#: templates/web/base/admin/update_edit.html:30
-#: templates/web/base/dashboard/index.html:111
+#: templates/web/base/dashboard/index.html:112
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/update_edit.html:18
@@ -2345,17 +2383,17 @@ msgstr ""
msgid "Order"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:689
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:690
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1262
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:686
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:687
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:716
#: perllib/FixMyStreet/App/Controller/Report/New.pm:719
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:722
#: perllib/FixMyStreet/DB/Result/Problem.pm:588
#: perllib/FixMyStreet/DB/Result/Problem.pm:595
#: perllib/FixMyStreet/DB/Result/Problem.pm:610
#: perllib/FixMyStreet/DB/Result/Problem.pm:619
-#: perllib/FixMyStreet/Script/Reports.pm:182
-#: perllib/FixMyStreet/Script/Reports.pm:197
+#: perllib/FixMyStreet/Script/Reports.pm:179
+#: perllib/FixMyStreet/Script/Reports.pm:194
msgid "Other"
msgstr "Anna"
@@ -2390,23 +2428,23 @@ msgstr ""
msgid "Partial"
msgstr "Delvis"
-#: templates/web/base/auth/general.html:116
+#: templates/web/base/auth/general.html:118
#: templates/web/base/report/new/form_user_loggedout_by_email.html:38
#: templates/web/base/report/update/form_user_loggedout_by_email.html:10
-#: templates/web/zurich/auth/general.html:32
-#: templates/web/zurich/auth/general.html:63
+#: templates/web/zurich/auth/general.html:22
+#: templates/web/zurich/auth/general.html:53
msgid "Password (optional)"
msgstr ""
-#: templates/web/base/auth/general.html:81
+#: templates/web/base/auth/general.html:83
msgid "Password:"
msgstr "Passord:"
-#: templates/web/base/js/translation_strings.html:52
+#: templates/web/base/js/translation_strings.html:58
msgid "Permalink"
msgstr ""
-#: templates/web/base/admin/user-form.html:162
+#: templates/web/base/admin/user-form.html:164
msgid "Permissions:"
msgstr ""
@@ -2425,12 +2463,12 @@ msgstr ""
msgid "Phone number (optional)"
msgstr ""
-#: templates/web/base/admin/user-form.html:30
+#: templates/web/base/admin/user-form.html:25
msgid "Phone verified:"
msgstr ""
#: templates/web/base/admin/report_edit.html:135
-#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47
+#: templates/web/base/admin/user-form.html:23 templates/web/base/my/my.html:47
#: templates/web/zurich/admin/stats/index.html:39
msgid "Phone:"
msgstr "Telefon:"
@@ -2484,12 +2522,12 @@ msgid "Pick your ward"
msgstr ""
#: templates/web/base/around/display_location.html:74
-#: templates/web/base/js/translation_strings.html:30
+#: templates/web/base/js/translation_strings.html:36
msgid "Place pin on map"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:945
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:951
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:984
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:990
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
@@ -2500,8 +2538,8 @@ msgstr "Planlagt"
msgid "Please be polite, concise and to the point."
msgstr "Ver høfleg, poengtert og kortfatta."
-#: templates/web/base/auth/change_password.html:22
-#: templates/web/base/auth/change_password.html:27
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:31
msgid "Please check the passwords and try again"
msgstr "Ver venleg og sjekk passorda og prøv igjen"
@@ -2509,13 +2547,12 @@ msgstr "Ver venleg og sjekk passorda og prøv igjen"
#: templates/web/base/auth/_username_error.html:9
#: templates/web/base/auth/change_email.html:24
#: templates/web/base/auth/change_email.html:27
-#: templates/web/zurich/auth/general.html:3
-#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1334
-#: perllib/FixMyStreet/DB/Result/User.pm:198
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1327
+#: perllib/FixMyStreet/DB/Result/User.pm:205
+#: perllib/FixMyStreet/DB/Result/User.pm:206
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:7
#, fuzzy
@@ -2523,13 +2560,18 @@ 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:297
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:905
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:928
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:923
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:946
#: perllib/FixMyStreet/DB/Result/Problem.pm:383
-#: templates/web/base/js/translation_strings.html:10
+#: templates/web/base/js/translation_strings.html:13
msgid "Please choose a category"
msgstr "Vel ein kategori"
+#: perllib/FixMyStreet/App/Controller/Auth.pm:383
+#: perllib/FixMyStreet/App/Controller/Auth.pm:409
+msgid "Please choose a less commonly-used password"
+msgstr ""
+
#: perllib/FixMyStreet/App/Controller/Admin.pm:345
#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11
#: templates/web/base/admin/template_edit.html:13
@@ -2549,20 +2591,21 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:298
#: perllib/FixMyStreet/DB/Result/Comment.pm:128
-#: templates/web/base/js/translation_strings.html:3
+#: 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:1332
-#: perllib/FixMyStreet/DB/Result/User.pm:200
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1325
+#: perllib/FixMyStreet/DB/Result/User.pm:208
+#: perllib/FixMyStreet/DB/Result/User.pm:209
#: templates/web/base/auth/_username_error.html:1
#: templates/web/base/auth/_username_error.html:4
#, fuzzy
msgid "Please enter a mobile number"
msgstr "Ver venleg og skriv ei melding"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1365
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1461
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1358
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1462
msgid "Please enter a name"
msgstr ""
@@ -2570,53 +2613,51 @@ msgstr ""
msgid "Please enter a name for this body"
msgstr ""
-#: templates/web/base/auth/change_password.html:22
-#: templates/web/base/auth/change_password.html:25
-#: templates/web/base/js/translation_strings.html:20
+#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:29
+#: templates/web/base/js/translation_strings.html:23
msgid "Please enter a password"
msgstr "Skriv inn eit passord"
#: perllib/FixMyStreet/App/Controller/Contact.pm:115
#: perllib/FixMyStreet/DB/Result/Problem.pm:366
-#: templates/web/base/js/translation_strings.html:4
+#: 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:1362
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1452
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1355
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1453
#: perllib/FixMyStreet/App/Controller/Admin.pm:311
-#: perllib/FixMyStreet/DB/Result/User.pm:193
-#: templates/web/base/js/translation_strings.html:13
-#: templates/web/base/js/translation_strings.html:17
+#: perllib/FixMyStreet/DB/Result/User.pm:198
+#: templates/web/base/js/translation_strings.html:16
+#: templates/web/base/js/translation_strings.html:20
msgid "Please enter a valid email"
msgstr "Ver venleg og legg til ein gyldig e-post"
-#: perllib/FixMyStreet/App/Controller/Alert.pm:350
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "Please enter a valid email address"
msgstr "Ver venleg og legg inn e-postadressa di"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1356
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1446
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1349
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1447
#, 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:5
+#: templates/web/base/js/translation_strings.html:8
msgid "Please enter some details"
msgstr "Ver venleg og legg inn opplysningar om problemet"
#: perllib/FixMyStreet/App/Controller/Contact.pm:114
-#: perllib/FixMyStreet/DB/Result/User.pm:191
+#: perllib/FixMyStreet/DB/Result/User.pm:196
#: templates/web/base/auth/_username_error.html:1
#: 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:12
-#: templates/web/base/js/translation_strings.html:16
-#: templates/web/zurich/auth/general.html:3
-#: templates/web/zurich/auth/general.html:8
+#: templates/web/base/js/translation_strings.html:15
+#: templates/web/base/js/translation_strings.html:19
msgid "Please enter your email"
msgstr "Ver venleg og legg inn e-posten din"
@@ -2624,34 +2665,34 @@ msgstr "Ver venleg og legg inn e-posten din"
msgid "Please enter your email address"
msgstr ""
-#: templates/web/base/js/translation_strings.html:26
+#: templates/web/base/js/translation_strings.html:32
msgid "Please enter your first name"
msgstr ""
#: perllib/FixMyStreet/Cobrand/UK.pm:326
-#: templates/web/base/js/translation_strings.html:8
+#: templates/web/base/js/translation_strings.html:11
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:113
#: perllib/FixMyStreet/DB/Result/Comment.pm:125
#: perllib/FixMyStreet/DB/Result/Problem.pm:377
-#: perllib/FixMyStreet/DB/Result/User.pm:186
-#: templates/web/base/js/translation_strings.html:7
+#: perllib/FixMyStreet/DB/Result/User.pm:191
+#: templates/web/base/js/translation_strings.html:10
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:23
+#: templates/web/base/js/translation_strings.html:29
msgid "Please enter your phone number"
msgstr ""
-#: templates/web/base/js/translation_strings.html:27
+#: templates/web/base/js/translation_strings.html:33
msgid "Please enter your second name"
msgstr ""
-#: templates/web/base/js/translation_strings.html:25
+#: templates/web/base/js/translation_strings.html:31
msgid "Please enter your title"
msgstr ""
@@ -2676,10 +2717,19 @@ msgstr ""
"Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n"
"og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar."
+#: templates/web/base/auth/2faform.html:9
+msgid "Please generate a two-factor code and enter it below:"
+msgstr ""
+
#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
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:406
+#: templates/web/base/js/translation_strings.html:26
+msgid "Please make sure your password is at least %d characters long"
+msgstr ""
+
#: templates/web/base/report/updates-sidebar-notes.html:2
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -2743,12 +2793,12 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje"
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:122
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:156
#: perllib/FixMyStreet/App/Model/PhotoSet.pm:158
-#: templates/web/base/js/translation_strings.html:60
+#: templates/web/base/js/translation_strings.html:66
msgid "Please upload an image only"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1359
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1449
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1352
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1450
msgid "Please verify at least one of email/phone"
msgstr ""
@@ -2761,24 +2811,24 @@ msgid "Please write your update here"
msgstr ""
#: templates/web/base/report/update-form.html:25
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:18
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:21
#: templates/web/base/report/update/form_user_loggedout_password.html:10
msgid "Post"
msgstr "Send inn"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:231
+#: perllib/FixMyStreet/DB/Result/Comment.pm:211
msgid "Posted anonymously at %s"
msgstr "Publisert anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:266
+#: perllib/FixMyStreet/DB/Result/Comment.pm:246
msgid "Posted by %s at %s"
msgstr "Sendt inn av %s %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:254
+#: perllib/FixMyStreet/DB/Result/Comment.pm:234
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr "Lagt inn av <strong>%s</strong> (%s) %s"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:256
+#: perllib/FixMyStreet/DB/Result/Comment.pm:236
msgid "Posted by <strong>%s</strong> at %s"
msgstr "Lagt inn av <strong>%s</strong> %s"
@@ -2790,7 +2840,7 @@ msgstr ""
msgid "Previous"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:648
+#: perllib/FixMyStreet/Cobrand/Default.pm:666
msgid "Priorities"
msgstr ""
@@ -2811,7 +2861,7 @@ msgstr ""
#: templates/web/base/admin/body.html:88
#: templates/web/base/admin/contact-form.html:75
-#: templates/web/base/admin/report_edit.html:142
+#: templates/web/base/admin/report_edit.html:144
msgid "Private"
msgstr ""
@@ -2841,7 +2891,7 @@ msgstr "Problem %s sendt til administrasjon %s"
msgid "Problem breakdown by state"
msgstr "Tilstandsfordeling av problem"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1309
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
msgid "Problem marked as open."
msgstr "Problem markert som ope."
@@ -2849,7 +2899,8 @@ msgstr "Problem markert som ope."
msgid "Problem state change based on survey results"
msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat"
-#: perllib/FixMyStreet/Cobrand/Default.pm:692
+#: perllib/FixMyStreet/Cobrand/ACV.pm:86
+#: perllib/FixMyStreet/Cobrand/Default.pm:710
#: templates/web/base/admin/flagged.html:10
msgid "Problems"
msgstr "Problem"
@@ -2876,7 +2927,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:821
+#: perllib/FixMyStreet/Cobrand/Default.pm:839
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137
#: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257
#: perllib/FixMyStreet/Cobrand/UK.pm:269
@@ -2912,12 +2963,12 @@ msgstr "Bidra med ei oppdatering"
msgid "Provide update as"
msgstr ""
-#: templates/web/base/auth/general.html:119
+#: 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/new/form_user_loggedout_by_email.html:41
-#: templates/web/base/report/update/form_user_loggedout_by_email.html:13
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:43
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:16
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"
@@ -2934,7 +2985,7 @@ msgstr ""
msgid "Public update:"
msgstr ""
-#: templates/web/zurich/admin/report_edit.html:123
+#: templates/web/zurich/admin/report_edit.html:122
#: templates/web/zurich/admin/stats/index.html:38
msgid "Publish photo"
msgstr ""
@@ -2990,7 +3041,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:822
+#: perllib/FixMyStreet/Cobrand/Default.pm:840
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136
#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "RSS feed of problems within %s"
@@ -3042,6 +3093,10 @@ msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som
msgid "Remove"
msgstr "Fjern flagg"
+#: templates/web/base/admin/user-form.html:198
+msgid "Remove account details"
+msgstr ""
+
#: templates/web/base/admin/extra-metadata-form.html:4
#, fuzzy
msgid "Remove field"
@@ -3063,13 +3118,13 @@ msgstr ""
msgid "Remove from site"
msgstr ""
-#: templates/web/base/admin/report_edit.html:159
+#: templates/web/base/admin/report_edit.html:161
#: templates/web/base/admin/update_edit.html:71
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Fjern bilete (kan ikkje gjerast om!)"
-#: templates/web/base/auth/generate_token.html:33
+#: templates/web/base/auth/generate_token.html:52
msgid "Replace token"
msgstr ""
@@ -3101,11 +3156,11 @@ msgstr ""
msgid "Report as"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Rss.pm:302
+#: perllib/FixMyStreet/App/Controller/Rss.pm:303
msgid "Report on %s"
msgstr "Rapport på %s"
-#: templates/web/base/dashboard/index.html:61
+#: templates/web/base/dashboard/index.html:62
msgid "Report state:"
msgstr ""
@@ -3175,15 +3230,16 @@ msgstr ""
#: templates/web/base/around/index.html:3
#: templates/web/base/around/lookup_by_ref.html:3
-#: templates/web/base/js/translation_strings.html:42
+#: templates/web/base/js/translation_strings.html:48
#: 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
msgid "Reporting a problem"
msgstr "Legger til eit problem"
-#: perllib/FixMyStreet/Cobrand/Default.pm:638
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:388
+#: perllib/FixMyStreet/Cobrand/ACV.pm:265
+#: perllib/FixMyStreet/Cobrand/Default.pm:656
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:415
#: templates/web/zurich/header.html:46
msgid "Reports"
msgstr ""
@@ -3201,7 +3257,7 @@ msgstr ""
msgid "Reports by destination"
msgstr "Publisert av %s %s"
-#: templates/web/base/admin/user-form.html:125
+#: templates/web/base/admin/user-form.html:124
msgid "Reports made by trusted users will be sent to the responsible body without being inspected first."
msgstr ""
@@ -3213,7 +3269,7 @@ msgstr ""
msgid "Reports published"
msgstr ""
-#: templates/web/base/js/translation_strings.html:75
+#: templates/web/base/js/translation_strings.html:81
msgid "Reports saved offline."
msgstr ""
@@ -3287,8 +3343,8 @@ msgstr ""
msgid "Revert to original title"
msgstr ""
-#: templates/web/base/js/translation_strings.html:28
-#: templates/web/base/js/translation_strings.html:40
+#: templates/web/base/js/translation_strings.html:34
+#: templates/web/base/js/translation_strings.html:46
msgid "Right place?"
msgstr ""
@@ -3302,16 +3358,16 @@ 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:1875
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1879
-#: templates/web/base/admin/report_edit.html:156
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1928
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1932
+#: templates/web/base/admin/report_edit.html:158
#: templates/web/base/admin/update_edit.html:68
#: templates/web/zurich/admin/report_edit.html:118
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1875
-#: templates/web/base/admin/report_edit.html:157
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1928
+#: templates/web/base/admin/report_edit.html:159
#: templates/web/base/admin/update_edit.html:69
#: templates/web/zurich/admin/report_edit.html:119
msgid "Rotate Right"
@@ -3321,7 +3377,7 @@ msgstr ""
msgid "Rotating this photo will discard unsaved changes to the report."
msgstr ""
-#: templates/web/base/js/translation_strings.html:47
+#: templates/web/base/js/translation_strings.html:53
#: templates/web/base/maps/google-ol.html:2
msgid "Satellite"
msgstr ""
@@ -3352,11 +3408,11 @@ 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:76
+#: templates/web/base/js/translation_strings.html:82
msgid "Saving reports offline"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132
+#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:130
msgid "Scheduled"
msgstr ""
@@ -3389,12 +3445,20 @@ msgstr ""
msgid "Searching found no users."
msgstr ""
+#: templates/web/base/auth/generate_token.html:1
+#: templates/web/base/auth/generate_token.html:2
+#: templates/web/base/auth/generate_token.html:39
+#: templates/web/base/my/my.html:65
+msgid "Security"
+msgstr ""
+
#: templates/web/base/report/new/councils_text_private.html:7
#: templates/web/base/report/new/form_user.html:5
msgid "See our privacy policy"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:703
+#: perllib/FixMyStreet/Cobrand/ACV.pm:93
+#: perllib/FixMyStreet/Cobrand/Default.pm:721
msgid "See user detail for reports created as the council"
msgstr ""
@@ -3429,7 +3493,7 @@ msgstr ""
msgid "Sending a confirmation text failed: \"%s\""
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:870
msgid "Sent report back"
msgstr ""
@@ -3446,6 +3510,12 @@ msgstr "Sendt:"
msgid "Service:"
msgstr "Teneste:"
+#: templates/web/base/auth/change_password.html:1
+#: templates/web/base/auth/change_password.html:4
+#, fuzzy
+msgid "Set password"
+msgstr "Byt passord"
+
#: templates/web/base/report/_inspect.html:47
msgid "Set to my current location"
msgstr ""
@@ -3501,7 +3571,7 @@ msgstr ""
#: templates/web/base/around/display_location.html:58
#: templates/web/base/around/display_location.html:66
-#: templates/web/base/js/translation_strings.html:54
+#: templates/web/base/js/translation_strings.html:60
msgid "Show pins"
msgstr "Vis nåler"
@@ -3513,20 +3583,20 @@ msgstr ""
msgid "Show reports in your area"
msgstr ""
-#: templates/web/base/auth/general.html:124
+#: templates/web/base/auth/general.html:129
#: templates/web/base/auth/general.html:3
-#: templates/web/base/auth/general.html:85
+#: templates/web/base/auth/general.html:87
#: templates/web/base/main_nav_items.html:6
-#: templates/web/zurich/auth/general.html:18
-#: templates/web/zurich/auth/general.html:35
+#: templates/web/zurich/auth/general.html:25
+#: templates/web/zurich/auth/general.html:8
msgid "Sign in"
msgstr "Logg inn"
-#: templates/web/base/auth/general.html:98
+#: templates/web/base/auth/general.html:100
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:96
+#: templates/web/base/auth/general.html:98
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 ""
@@ -3560,14 +3630,30 @@ msgstr "Nokre bilete av nyleg melde problem"
msgid "Some text to localize"
msgstr "Noko tekst å omsetja"
-#: perllib/FixMyStreet/Cobrand/UK.pm:80
+#: perllib/FixMyStreet/Cobrand/ACV.pm:59 perllib/FixMyStreet/Cobrand/UK.pm:80
msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer."
+#: perllib/FixMyStreet/Cobrand/ACV.pm:73
+#, fuzzy
+msgid "Sorry, that appears to be a Northern Irish postcode, which we don't cover."
+msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer."
+
+#: perllib/FixMyStreet/Cobrand/ACV.pm:65
+#, fuzzy
+msgid "Sorry, that appears to be a Scottish postcode, which we don't cover."
+msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer."
+
+#: perllib/FixMyStreet/Cobrand/ACV.pm:69
+#, fuzzy
+msgid "Sorry, that appears to be a Welsh postcode, which we don't cover."
+msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer."
+
#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8
msgid "Sorry, that wasn&rsquo;t a valid link"
msgstr ""
+#: templates/web/base/auth/2faform.html:5
#: templates/web/base/auth/smsform.html:16
msgid "Sorry, that wasn&rsquo;t the correct code"
msgstr ""
@@ -3613,15 +3699,15 @@ msgstr ""
msgid "Sort by"
msgstr ""
-#: templates/web/base/admin/user-form.html:65
+#: templates/web/base/admin/user-form.html:58
msgid "Staff users have permission to log in to the admin."
msgstr ""
-#: templates/web/base/admin/user-form.html:68
+#: templates/web/base/admin/user-form.html:62
msgid "Staff:"
msgstr ""
-#: templates/web/base/dashboard/index.html:73
+#: templates/web/base/dashboard/index.html:74
msgid "Start Date"
msgstr ""
@@ -3634,7 +3720,7 @@ msgstr ""
#: templates/web/base/admin/reports.html:16
#: templates/web/base/admin/template_edit.html:50
#: templates/web/base/admin/templates.html:8
-#: templates/web/base/dashboard/index.html:100
+#: templates/web/base/dashboard/index.html:101
#: templates/web/base/report/_inspect.html:88
#: templates/web/base/report/_item.html:96
#: templates/web/base/report/update/form_update.html:39
@@ -3657,14 +3743,15 @@ msgstr "Lagra endringar"
msgid "State:"
msgstr "Tilstand:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:628
+#: perllib/FixMyStreet/Cobrand/ACV.pm:255
+#: perllib/FixMyStreet/Cobrand/Default.pm:646
#: templates/web/base/admin/states/index.html:1
#, fuzzy
msgid "States"
msgstr "Tilstand"
-#: perllib/FixMyStreet/Cobrand/Default.pm:622
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:391
+#: perllib/FixMyStreet/Cobrand/Default.pm:640
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:418
#: templates/web/base/admin/index.html:71
#: templates/web/base/admin/stats/index.html:1
#: templates/web/base/admin/stats/state.html:1
@@ -3697,7 +3784,7 @@ msgstr ""
msgid "Subcategory"
msgstr "Kategori"
-#: perllib/FixMyStreet/Script/Reports.pm:191
+#: perllib/FixMyStreet/Script/Reports.pm:188
msgid "Subcategory: %s"
msgstr ""
@@ -3714,19 +3801,20 @@ msgstr ""
msgid "Subject:"
msgstr "Emne:"
+#: templates/web/base/auth/2faform.html:21
#: templates/web/base/auth/smsform.html:27
#: templates/web/base/questionnaire/creator_fixed.html:19
#: templates/web/base/report/new/form_user_loggedin.html:76
-#: templates/web/base/report/new/form_user_loggedout_by_email.html:46
+#: templates/web/base/report/new/form_user_loggedout_by_email.html:48
#: templates/web/base/report/new/form_user_loggedout_password.html:11
#: templates/web/zurich/report/new/fill_in_details_form.html:73
msgid "Submit"
msgstr "Send inn"
-#: templates/web/base/admin/report_edit.html:167
+#: templates/web/base/admin/report_edit.html:169
#: templates/web/base/admin/report_edit.html:24
#: templates/web/base/admin/update_edit.html:79
-#: templates/web/base/admin/user-form.html:188
+#: templates/web/base/admin/user-form.html:191
#: templates/web/zurich/admin/report_edit-sdm.html:124
#: templates/web/zurich/admin/report_edit.html:264
#: templates/web/zurich/admin/update_edit.html:38
@@ -3737,8 +3825,8 @@ msgstr "Send inn endringar"
msgid "Submit questionnaire"
msgstr "Send inn spørjeskjema"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:169
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:898
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:170
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:937
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
@@ -3768,8 +3856,9 @@ msgstr ""
msgid "Summarise your changes"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:620
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:387
+#: perllib/FixMyStreet/Cobrand/ACV.pm:249
+#: perllib/FixMyStreet/Cobrand/Default.pm:638
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:414
#: 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
@@ -3781,7 +3870,7 @@ msgid "Summary"
msgstr "Oppsummering"
#: templates/web/zurich/reports/index.html:0
-#: templates/web/zurich/reports/index.html:5
+#: templates/web/zurich/reports/index.html:6
msgid "Summary reports"
msgstr "Oppsummeringsrapportar"
@@ -3795,7 +3884,7 @@ msgstr "Oppsummeringsrapportar"
msgid "Superuser:"
msgstr ""
-#: templates/web/base/admin/user-form.html:148
+#: templates/web/base/admin/user-form.html:147
msgid "Superusers have permission to perform <strong>all actions</strong> within the admin."
msgstr ""
@@ -3808,8 +3897,8 @@ msgstr "Resultat frå spørjeundersøkinga"
msgid "Template &laquo;%s&raquo;"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:644
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:398
+#: perllib/FixMyStreet/Cobrand/Default.pm:662
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:425
#: templates/web/zurich/header.html:63
msgid "Templates"
msgstr ""
@@ -3873,6 +3962,7 @@ msgstr ""
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
+#: perllib/FixMyStreet/Cobrand/ACV.pm:52
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:45
#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:50
#: perllib/FixMyStreet/Cobrand/UK.pm:73
@@ -3895,6 +3985,23 @@ msgstr ""
msgid "That report has been removed from FixMyStreet."
msgstr "Den rapporten har vorte fjerna frå FiksGataMi."
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1769
+#, fuzzy
+msgid "That user has been logged out."
+msgstr "Den rapporten har vorte fjerna frå FiksGataMi."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1776
+msgid "That user has been made anonymous on all reports and updates."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1812
+msgid "That user’s personal details have been removed."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1790
+msgid "That user’s reports and updates have been hidden."
+msgstr ""
+
#: templates/web/base/admin/contact-form.html:27
msgid ""
"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
@@ -3950,7 +4057,7 @@ msgid "The diligency prize league table shows editors' activity (who's been edit
msgstr ""
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43
-#: perllib/FixMyStreet/App/Controller/Reports.pm:85
+#: perllib/FixMyStreet/App/Controller/Reports.pm:84
msgid "The error was: %s"
msgstr "Feilen var: %s"
@@ -4004,8 +4111,8 @@ msgstr ""
msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value."
msgstr ""
-#: templates/web/base/auth/change_password.html:22
#: templates/web/base/auth/change_password.html:26
+#: templates/web/base/auth/change_password.html:30
msgid "The passwords do not match"
msgstr "Passorda er ikkje like"
@@ -4017,7 +4124,7 @@ msgstr "Fann ikkje URL-en «%s» på denne tenaren"
msgid "The type of input field to show to the user. <strong>Text</strong> is a simple text field, <strong>List</strong> is a drop-down selection."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:95
+#: perllib/FixMyStreet/Script/Reports.pm:96
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"
@@ -4028,7 +4135,7 @@ msgid ""
" Names are not necessarily unique."
msgstr ""
-#: templates/web/base/around/on_map_list_items.html:17
+#: templates/web/base/around/on_map_list_items.html:20
#: templates/web/base/my/_problem-list.html:8
#: templates/web/base/reports/_problem-list.html:13
msgid "There are no reports to show."
@@ -4038,7 +4145,7 @@ msgstr ""
msgid "There is already an auto-response template for this category/state."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Reports.pm:82
+#: perllib/FixMyStreet/App/Controller/Reports.pm:81
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare."
@@ -4047,18 +4154,18 @@ msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Alert.pm:359
+#: perllib/FixMyStreet/App/Controller/Alert.pm:364
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:806
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:815
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:142
#: templates/web/base/auth/general.html:51
-#: templates/web/zurich/auth/general.html:28
+#: templates/web/zurich/auth/general.html:18
msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the &lsquo;No&rsquo; section of the form."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:348
msgid "There was a problem with your update. Please try again."
msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen."
@@ -4066,7 +4173,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen."
msgid "There were problems with your report. Please see below."
msgstr "Det var problem med rapporten din. Ver venleg og sjå under."
-#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:389
msgid "There were problems with your update. Please see below."
msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under."
@@ -4121,18 +4228,18 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:198
+#: perllib/FixMyStreet/Script/Reports.pm:195
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt."
-#: perllib/FixMyStreet/Script/Reports.pm:201
+#: perllib/FixMyStreet/Script/Reports.pm:198
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:1003
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:942
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:986
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1004
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1021
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1067
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:960
#: perllib/FixMyStreet/Cobrand/UK.pm:45
msgid "This information is required"
msgstr "Denne informasjonen er påkravd"
@@ -4169,9 +4276,9 @@ msgstr ""
msgid "This report is a duplicate. Please leave updates on the original report:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:166
#: perllib/FixMyStreet/Cobrand/Zurich.pm:167
-#: templates/web/zurich/report/_main.html:14
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:168
+#: templates/web/zurich/report/_main.html:12
msgid "This report is awaiting moderation."
msgstr ""
@@ -4187,11 +4294,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."
-#: perllib/FixMyStreet/Script/Reports.pm:108
-msgid "This report was submitted anonymously"
-msgstr ""
-
-#: perllib/FixMyStreet/Script/Reports.pm:88
+#: perllib/FixMyStreet/Script/Reports.pm:89
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren."
@@ -4202,7 +4305,8 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar
msgid "Time spent (in minutes):"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:621
+#: perllib/FixMyStreet/Cobrand/ACV.pm:250
+#: perllib/FixMyStreet/Cobrand/Default.pm:639
#: templates/web/base/admin/timeline.html:1
msgid "Timeline"
msgstr "Tidslinje"
@@ -4240,7 +4344,7 @@ msgstr ""
msgid "To limit this collection of fields to a single language, select it here."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:94
+#: perllib/FixMyStreet/Script/Reports.pm:95
msgid "To view a map of the precise location of this issue"
msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
@@ -4262,9 +4366,9 @@ msgstr ""
#: templates/web/base/admin/stats/fix_rate.html:4
#: templates/web/base/admin/stats/questionnaire.html:24
-#: templates/web/base/dashboard/index.html:114
-#: templates/web/base/dashboard/index.html:119
-#: templates/web/base/dashboard/index.html:143
+#: templates/web/base/dashboard/index.html:115
+#: templates/web/base/dashboard/index.html:120
+#: templates/web/base/dashboard/index.html:144
#: templates/web/zurich/admin/stats/index.html:30
msgid "Total"
msgstr "Totalt"
@@ -4282,20 +4386,22 @@ msgstr ""
msgid "Translations"
msgstr ""
-#: templates/web/base/admin/user-form.html:129
+#: templates/web/base/admin/user-form.html:128
msgid "Trusted by bodies:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:709
+#: perllib/FixMyStreet/Cobrand/ACV.pm:99
+#: perllib/FixMyStreet/Cobrand/Default.pm:727
msgid "Trusted to make reports that don't need to be inspected"
msgstr ""
-#: templates/web/base/admin/user-form.html:137
+#: templates/web/base/admin/user-form.html:136
msgid "Trusted:"
msgstr ""
+#: templates/web/base/auth/2faform.html:6
#: templates/web/base/auth/smsform.html:17
-#: templates/web/base/js/translation_strings.html:29
+#: templates/web/base/js/translation_strings.html:35
msgid "Try again"
msgstr ""
@@ -4303,13 +4409,21 @@ msgstr ""
msgid "Try emailing us directly:"
msgstr ""
+#: templates/web/base/auth/generate_token.html:21
+msgid "Two-factor authentication has been activated"
+msgstr ""
+
+#: templates/web/base/auth/generate_token.html:32
+msgid "Two-factor authentication has been deactivated"
+msgstr ""
+
#: templates/web/base/admin/extra-metadata-form.html:44
#: templates/web/base/admin/states/index.html:10
#: templates/web/base/admin/states/index.html:100
msgid "Type"
msgstr ""
-#: templates/web/base/admin/user-form.html:38
+#: templates/web/base/admin/user-form.html:30
msgid "Unban"
msgstr ""
@@ -4332,7 +4446,7 @@ msgstr "Ukjend varsel-type"
#: perllib/FixMyStreet/App/Controller/Photo.pm:109
#: perllib/FixMyStreet/App/Controller/Root.pm:141
-#: templates/web/base/js/translation_strings.html:38
+#: templates/web/base/js/translation_strings.html:44
msgid "Unknown error"
msgstr ""
@@ -4404,23 +4518,23 @@ msgstr "Oppdater tilstanden"
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:260
+#: perllib/FixMyStreet/DB/Result/Comment.pm:240
#, 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:262
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
#, fuzzy
msgid "Updated by <strong>%s</strong> at %s"
msgstr "Lagt inn av <strong>%s</strong> %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1299
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1398
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1591
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1277
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1391
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1592
#: perllib/FixMyStreet/App/Controller/Admin.pm:933
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:767
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:792
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:862
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:806
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:831
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:901
msgid "Updated!"
msgstr "Oppdatert!"
@@ -4472,33 +4586,33 @@ msgstr ""
msgid "User ID to attribute fetched comments to"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1745
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1755
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1746
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1756
#, fuzzy
msgid "User added to abuse list"
msgstr "E-post lagd til misbrukliste"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1376
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1473
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1369
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1474
msgid "User already exists"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1742
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1752
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1743
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1753
#, fuzzy
msgid "User already in abuse list"
msgstr "E-post allereie i misbruklista"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1834
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1887
msgid "User flag removed"
msgstr "Brukarflagg fjerna"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1858
msgid "User flagged"
msgstr "Brukar flagga"
#: templates/web/base/admin/report_blocks.html:18
-#: templates/web/base/admin/user-form.html:38
+#: templates/web/base/admin/user-form.html:30
#: templates/web/base/admin/users.html:32
#, fuzzy
msgid "User in abuse table"
@@ -4514,14 +4628,16 @@ msgstr ""
msgid "User:"
msgstr "Brukarar"
-#: perllib/FixMyStreet/Cobrand/Default.pm:652
-#: perllib/FixMyStreet/Cobrand/Default.pm:711
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:403
+#: perllib/FixMyStreet/Cobrand/ACV.pm:101
+#: perllib/FixMyStreet/Cobrand/ACV.pm:271
+#: perllib/FixMyStreet/Cobrand/Default.pm:670
+#: perllib/FixMyStreet/Cobrand/Default.pm:729
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:430
#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55
msgid "Users"
msgstr "Brukarar"
-#: templates/web/base/admin/user-form.html:159
+#: templates/web/base/admin/user-form.html:161
msgid "Users can perform the following actions within their assigned body or area."
msgstr ""
@@ -4595,7 +4711,7 @@ msgstr ""
msgid "We need your email address, please give it below."
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:207
+#: perllib/FixMyStreet/Script/Reports.pm:204
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss."
@@ -4618,7 +4734,7 @@ msgstr ""
msgid "We&rsquo;re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?"
msgstr ""
-#: templates/web/base/dashboard/index.html:117
+#: templates/web/base/dashboard/index.html:118
msgid "Website"
msgstr ""
@@ -4651,7 +4767,7 @@ msgstr ""
msgid "Which report is it a duplicate of?"
msgstr ""
-#: templates/web/base/js/translation_strings.html:57
+#: templates/web/base/js/translation_strings.html:63
msgid "Whoa there Testino! Three photos are enough."
msgstr ""
@@ -4659,8 +4775,8 @@ msgstr ""
msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:190
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:928
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:967
#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:14
msgid "Wish"
@@ -4670,7 +4786,7 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a href=\"%s\">MaPit</a>."
-#: templates/web/base/dashboard/index.html:158
+#: templates/web/base/dashboard/index.html:159
msgid "Within the specified timeframe:"
msgstr ""
@@ -4690,7 +4806,7 @@ msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å
msgid "Wrong location? Just click again on the map."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:1221
+#: perllib/FixMyStreet/Cobrand/Default.pm:1239
#: templates/web/base/admin/bodies.html:70
#: templates/web/base/admin/category_edit.html:5
#: templates/web/base/admin/flagged.html:47
@@ -4718,7 +4834,7 @@ msgstr ""
msgid "You are complaining that this problem report was unnecessarily moderated:"
msgstr ""
-#: templates/web/base/js/translation_strings.html:77
+#: templates/web/base/js/translation_strings.html:83
msgid "You are offline"
msgstr ""
@@ -4735,7 +4851,7 @@ msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personl
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
-#: templates/web/base/admin/user-form.html:114
+#: templates/web/base/admin/user-form.html:110
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
@@ -4765,11 +4881,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:35
+#: templates/web/base/js/translation_strings.html:41
msgid "You declined; please fill in the box above"
msgstr ""
-#: templates/web/base/js/translation_strings.html:79
+#: templates/web/base/js/translation_strings.html:85
msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
msgstr ""
@@ -4796,11 +4912,11 @@ msgstr "Du er allereie logga ut"
msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:142
msgid "You have successfully added your phone number."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:158
#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
@@ -4810,7 +4926,7 @@ msgstr ""
msgid "You have successfully confirmed your phone number."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:129
msgid "You have successfully removed your phone number."
msgstr ""
@@ -4819,7 +4935,7 @@ msgstr ""
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:"
-#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:164
msgid "You have successfully verified your phone number."
msgstr ""
@@ -4846,8 +4962,10 @@ msgstr ""
msgid "Your Reports"
msgstr "Rapportane dine"
-#: templates/web/base/auth/change_password.html:11
+#: templates/web/base/auth/change_password.html:13
#: templates/web/base/auth/generate_token.html:15
+#: templates/web/base/auth/generate_token.html:26
+#: templates/web/base/auth/generate_token.html:34
#: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18
msgid "Your account"
msgstr ""
@@ -4865,8 +4983,8 @@ msgid "Your email"
msgstr ""
#: templates/web/base/auth/change_email.html:15
-#: templates/web/zurich/auth/general.html:30
-#: templates/web/zurich/auth/general.html:58
+#: templates/web/zurich/auth/general.html:20
+#: templates/web/zurich/auth/general.html:48
msgid "Your email address"
msgstr ""
@@ -4880,11 +4998,11 @@ 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:114
+#: templates/web/base/auth/general.html:116
#: templates/web/base/contact/index.html:74
#: templates/web/base/report/new/form_user_loggedout_by_email.html:21
#: templates/web/base/report/update/form_name.html:33
-#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/auth/general.html:51
#: templates/web/zurich/report/new/fill_in_details_form.html:63
msgid "Your name"
msgstr ""
@@ -4901,21 +5019,29 @@ msgstr ""
msgid "Your name has been hidden."
msgstr ""
-#: templates/web/base/js/translation_strings.html:69
+#: templates/web/base/js/translation_strings.html:75
msgid "Your offline reports"
msgstr ""
-#: templates/web/base/auth/general.html:84
+#: templates/web/base/auth/general.html:86
#: templates/web/base/report/new/form_user_loggedout_password.html:10
#: templates/web/base/report/update/form_user_loggedout_password.html:9
-#: templates/web/zurich/auth/general.html:34
+#: templates/web/zurich/auth/general.html:24
msgid "Your password"
msgstr ""
-#: templates/web/base/auth/change_password.html:10
+#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:170
+#: templates/web/base/auth/change_password.html:12
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:52
+#: templates/web/base/report/update/form_user_loggedout_by_email.html:25
+#: templates/web/zurich/auth/general.html:63
+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/zurich/report/new/fill_in_details_form.html:69
@@ -4940,7 +5066,7 @@ msgstr ""
msgid "Your token has been generated"
msgstr "Passordet ditt har vorte endra"
-#: templates/web/base/js/translation_strings.html:70
+#: templates/web/base/js/translation_strings.html:76
msgid "Your update has been saved offline for submission when back online."
msgstr ""
@@ -4958,17 +5084,17 @@ msgid "Yourself"
msgstr ""
#: templates/web/base/admin/category-checkboxes.html:7
-#: templates/web/base/admin/user-form.html:169
+#: templates/web/base/admin/user-form.html:171
msgid "all"
msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:909
#: perllib/FixMyStreet/App/Controller/Moderate.pm:85
-#: perllib/FixMyStreet/DB/Result/Comment.pm:236
+#: perllib/FixMyStreet/DB/Result/Comment.pm:216
msgid "an administrator"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:270
+#: perllib/FixMyStreet/DB/Result/Comment.pm:250
msgid "and a defect raised"
msgstr ""
@@ -5001,7 +5127,7 @@ msgid "from %s different users"
msgstr "frå %s ulike brukarar"
#: templates/web/base/report/_item.html:63
-#: templates/web/zurich/report/_item.html:14
+#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
@@ -5016,7 +5142,7 @@ msgid "n/a"
msgstr "i/t"
#: templates/web/base/admin/category-checkboxes.html:8
-#: templates/web/base/admin/user-form.html:170
+#: templates/web/base/admin/user-form.html:172
msgid "none"
msgstr ""
@@ -5066,7 +5192,7 @@ msgstr ""
msgid "this location"
msgstr "Ser på ein stad"
-#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:180
msgid "this type of local problem"
msgstr "denne typen lokalt problem"
@@ -5074,11 +5200,11 @@ msgstr "denne typen lokalt problem"
msgid "today"
msgstr "i dag"
-#: templates/web/base/js/translation_strings.html:80
+#: templates/web/base/js/translation_strings.html:86
msgid "update"
msgstr ""
-#: templates/web/base/js/translation_strings.html:81
+#: templates/web/base/js/translation_strings.html:87
msgid "updates"
msgstr ""
@@ -5094,12 +5220,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:1778
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1831
#, fuzzy
msgid "user not in abuse list"
msgstr "E-post allereie i misbruklista"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1776
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1829
#, fuzzy
msgid "user removed from abuse list"
msgstr "E-post lagd til misbrukliste"
@@ -5165,7 +5291,7 @@ msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: templates/web/fixmystreet.com/reports/summary.html:103
+#: templates/web/fixmystreet.com/reports/summary.html:104
#, perl-format
msgid "%s day"
msgid_plural "%s days"