aboutsummaryrefslogtreecommitdiffstats
path: root/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
diff options
context:
space:
mode:
Diffstat (limited to 'locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po')
-rw-r--r--locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po844
1 files changed, 486 insertions, 358 deletions
diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
index f6cbb95ed..12f9df1cf 100644
--- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/ca_ES.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: Josep Lluís - LliureTIC <joseplluis@lliuretic.cat>, 2017\n"
"Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\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 "i"
@@ -87,8 +87,8 @@ msgstr ""
msgid "%s live updates"
msgstr ""
-#: 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 "(sense número de telèfon)"
msgid "(a-z and space only)"
msgstr ""
-#: templates/web/zurich/report/_item.html:19
+#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(tancat)"
@@ -130,7 +130,7 @@ msgstr "(tancat)"
msgid "(covers roughly 200,000 people)"
msgstr ""
-#: templates/web/zurich/report/_item.html:17
+#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(corregit)"
@@ -150,6 +150,7 @@ msgstr ""
msgid "(not sent to council)"
msgstr ""
+#: templates/web/base/report/new/form_user_loggedin.html:38
#: templates/web/zurich/report/new/fill_in_details_form.html:59
msgid "(optional)"
msgstr "(opcional)"
@@ -164,7 +165,7 @@ msgid "(we also have RSS feeds for problems within %s)"
msgstr ""
#: 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 "-- Tria una categoria --"
@@ -194,7 +195,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 "<span>%s</span> desat."
@@ -219,12 +220,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 ""
@@ -236,12 +237,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>Sí </strong> Tinc contrasenya"
+#: 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 ""
@@ -312,15 +317,18 @@ msgstr ""
msgid "Add user"
msgstr "Afegeix un usuari"
-#: perllib/FixMyStreet/Cobrand/Default.pm:718
+#: perllib/FixMyStreet/Cobrand/ACV.pm:108
+#: perllib/FixMyStreet/Cobrand/Default.pm:736
msgid "Add/edit problem categories"
msgstr "Afegeix/edita categories de problemes"
-#: perllib/FixMyStreet/Cobrand/Default.pm:720
+#: perllib/FixMyStreet/Cobrand/ACV.pm:110
+#: perllib/FixMyStreet/Cobrand/Default.pm:738
msgid "Add/edit response priorities"
msgstr "Afegeix/edita prioritats de resposta"
-#: perllib/FixMyStreet/Cobrand/Default.pm:719
+#: perllib/FixMyStreet/Cobrand/ACV.pm:109
+#: perllib/FixMyStreet/Cobrand/Default.pm:737
msgid "Add/edit response templates"
msgstr "Afegeix/edita plantilles de resposta"
@@ -336,7 +344,7 @@ msgstr ""
msgid "Admin"
msgstr "Admin"
-#: templates/web/base/auth/change_password.html:39
+#: templates/web/base/auth/change_password.html:51
msgid "Again:"
msgstr ""
@@ -355,12 +363,12 @@ msgstr "Avisa'm de futures actualitzacions"
#: 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 "Tot"
-#: templates/web/zurich/reports/index.html:13
+#: templates/web/zurich/reports/index.html:14
msgid "All Reports"
msgstr "Tots els informes"
@@ -429,13 +437,13 @@ msgstr "Anònim"
msgid "Another user"
msgstr "Un altre usuari"
-#: 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 "Estàs segur de voler cancel·lar aquesta càrrega?"
#: 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 "Estàs segur?"
@@ -446,7 +454,7 @@ msgstr "Estàs segur?"
msgid "Area covered"
msgstr "Àrea coberta"
-#: templates/web/base/admin/user-form.html:82
+#: templates/web/base/admin/user-form.html:78
msgid "Area:"
msgstr "Àrea:"
@@ -472,11 +480,12 @@ msgstr "Assigna a un cos extern:"
msgid "Assign to subdivision:"
msgstr "Assigna a subdivisió:"
-#: perllib/FixMyStreet/Cobrand/Default.pm:715
+#: perllib/FixMyStreet/Cobrand/ACV.pm:105
+#: perllib/FixMyStreet/Cobrand/Default.pm:733
msgid "Assign users to areas"
msgstr "Assigna usuaris a àreas"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:219
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:220
msgid "Assigned to %s"
msgstr "Assignat a %s"
@@ -488,8 +497,8 @@ msgstr ""
msgid "At the moment only searching for and looking at reports work."
msgstr ""
-#: 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 "Esperant moderació"
-#: templates/web/base/js/translation_strings.html:31
+#: templates/web/base/js/translation_strings.html:37
msgid "Back"
msgstr "Torna"
@@ -532,9 +541,11 @@ msgstr "Torna a tots els informes"
msgid "Ban user"
msgstr "Marca l'usuari"
-#: 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 "Cossos"
msgid "Body"
msgstr "Cos"
-#: templates/web/base/admin/user-form.html:54
+#: templates/web/base/admin/user-form.html:46
msgid "Body:"
msgstr "Cos:"
@@ -564,7 +575,8 @@ msgstr ""
msgid "Can't see the map? <em>Skip this step</em>"
msgstr "No pots veure el mapa? <em>Salta aquest pas</em>"
-#: 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 "Categories:"
#: 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 "Categories:"
msgid "Category"
msgstr "Categoria"
-#: templates/web/base/dashboard/index.html:102
+#: templates/web/base/dashboard/index.html:103
#, fuzzy
msgid "Category and State"
msgstr "Categoria"
@@ -614,7 +626,7 @@ msgstr ""
msgid "Category:"
msgstr "Categoria:"
-#: perllib/FixMyStreet/Script/Reports.pm:187
+#: perllib/FixMyStreet/Script/Reports.pm:184
msgid "Category: %s"
msgstr "Categoria: %s"
@@ -630,9 +642,7 @@ msgid "Change email address"
msgstr "Canvia l'adreça de correu electrònic"
#: 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 "Canvia la contrasenya"
@@ -668,7 +678,7 @@ msgstr ""
msgid "Choose another"
msgstr "Escull un altre"
-#: templates/web/base/js/translation_strings.html:72
+#: templates/web/base/js/translation_strings.html:78
msgid "Clear offline data"
msgstr "Neteja les dades fora de línia"
@@ -697,14 +707,14 @@ msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per e
msgid "Click the link in that email to sign in."
msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per entrar amb el teu usuari."
-#: 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
@@ -737,15 +747,17 @@ msgid "Cobrand:"
msgstr ""
#: 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 "Configuració"
@@ -754,6 +766,7 @@ msgstr "Configuració"
msgid "Confirm"
msgstr "Confirma"
+#: 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 "Confirma el compte"
@@ -803,12 +816,12 @@ msgstr "Contacta a l'equip"
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 ""
-#: templates/web/base/js/translation_strings.html:36
+#: templates/web/base/js/translation_strings.html:42
msgid "Could not look up location"
msgstr ""
@@ -853,15 +866,18 @@ msgstr "Crea una categoria"
msgid "Create priority"
msgstr "Crea una prioritat"
-#: 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 ""
@@ -882,12 +898,17 @@ msgstr "Creat"
msgid "Created:"
msgstr "Creat:"
-#: templates/web/base/auth/generate_token.html:27
+#: templates/web/base/auth/change_password.html:40
+#, fuzzy
+msgid "Current password:"
+msgstr "Nova contrasenya:"
+
+#: templates/web/base/auth/generate_token.html:46
#, fuzzy
msgid "Current token:"
msgstr "Estat actual"
-#: templates/web/base/dashboard/index.html:91
+#: templates/web/base/dashboard/index.html:92
msgid "Currently grouped by %s"
msgstr ""
@@ -896,7 +917,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 ""
@@ -908,6 +929,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 ""
@@ -958,7 +983,7 @@ msgstr "Descripció:"
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 "Detalls"
@@ -970,7 +995,7 @@ msgstr "Detalls"
msgid "Details:"
msgstr "Detalls:"
-#: templates/web/base/dashboard/index.html:103
+#: templates/web/base/dashboard/index.html:104
msgid "Device and Site"
msgstr ""
@@ -1021,7 +1046,7 @@ msgstr "No t'agraden els formularis?"
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 ""
@@ -1062,23 +1087,27 @@ msgstr "Edita"
msgid "Edit body details"
msgstr "Edita els detalls del cos"
-#: 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 "Edita la categoria d'informes"
-#: perllib/FixMyStreet/Cobrand/Default.pm:696
+#: perllib/FixMyStreet/Cobrand/Default.pm:714
msgid "Edit report priority"
msgstr "Edita la prioritat d'informes"
-#: perllib/FixMyStreet/Cobrand/Default.pm:694
+#: perllib/FixMyStreet/Cobrand/ACV.pm:88
+#: perllib/FixMyStreet/Cobrand/Default.pm:712
msgid "Edit reports"
msgstr "Edita els informes"
@@ -1111,8 +1140,8 @@ msgstr "Editor"
#: 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 "Correu electrònic"
@@ -1138,7 +1167,7 @@ msgstr "Alerta de correu electrònic creada"
msgid "Email alert deleted"
msgstr "Alerta de correu electrònic eliminada"
-#: templates/web/base/admin/user-form.html:22
+#: templates/web/base/admin/user-form.html:21
msgid "Email verified:"
msgstr ""
@@ -1149,10 +1178,6 @@ msgstr ""
msgid "Email:"
msgstr "Correu electrònic:"
-#: perllib/FixMyStreet/Script/Reports.pm:111
-msgid "Email: %s"
-msgstr "Correu electrònic: %s"
-
#: templates/web/base/admin/open311-form-fields.html:55
#: templates/web/base/admin/open311-form-fields.html:56
msgid ""
@@ -1170,7 +1195,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 "Per data"
@@ -1179,7 +1204,7 @@ msgstr "Per data"
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:81
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:82
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1198,10 +1223,10 @@ msgstr ""
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 "Entra una contrasenya"
@@ -1236,7 +1261,7 @@ msgstr "Exemples:"
msgid "Existing category"
msgstr "Categoria existent"
-#: templates/web/base/js/translation_strings.html:49
+#: templates/web/base/js/translation_strings.html:55
msgid "Expand map"
msgstr ""
@@ -1244,12 +1269,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 "Exporta com a CSV"
-#: 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"
@@ -1272,7 +1297,7 @@ msgstr "Cos extern"
msgid "External team"
msgstr "Equip extern"
-#: 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
#, fuzzy
@@ -1312,10 +1337,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 "Corregit"
@@ -1337,7 +1362,7 @@ msgstr "Marca com esborrat"
msgid "Flag user"
msgstr "Marca l'usuari"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:645
#: templates/web/base/admin/users.html:20
msgid "Flagged"
msgstr "Marcat"
@@ -1346,7 +1371,7 @@ msgstr "Marcat"
msgid "Flagged reports and users"
msgstr "Informes i usuaris marcats"
-#: 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 ""
@@ -1354,8 +1379,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 "Marcat:"
@@ -1375,17 +1400,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 "Has oblidat la teva contrasenya?"
-#: 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 ""
@@ -1395,11 +1420,7 @@ msgstr ""
msgid "Frequently Asked Questions"
msgstr "Preguntes mes freqüents (FAQ)"
-#: 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 ""
@@ -1446,7 +1467,8 @@ msgstr "Ves"
msgid "Going to send questionnaire?"
msgstr ""
-#: 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 ""
@@ -1454,11 +1476,11 @@ msgstr ""
msgid "Graph of problem creation by status over time"
msgstr ""
-#: templates/web/base/dashboard/index.html:93
+#: templates/web/base/dashboard/index.html:94
msgid "Group by %s"
msgstr ""
-#: templates/web/base/dashboard/index.html:98
+#: templates/web/base/dashboard/index.html:99
msgid "Group by:"
msgstr ""
@@ -1490,7 +1512,7 @@ msgstr ""
msgid "Hi %s"
msgstr "Hola %s"
-#: 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
@@ -1500,6 +1522,11 @@ msgstr "Hola %s"
msgid "Hidden"
msgstr "Ocultat"
+#: templates/web/base/admin/user-form.html:197
+#, fuzzy
+msgid "Hide all reports and updates"
+msgstr "Informes i usuaris marcats"
+
#: templates/web/base/report/_main.html:105
msgid "Hide entire report"
msgstr "Oculta l'informe complet"
@@ -1523,7 +1550,7 @@ msgstr "Oculta el meu nom en aquest informe"
#: 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 ""
@@ -1552,7 +1579,7 @@ msgstr "Inici"
msgid "How to report a problem"
msgstr "Com informar un problema"
-#: templates/web/base/js/translation_strings.html:32
+#: templates/web/base/js/translation_strings.html:38
msgid "How to send successful reports"
msgstr "Com enviar informes satisfactoris"
@@ -1611,7 +1638,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 ""
@@ -1685,8 +1712,8 @@ msgstr "En taula d'abús?"
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 ""
-#: 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"
@@ -1716,7 +1743,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 ""
@@ -1748,20 +1775,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 ""
@@ -1825,6 +1852,11 @@ msgstr ""
msgid "List all reported problems"
msgstr "Llista tots els problemes informats"
+#: templates/web/base/around/on_map_list_items.html:18
+#, fuzzy
+msgid "Loading reports…"
+msgstr "Edita els informes"
+
#: templates/web/base/report/new/category_wrapper.html:8
msgid "Loading..."
msgstr "Carregant..."
@@ -1863,23 +1895,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 ""
@@ -1887,7 +1927,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 "Mapa"
@@ -1895,11 +1935,11 @@ msgstr "Mapa"
msgid "Mark as sent"
msgstr "Marca com enviat"
-#: 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 ""
@@ -1927,7 +1967,8 @@ msgstr ""
msgid "Moderate"
msgstr "Modera"
-#: perllib/FixMyStreet/Cobrand/Default.pm:693
+#: perllib/FixMyStreet/Cobrand/ACV.pm:87
+#: perllib/FixMyStreet/Cobrand/Default.pm:711
msgid "Moderate report details"
msgstr "Modera detalls de l'informe"
@@ -1953,7 +1994,7 @@ msgstr ""
msgid "Moderation reason:"
msgstr "Raó de moderació:"
-#: templates/web/base/dashboard/index.html:101
+#: templates/web/base/dashboard/index.html:102
msgid "Month"
msgstr "Mes"
@@ -1975,12 +2016,12 @@ msgstr "Més comentat"
#: 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 "Nom"
@@ -1993,10 +2034,6 @@ msgstr "Nom"
msgid "Name:"
msgstr "Nom:"
-#: perllib/FixMyStreet/Script/Reports.pm:110
-msgid "Name: %s"
-msgstr "Nom: %s"
-
#: templates/web/base/report/_inspect.html:44
msgid "Navigate to this problem"
msgstr "Navega a aquest problema"
@@ -2015,8 +2052,8 @@ msgstr ""
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: 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 ""
@@ -2034,11 +2071,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
#, fuzzy
msgid "New"
msgstr "El més nou"
@@ -2068,7 +2106,7 @@ msgstr "Nous problemes locals a FixMyStreet"
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 "Nova contrasenya:"
@@ -2126,7 +2164,7 @@ msgstr "El més nou"
msgid "Next"
msgstr "Següent"
-#: 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
@@ -2142,11 +2180,11 @@ msgstr "Següent"
msgid "No"
msgstr "No"
-#: templates/web/base/admin/user-form.html:84
+#: templates/web/base/admin/user-form.html:80
msgid "No area"
msgstr "Sense àrea"
-#: templates/web/base/admin/user-form.html:55
+#: templates/web/base/admin/user-form.html:48
msgid "No body"
msgstr "Sense cos"
@@ -2183,7 +2221,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 "No s'han retornat resultats"
@@ -2205,15 +2243,15 @@ msgstr "Sense seguidors"
msgid "None"
msgstr "Cap"
-#: 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"
@@ -2221,8 +2259,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"
@@ -2281,15 +2319,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 ""
@@ -2305,14 +2343,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
@@ -2352,17 +2390,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 ""
@@ -2396,23 +2434,23 @@ msgstr ""
msgid "Partial"
msgstr ""
-#: 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 ""
-#: 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 ""
@@ -2431,12 +2469,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 ""
@@ -2490,12 +2528,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
@@ -2506,8 +2544,8 @@ msgstr ""
msgid "Please be polite, concise and to the point."
msgstr ""
-#: 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 ""
@@ -2515,26 +2553,30 @@ msgstr ""
#: 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 ""
-#: 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
msgid "Please check your phone number is correct"
msgstr ""
#: 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 ""
+#: 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
@@ -2554,19 +2596,20 @@ 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 ""
-#: 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
msgid "Please enter a mobile number"
msgstr ""
-#: 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 ""
@@ -2574,52 +2617,50 @@ 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 ""
#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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
msgid "Please enter a valid email or phone number"
msgstr ""
#: 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 ""
#: 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 ""
@@ -2627,34 +2668,34 @@ msgstr ""
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 ""
#: 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 ""
@@ -2677,10 +2718,19 @@ msgstr ""
msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
msgstr ""
+#: 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 ""
+#: 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 ""
#: 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 ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:231
+#: perllib/FixMyStreet/DB/Result/Comment.pm:211
msgid "Posted anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:266
+#: perllib/FixMyStreet/DB/Result/Comment.pm:246
msgid "Posted by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:254
+#: perllib/FixMyStreet/DB/Result/Comment.pm:234
msgid "Posted by <strong>%s</strong> (%s) at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:256
+#: perllib/FixMyStreet/DB/Result/Comment.pm:236
msgid "Posted by <strong>%s</strong> at %s"
msgstr ""
@@ -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 ""
msgid "Problem breakdown by state"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1309
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
msgid "Problem marked as open."
msgstr ""
@@ -2849,7 +2899,8 @@ msgstr ""
msgid "Problem state change based on survey results"
msgstr ""
-#: 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 ""
@@ -2874,7 +2925,7 @@ msgstr ""
msgid "Problems within %.1fkm of %s"
msgstr ""
-#: 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
@@ -2909,12 +2960,12 @@ msgstr ""
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 ""
@@ -2931,7 +2982,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 ""
@@ -2987,7 +3038,7 @@ msgstr ""
msgid "RSS feed of nearby problems"
msgstr ""
-#: 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"
@@ -3038,6 +3089,10 @@ msgstr ""
msgid "Remove"
msgstr ""
+#: templates/web/base/admin/user-form.html:198
+msgid "Remove account details"
+msgstr ""
+
#: templates/web/base/admin/extra-metadata-form.html:4
msgid "Remove field"
msgstr ""
@@ -3058,13 +3113,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 ""
-#: templates/web/base/auth/generate_token.html:33
+#: templates/web/base/auth/generate_token.html:52
msgid "Replace token"
msgstr ""
@@ -3096,11 +3151,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 ""
-#: templates/web/base/dashboard/index.html:61
+#: templates/web/base/dashboard/index.html:62
msgid "Report state:"
msgstr ""
@@ -3170,15 +3225,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 ""
-#: 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 ""
@@ -3195,7 +3251,7 @@ msgstr ""
msgid "Reports by destination"
msgstr ""
-#: 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 ""
@@ -3207,7 +3263,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 ""
@@ -3279,8 +3335,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 ""
@@ -3294,16 +3350,16 @@ msgstr ""
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: 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"
@@ -3313,7 +3369,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 ""
@@ -3344,11 +3400,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
#, fuzzy
msgid "Scheduled"
msgstr "Acció programada"
@@ -3382,12 +3438,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 ""
@@ -3422,7 +3486,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 ""
@@ -3439,6 +3503,12 @@ msgstr ""
msgid "Service:"
msgstr ""
+#: templates/web/base/auth/change_password.html:1
+#: templates/web/base/auth/change_password.html:4
+#, fuzzy
+msgid "Set password"
+msgstr "Nova contrasenya:"
+
#: templates/web/base/report/_inspect.html:47
msgid "Set to my current location"
msgstr ""
@@ -3494,7 +3564,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 ""
@@ -3506,20 +3576,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 ""
-#: 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 ""
@@ -3553,14 +3623,27 @@ msgstr ""
msgid "Some text to localize"
msgstr ""
-#: 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 ""
+#: perllib/FixMyStreet/Cobrand/ACV.pm:73
+msgid "Sorry, that appears to be a Northern Irish postcode, which we don't cover."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/ACV.pm:65
+msgid "Sorry, that appears to be a Scottish postcode, which we don't cover."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/ACV.pm:69
+msgid "Sorry, that appears to be a Welsh postcode, which we don't cover."
+msgstr ""
+
#: 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 ""
@@ -3606,15 +3689,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 ""
@@ -3627,7 +3710,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
@@ -3649,13 +3732,14 @@ msgstr ""
msgid "State:"
msgstr ""
-#: 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
msgid "States"
msgstr ""
-#: 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
@@ -3688,7 +3772,7 @@ msgstr ""
msgid "Subcategory"
msgstr "Categoria"
-#: perllib/FixMyStreet/Script/Reports.pm:191
+#: perllib/FixMyStreet/Script/Reports.pm:188
msgid "Subcategory: %s"
msgstr ""
@@ -3705,19 +3789,20 @@ msgstr ""
msgid "Subject:"
msgstr ""
+#: 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 ""
-#: 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
@@ -3728,8 +3813,8 @@ msgstr ""
msgid "Submit questionnaire"
msgstr ""
-#: 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
@@ -3758,8 +3843,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
@@ -3771,7 +3857,7 @@ msgid "Summary"
msgstr ""
#: 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 ""
@@ -3784,7 +3870,7 @@ msgstr ""
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 ""
@@ -3797,8 +3883,8 @@ msgstr ""
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 ""
@@ -3859,6 +3945,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
@@ -3881,6 +3968,22 @@ msgstr ""
msgid "That report has been removed from FixMyStreet."
msgstr ""
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1769
+msgid "That user has been logged out."
+msgstr ""
+
+#: 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"
@@ -3936,7 +4039,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 ""
@@ -3990,8 +4093,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 ""
@@ -4003,7 +4106,7 @@ msgstr ""
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 ""
@@ -4014,7 +4117,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."
@@ -4024,7 +4127,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 ""
@@ -4033,18 +4136,18 @@ msgstr ""
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 ""
-#: 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 ""
@@ -4052,7 +4155,7 @@ msgstr ""
msgid "There were problems with your report. Please see below."
msgstr ""
-#: 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 ""
@@ -4107,18 +4210,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 ""
-#: 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 ""
-#: 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 ""
@@ -4155,9 +4258,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 ""
@@ -4173,11 +4276,7 @@ msgstr ""
msgid "This report is currently marked as open."
msgstr ""
-#: 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 ""
@@ -4188,7 +4287,8 @@ msgstr ""
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 ""
@@ -4226,7 +4326,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 ""
@@ -4248,9 +4348,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 ""
@@ -4268,20 +4368,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 ""
@@ -4289,13 +4391,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 ""
@@ -4318,7 +4428,7 @@ msgstr ""
#: 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 ""
@@ -4390,22 +4500,22 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:260
+#: perllib/FixMyStreet/DB/Result/Comment.pm:240
msgid "Updated by <strong>%s</strong> (%s) at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:262
+#: perllib/FixMyStreet/DB/Result/Comment.pm:242
#, fuzzy
msgid "Updated by <strong>%s</strong> at %s"
msgstr "<strong>%s</strong> problemes actuals"
-#: 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 ""
@@ -4457,33 +4567,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 "Correu electrònic afegit a la llista d'abús"
-#: 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 "El correu electrònic ja existeix a la llista d'abús"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1834
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1887
msgid "User flag removed"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1805
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1858
msgid "User flagged"
msgstr ""
#: 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"
@@ -4498,14 +4608,16 @@ msgstr ""
msgid "User:"
msgstr ""
-#: 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 ""
-#: 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 ""
@@ -4579,7 +4691,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 ""
@@ -4601,7 +4713,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 ""
@@ -4634,7 +4746,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 ""
@@ -4642,8 +4754,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"
@@ -4653,7 +4765,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 ""
-#: templates/web/base/dashboard/index.html:158
+#: templates/web/base/dashboard/index.html:159
msgid "Within the specified timeframe:"
msgstr ""
@@ -4673,7 +4785,7 @@ msgstr ""
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
@@ -4701,7 +4813,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 ""
@@ -4718,7 +4830,7 @@ msgstr ""
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 ""
@@ -4748,11 +4860,11 @@ msgstr ""
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 ""
@@ -4779,11 +4891,11 @@ msgstr ""
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."
@@ -4793,7 +4905,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 ""
@@ -4802,7 +4914,7 @@ msgstr ""
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr ""
-#: 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 ""
@@ -4829,8 +4941,10 @@ msgstr ""
msgid "Your Reports"
msgstr ""
-#: 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 ""
@@ -4848,8 +4962,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 ""
@@ -4863,11 +4977,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 ""
@@ -4884,21 +4998,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 ""
+#: 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
@@ -4922,7 +5044,7 @@ msgstr ""
msgid "Your token has been generated"
msgstr ""
-#: 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 ""
@@ -4940,17 +5062,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 ""
@@ -4983,7 +5105,7 @@ msgid "from %s different users"
msgstr ""
#: 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 ""
@@ -4998,7 +5120,7 @@ msgid "n/a"
msgstr "n/a"
#: 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 ""
@@ -5047,7 +5169,7 @@ msgstr ""
msgid "this location"
msgstr ""
-#: perllib/FixMyStreet/Script/Reports.pm:183
+#: perllib/FixMyStreet/Script/Reports.pm:180
msgid "this type of local problem"
msgstr ""
@@ -5055,11 +5177,11 @@ msgstr ""
msgid "today"
msgstr "avui"
-#: 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 ""
@@ -5075,12 +5197,12 @@ msgstr ""
msgid "user is problem owner"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1778
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1831
#, fuzzy
msgid "user not in abuse list"
msgstr "El correu electrònic ja existeix a la llista d'abús"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1776
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1829
#, fuzzy
msgid "user removed from abuse list"
msgstr "Correu electrònic afegit a la llista d'abús"
@@ -5146,7 +5268,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"
@@ -5244,6 +5366,12 @@ msgid_plural "reports"
msgstr[0] ""
msgstr[1] ""
+#~ msgid "Email: %s"
+#~ msgstr "Correu electrònic: %s"
+
+#~ msgid "Name: %s"
+#~ msgstr "Nom: %s"
+
#~ msgid "(Email in abuse table)"
#~ msgstr "(Email en taula d'abús)"