Merge branch 'zurich'

Conflicts:
	locale/FixMyStreet.po
	locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
	locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
	locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po

1 files changed, 97 insertions, 83 deletions

diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index c790fecf6..bc9dec3a6 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-02-21 15:57+0000\n"
+"POT-Creation-Date: 2013-03-11 18:53+0000\n"
 "PO-Revision-Date: 2011-12-08 10:56+0100\n"
 "Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -512,21 +512,21 @@ msgstr "den lokale administrasjonen"
 msgid "Area covered"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:111
+#: templates/web/zurich/admin/report_edit.html:117
 #: templates/web/zurich/admin/stats.html:36
 msgid "Assign to different category:"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:120
+#: templates/web/zurich/admin/report_edit.html:126
 msgid "Assign to external body:"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:152
-#: templates/web/zurich/admin/report_edit.html:99
+#: templates/web/zurich/admin/report_edit.html:103
+#: templates/web/zurich/admin/report_edit.html:158
 msgid "Assign to subdivision:"
 msgstr ""
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:97
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:98
 #: templates/web/zurich/report/updates.html:11
 #, fuzzy
 msgid "Assigned to %s"
@@ -566,7 +566,7 @@ msgid ""
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1131
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:203
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:204
 #: templates/web/default/admin/bodies.html:1
 #: templates/web/zurich/header.html:64
 msgid "Bodies"
@@ -631,8 +631,8 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
 #: templates/web/default/report/new/fill_in_details_form.html:67
 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:50
 #: templates/web/zurich/admin/body.html:36
-#: templates/web/zurich/admin/report_edit-sdm.html:39
-#: templates/web/zurich/admin/report_edit.html:110
+#: templates/web/zurich/admin/report_edit-sdm.html:42
+#: templates/web/zurich/admin/report_edit.html:116
 msgid "Category:"
 msgstr "Kategori:"
 
@@ -652,7 +652,7 @@ msgstr "Byt passord"
 msgid "Click map to report a problem"
 msgstr "Korleis rapportera eit problem"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:74
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:75
 #: templates/web/default/admin/report_edit.html:29
 #: templates/web/default/admin/report_edit.html:31
 #: templates/web/default/dashboard/index.html:142
@@ -661,8 +661,8 @@ msgstr "Korleis rapportera eit problem"
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:10
 #: templates/web/zurich/admin/header.html:12
-#: templates/web/zurich/admin/report_edit.html:87
-#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit.html:92
 #: templates/web/zurich/admin/stats.html:31
 #: templates/web/zurich/report/banner.html:13
 msgid "Closed"
@@ -687,8 +687,8 @@ msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
 msgstr "Dei næraste problema <small>(innanfor&nbsp;%skm)</small>"
 
 #: templates/web/default/admin/report_edit.html:17
-#: templates/web/zurich/admin/report_edit-sdm.html:30
-#: templates/web/zurich/admin/report_edit.html:43
+#: templates/web/zurich/admin/report_edit-sdm.html:33
+#: templates/web/zurich/admin/report_edit.html:46
 msgid "Co-ordinates:"
 msgstr "Koordinatar:"
 
@@ -838,8 +838,8 @@ msgstr "Oppretta"
 
 #: templates/web/default/admin/report_edit.html:44
 #: templates/web/default/admin/update_edit.html:45
-#: templates/web/zurich/admin/report_edit-sdm.html:44
-#: templates/web/zurich/admin/report_edit.html:58
+#: templates/web/zurich/admin/report_edit-sdm.html:47
+#: templates/web/zurich/admin/report_edit.html:61
 #: templates/web/zurich/admin/update_edit.html:29
 msgid "Created:"
 msgstr "Oppretta:"
@@ -882,9 +882,9 @@ msgstr "Detaljar:"
 #: templates/web/default/admin/report_edit.html:14
 #: templates/web/default/report/new/fill_in_details_form.html:61
 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:79
-#: templates/web/zurich/admin/report_edit-sdm.html:22
-#: templates/web/zurich/admin/report_edit.html:22
-#: templates/web/zurich/admin/report_edit.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:25
+#: templates/web/zurich/admin/report_edit.html:25
+#: templates/web/zurich/admin/report_edit.html:35
 msgid "Details:"
 msgstr "Detaljar:"
 
@@ -998,8 +998,8 @@ msgstr "Send meg oppdateringar"
 #: templates/web/default/alert/updates.html:13
 #: templates/web/default/report/display.html:38
 #: templates/web/zurich/admin/body.html:41
-#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:54
+#: templates/web/zurich/admin/report_edit-sdm.html:44
+#: templates/web/zurich/admin/report_edit.html:57
 msgid "Email:"
 msgstr "E-post:"
 
@@ -1369,8 +1369,8 @@ msgstr ""
 #: templates/web/default/admin/update_edit.html:22
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:11
-#: templates/web/zurich/admin/report_edit.html:78
-#: templates/web/zurich/admin/report_edit.html:82
+#: templates/web/zurich/admin/report_edit.html:81
+#: templates/web/zurich/admin/report_edit.html:85
 #: templates/web/zurich/admin/stats.html:32
 #: templates/web/zurich/admin/update_edit.html:18
 msgid "Hidden"
@@ -1470,7 +1470,7 @@ msgstr ""
 "sender inn rapporten din, slik at vi kan visa administrasjonen aktiviteten i "
 "området ditt."
 
-#: templates/web/default/auth/token.html:25
+#: templates/web/default/auth/token.html:22
 #: templates/web/default/email_sent.html:9
 msgid ""
 "If you use web-based email or have 'junk mail' filters, you may wish to "
@@ -1524,13 +1524,13 @@ msgstr ""
 "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:77
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:78
 #: templates/web/default/admin/report_edit.html:29
 #: templates/web/default/admin/report_edit.html:31
 #: templates/web/fixmystreet/report/banner.html:19
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:8
-#: templates/web/zurich/admin/report_edit.html:91
+#: templates/web/zurich/admin/report_edit.html:94
 #: templates/web/zurich/report/banner.html:15
 #, fuzzy
 msgid "In progress"
@@ -1541,7 +1541,7 @@ msgstr "Under arbeid"
 msgid "Incident Category"
 msgstr "Kategori"
 
-#: templates/web/zurich/admin/report_edit.html:130
+#: templates/web/zurich/admin/report_edit.html:136
 #, fuzzy
 msgid "Include reporter personal details"
 msgstr "Ver venleg og legg inn opplysningar om problemet"
@@ -1554,8 +1554,8 @@ msgstr "Inkluder ikkje-stadfesta problem"
 msgid "Incorrect has_photo value \"%s\""
 msgstr "Feil has_photo-verdi «%s»"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:53
-#: templates/web/zurich/admin/report_edit.html:73
+#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit.html:76
 msgid "Internal notes:"
 msgstr ""
 
@@ -1757,8 +1757,8 @@ msgstr "(valfritt)"
 #: templates/web/default/admin/report_edit.html:41
 #: templates/web/default/admin/update_edit.html:26
 #: templates/web/default/admin/user-form.html:5
-#: templates/web/zurich/admin/report_edit-sdm.html:40
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:56
 #: templates/web/zurich/admin/stats.html:41
 msgid "Name:"
 msgstr "Namn:"
@@ -1893,7 +1893,7 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på reportemptyhomes.com"
 msgid "New state"
 msgstr "Ny tilstand"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit-sdm.html:59
 #, fuzzy
 msgid "New update:"
 msgstr "Siste oppdatering:"
@@ -1951,7 +1951,7 @@ msgstr "Fann ingen flagga problem"
 msgid "No flagged users found"
 msgstr "Fann ingen flagga brukarar"
 
-#: templates/web/zurich/admin/report_edit-sdm.html:62
+#: templates/web/zurich/admin/report_edit-sdm.html:65
 #, fuzzy
 msgid "No further updates"
 msgstr "Oppdateringane dine"
@@ -1980,8 +1980,8 @@ msgid "Non Public"
 msgstr ""
 
 #: templates/web/default/admin/report_edit.html:24
-#: templates/web/zurich/admin/report_edit-sdm.html:43
-#: templates/web/zurich/admin/report_edit.html:57
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:60
 msgid "None"
 msgstr "Ingen"
 
@@ -1994,7 +1994,7 @@ msgstr "Ingen"
 msgid "Not Responsible"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit-sdm.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:21
 msgid "Not for my subdivision"
 msgstr ""
 
@@ -2097,7 +2097,7 @@ msgstr "Eldre løyste"
 msgid "Older problems"
 msgstr "Eldre problem"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
 #: templates/web/bromley/report/display.html:80
 #: templates/web/default/admin/report_edit.html:29
 #: templates/web/default/admin/update_edit.html:22
@@ -2106,8 +2106,8 @@ msgstr "Eldre problem"
 #: templates/web/fixmystreet/report/update-form.html:28
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:7
-#: templates/web/zurich/admin/report_edit.html:78
-#: templates/web/zurich/admin/report_edit.html:80
+#: templates/web/zurich/admin/report_edit.html:81
+#: templates/web/zurich/admin/report_edit.html:83
 #: templates/web/zurich/admin/update_edit.html:18
 #: templates/web/zurich/report/banner.html:11
 msgid "Open"
@@ -2211,8 +2211,8 @@ msgstr "(valfritt)"
 #: templates/web/default/admin/report_edit.html:43
 #: templates/web/default/report/new/fill_in_details_form.html:215
 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
-#: templates/web/zurich/admin/report_edit-sdm.html:43
-#: templates/web/zurich/admin/report_edit.html:57
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:60
 #: templates/web/zurich/admin/stats.html:39
 msgid "Phone:"
 msgstr "Telefon:"
@@ -2251,8 +2251,8 @@ msgstr ""
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:9
 #: templates/web/zurich/admin/index-dm.html:9
-#: templates/web/zurich/admin/report_edit.html:78
 #: templates/web/zurich/admin/report_edit.html:81
+#: templates/web/zurich/admin/report_edit.html:84
 msgid "Planned"
 msgstr "Planlagt"
 
@@ -2274,7 +2274,7 @@ msgstr "Ver høfleg, poengtert og kortfatta."
 msgid "Please check the passwords and try again"
 msgstr "Ver venleg og sjekk passorda og prøv igjen"
 
-#: templates/web/default/auth/token.html:17
+#: templates/web/default/auth/token.html:14
 msgid "Please check your email"
 msgstr "Ver venleg og sjekk e-posten du oppgav"
 
@@ -2802,17 +2802,17 @@ msgstr ""
 msgid "Public information (shown on site)"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:162
-#: templates/web/zurich/admin/report_edit.html:170
+#: templates/web/zurich/admin/report_edit.html:168
+#: templates/web/zurich/admin/report_edit.html:176
 msgid "Public response:"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:69
+#: templates/web/zurich/admin/report_edit.html:72
 #: templates/web/zurich/admin/stats.html:38
 msgid "Publish photo"
 msgstr ""
 
-#: templates/web/zurich/admin/report_edit.html:178
+#: templates/web/zurich/admin/report_edit.html:184
 msgid "Publish the response"
 msgstr ""
 
@@ -3081,7 +3081,7 @@ msgid "Reporting a problem"
 msgstr "Legger til eit problem"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1132
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:196
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:197
 #: templates/web/seesomething/admin/stats.html:1
 #: templates/web/zurich/header.html:60
 #, fuzzy
@@ -3130,13 +3130,13 @@ msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s"
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1331
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1342
 #: templates/web/default/admin/report_edit.html:60
-#: templates/web/zurich/admin/report_edit.html:65
+#: templates/web/zurich/admin/report_edit.html:68
 msgid "Rotate Left"
 msgstr ""
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1331
 #: templates/web/default/admin/report_edit.html:61
-#: templates/web/zurich/admin/report_edit.html:66
+#: templates/web/zurich/admin/report_edit.html:69
 msgid "Rotate Right"
 msgstr ""
 
@@ -3361,14 +3361,14 @@ msgstr "Tilstand"
 #: templates/web/default/admin/report_edit.html:28
 #: templates/web/default/admin/update_edit.html:21
 #: templates/web/default/report/update-form.html:28
-#: templates/web/zurich/admin/report_edit-sdm.html:51
-#: templates/web/zurich/admin/report_edit.html:76
+#: templates/web/zurich/admin/report_edit-sdm.html:54
+#: templates/web/zurich/admin/report_edit.html:79
 #: templates/web/zurich/admin/update_edit.html:17
 msgid "State:"
 msgstr "Tilstand:"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1137
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:211
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:212
 #: templates/web/default/admin/stats.html:1
 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
 msgid "Stats"
@@ -3406,7 +3406,7 @@ msgstr "Emne:"
 #: templates/web/default/contact/index.html:83
 #: templates/web/default/report/new/fill_in_details_form.html:52
 #: templates/web/emptyhomes/report/new/fill_in_details_form.html:70
-#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:34
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -3429,8 +3429,8 @@ msgstr "Send inn"
 #: templates/web/default/admin/report_edit.html:67
 #: templates/web/default/admin/update_edit.html:54
 #: templates/web/default/admin/user-form.html:17
-#: templates/web/zurich/admin/report_edit-sdm.html:61
-#: templates/web/zurich/admin/report_edit.html:180
+#: templates/web/zurich/admin/report_edit-sdm.html:64
+#: templates/web/zurich/admin/report_edit.html:186
 #: templates/web/zurich/admin/update_edit.html:38
 msgid "Submit changes"
 msgstr "Send inn endringar"
@@ -3440,14 +3440,14 @@ msgstr "Send inn endringar"
 msgid "Submit questionnaire"
 msgstr "Send inn spørjeskjema"
 
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:67
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:68
 #: templates/web/zurich/admin/header.html:1
 #: templates/web/zurich/admin/header.html:6
 #: templates/web/zurich/admin/index-dm.html:23
 #: templates/web/zurich/admin/index-dm.html:6
 #: templates/web/zurich/admin/index-sdm.html:21
-#: templates/web/zurich/admin/report_edit.html:78
-#: templates/web/zurich/admin/report_edit.html:79
+#: templates/web/zurich/admin/report_edit.html:81
+#: templates/web/zurich/admin/report_edit.html:82
 #: templates/web/zurich/admin/reports.html:13
 #: templates/web/zurich/report/banner.html:9
 #, fuzzy
@@ -3476,7 +3476,7 @@ msgstr ""
 "høyrer til under:"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1130
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:195
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:196
 #: templates/web/default/admin/index.html:1
 #: templates/web/zurich/admin/index-dm.html:1
 #: templates/web/zurich/admin/index-sdm.html:1
@@ -3658,7 +3658,7 @@ msgstr ""
 "administrasjonane som mottok problemrapporten, noko som ikkje heilt passar "
 "med korleis attributten er definert i Open311 v2-spesifikasjonen."
 
-#: templates/web/default/auth/token.html:22
+#: templates/web/default/auth/token.html:19
 #: templates/web/default/email_sent.html:6
 msgid ""
 "The confirmation email <strong>may</strong> take a few minutes to arrive "
@@ -3924,6 +3924,12 @@ msgstr ""
 "Dette er ei opplisting av alle problema i denne tenesta; vel ein viss "
 "administrasjon for å sjå problem som er sende dit."
 
+#: templates/web/default/auth/token.html:9
+msgid ""
+"This may be because the link is too old or already used, or the address was "
+"not copied correctly."
+msgstr ""
+
 #: templates/web/default/report/banner.html:15
 msgid "This problem has been closed"
 msgstr "Dette problemet er lukka"
@@ -3951,6 +3957,7 @@ msgid "This problem is old and of unknown status."
 msgstr "Dette problemet er gammalt og med ukjend status."
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:65
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:66
 #: templates/web/zurich/report/_main.html:14
 #, fuzzy
 msgid "This report is awaiting moderation."
@@ -4039,8 +4046,8 @@ msgstr ""
 #: templates/web/default/admin/report_edit.html:29
 #: templates/web/default/admin/report_edit.html:32
 #: templates/web/default/admin/update_edit.html:22
-#: templates/web/zurich/admin/report_edit-sdm.html:42
-#: templates/web/zurich/admin/report_edit.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:45
+#: templates/web/zurich/admin/report_edit.html:58
 #: templates/web/zurich/admin/update_edit.html:18
 msgid "Unconfirmed"
 msgstr "Ikkje stadfesta"
@@ -4129,8 +4136,8 @@ msgstr "Oppdatert!"
 #: perllib/FixMyStreet/App/Controller/Admin.pm:906
 #: perllib/FixMyStreet/App/Controller/Admin.pm:959
 #: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:422
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:486
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:423
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
 msgid "Updated!"
 msgstr "Oppdatert!"
 
@@ -4169,7 +4176,7 @@ msgid "User flagged"
 msgstr "Brukar flagga"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:1135
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:210
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:211
 #: templates/web/default/admin/flagged.html:30
 #: templates/web/zurich/header.html:69
 msgid "Users"
@@ -4182,8 +4189,8 @@ msgstr "Verdi oppdatert"
 
 #: templates/web/default/admin/report_edit.html:12
 #: templates/web/default/admin/update_edit.html:12
-#: templates/web/zurich/admin/report_edit-sdm.html:21
-#: templates/web/zurich/admin/report_edit.html:19
+#: templates/web/zurich/admin/report_edit-sdm.html:24
+#: templates/web/zurich/admin/report_edit.html:22
 #: templates/web/zurich/admin/update_edit.html:10
 msgid "View report on site"
 msgstr "Sjå rapport på nettstaden"
@@ -4225,7 +4232,14 @@ msgstr ""
 "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så "
 "prøv eit anna søk viss staden din ikkje er her."
 
-#: templates/web/default/auth/token.html:19
+#: templates/web/default/auth/token.html:8
+#, fuzzy
+msgid "We have not been able to confirm your account - sorry."
+msgstr ""
+"Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen "
+"din."
+
+#: templates/web/default/auth/token.html:16
 msgid "We have sent you an email containing a link to confirm your account."
 msgstr ""
 "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen "
@@ -4709,8 +4723,8 @@ msgid "council ref:&nbsp;%s"
 msgstr ""
 
 #: templates/web/default/admin/report_edit.html:22
-#: templates/web/zurich/admin/report_edit-sdm.html:37
-#: templates/web/zurich/admin/report_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit.html:54
 msgid "didn't use map"
 msgstr "brukte ikkje kart"
 
@@ -4775,16 +4789,16 @@ msgstr ""
 
 #: templates/web/default/admin/report_edit.html:18
 #: templates/web/default/admin/report_edit.html:20
-#: templates/web/zurich/admin/report_edit-sdm.html:24
-#: templates/web/zurich/admin/report_edit-sdm.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:33
-#: templates/web/zurich/admin/report_edit-sdm.html:35
-#: templates/web/zurich/admin/report_edit.html:24
-#: templates/web/zurich/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit.html:35
-#: templates/web/zurich/admin/report_edit.html:37
-#: templates/web/zurich/admin/report_edit.html:47
-#: templates/web/zurich/admin/report_edit.html:49
+#: templates/web/zurich/admin/report_edit-sdm.html:27
+#: templates/web/zurich/admin/report_edit-sdm.html:29
+#: templates/web/zurich/admin/report_edit-sdm.html:36
+#: templates/web/zurich/admin/report_edit-sdm.html:38
+#: templates/web/zurich/admin/report_edit.html:27
+#: templates/web/zurich/admin/report_edit.html:29
+#: templates/web/zurich/admin/report_edit.html:38
+#: templates/web/zurich/admin/report_edit.html:40
+#: templates/web/zurich/admin/report_edit.html:50
+#: templates/web/zurich/admin/report_edit.html:52
 #, fuzzy
 msgid "originally entered: &ldquo;%s&rdquo;"
 msgstr "søkte etter"
@@ -4838,8 +4852,8 @@ msgid "today"
 msgstr "i dag"
 
 #: templates/web/default/admin/report_edit.html:22
-#: templates/web/zurich/admin/report_edit-sdm.html:37
-#: templates/web/zurich/admin/report_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit.html:54
 msgid "used map"
 msgstr "brukte kart"