From 8e44bc941b85f3a2e453c7434434e40755931a1b Mon Sep 17 00:00:00 2001
From: Jon Kristensen <info@jonkri.se>
Date: Wed, 28 Jun 2017 23:48:42 +0200
Subject: [FixaMinGata] Consolidate with upstream.

Add hook for post-title field content in report form.
Update translations.
---
 locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po      | 237 +++++++++------------
 perllib/Open311.pm                                 |   1 +
 t/open311.t                                        |   2 +
 templates/email/fixamingata/_email_bottom.html     |  17 ++
 .../email/fixamingata/_email_color_overrides.html  |  15 ++
 .../email/fixamingata/_email_comment_list.html     |  14 ++
 .../email/fixamingata/_email_report_list.html      |  19 ++
 templates/email/fixamingata/alert-confirm.html     |  21 ++
 templates/email/fixamingata/alert-confirm.txt      |   6 +-
 .../email/fixamingata/alert-problem-area.html      |  19 ++
 .../email/fixamingata/alert-problem-council.html   |  19 ++
 .../email/fixamingata/alert-problem-nearby.html    |  19 ++
 .../email/fixamingata/alert-problem-nearby.txt     |   2 +-
 .../email/fixamingata/alert-problem-ward.html      |  19 ++
 templates/email/fixamingata/alert-problem.html     |  19 ++
 templates/email/fixamingata/alert-update.html      |  25 +++
 templates/email/fixamingata/change_email.html      |  21 ++
 templates/email/fixamingata/change_email.txt       |  10 +
 .../email/fixamingata/confirm_report_sent.txt      |  23 ++
 templates/email/fixamingata/contact.html           |  38 ++++
 templates/email/fixamingata/login.html             |  21 ++
 templates/email/fixamingata/login.txt              |   3 +-
 templates/email/fixamingata/other-reported.html    |  30 +++
 templates/email/fixamingata/other-reported.txt     |  26 +++
 templates/email/fixamingata/other-updated.html     |  26 +++
 templates/email/fixamingata/other-updated.txt      |  15 ++
 .../fixamingata/problem-confirm-not-sending.html   |  30 +++
 .../fixamingata/problem-confirm-not-sending.txt    |  22 ++
 templates/email/fixamingata/problem-confirm.html   |  29 +++
 templates/email/fixamingata/problem-confirm.txt    |   1 -
 templates/email/fixamingata/problem-moderated.html |  32 +++
 templates/email/fixamingata/problem-moderated.txt  |  33 +++
 templates/email/fixamingata/questionnaire.html     |  30 +++
 templates/email/fixamingata/reply-autoresponse     |   2 +-
 templates/email/fixamingata/submit.html            |  57 +++++
 .../email/fixamingata/update-confirm-donotsend.txt |   2 +
 templates/email/fixamingata/update-confirm.html    |  29 +++
 templates/email/fixamingata/update-confirm.txt     |   2 +-
 templates/web/base/report/new/form_report.html     |   2 +
 templates/web/fixamingata/about/faq-sv.html        |   2 -
 templates/web/fixamingata/footer.html              |  10 -
 templates/web/fixamingata/front/tips.html          |   2 +-
 .../web/fixamingata/header_opengraph_image.html    |   2 +-
 .../web/fixamingata/report/new/after_title.html    |   8 +
 .../web/fixamingata/report/new/inline-tips.html    |   1 -
 templates/web/fixamingata/report/new/notes.html    |   8 -
 templates/web/fixamingata/report/new/sidebar.html  |   5 -
 web/cobrands/fixamingata/images/email-logo.gif     | Bin 0 -> 5087 bytes
 web/cobrands/fixamingata/images/email-logo.svg     |  85 ++++++++
 web/js/map-OpenLayers.js                           |   3 +-
 web/js/map-google.js                               |   3 +-
 51 files changed, 889 insertions(+), 178 deletions(-)
 create mode 100644 templates/email/fixamingata/_email_bottom.html
 create mode 100644 templates/email/fixamingata/_email_color_overrides.html
 create mode 100644 templates/email/fixamingata/_email_comment_list.html
 create mode 100644 templates/email/fixamingata/_email_report_list.html
 create mode 100644 templates/email/fixamingata/alert-confirm.html
 create mode 100644 templates/email/fixamingata/alert-problem-area.html
 create mode 100644 templates/email/fixamingata/alert-problem-council.html
 create mode 100644 templates/email/fixamingata/alert-problem-nearby.html
 create mode 100644 templates/email/fixamingata/alert-problem-ward.html
 create mode 100644 templates/email/fixamingata/alert-problem.html
 create mode 100644 templates/email/fixamingata/alert-update.html
 create mode 100644 templates/email/fixamingata/change_email.html
 create mode 100644 templates/email/fixamingata/change_email.txt
 create mode 100644 templates/email/fixamingata/confirm_report_sent.txt
 create mode 100644 templates/email/fixamingata/contact.html
 create mode 100644 templates/email/fixamingata/login.html
 create mode 100644 templates/email/fixamingata/other-reported.html
 create mode 100644 templates/email/fixamingata/other-reported.txt
 create mode 100644 templates/email/fixamingata/other-updated.html
 create mode 100644 templates/email/fixamingata/other-updated.txt
 create mode 100644 templates/email/fixamingata/problem-confirm-not-sending.html
 create mode 100644 templates/email/fixamingata/problem-confirm-not-sending.txt
 create mode 100644 templates/email/fixamingata/problem-confirm.html
 create mode 100644 templates/email/fixamingata/problem-moderated.html
 create mode 100644 templates/email/fixamingata/problem-moderated.txt
 create mode 100644 templates/email/fixamingata/questionnaire.html
 create mode 100644 templates/email/fixamingata/submit.html
 create mode 100644 templates/email/fixamingata/update-confirm-donotsend.txt
 create mode 100644 templates/email/fixamingata/update-confirm.html
 create mode 100644 templates/web/fixamingata/report/new/after_title.html
 delete mode 100644 templates/web/fixamingata/report/new/notes.html
 create mode 100644 web/cobrands/fixamingata/images/email-logo.gif
 create mode 100644 web/cobrands/fixamingata/images/email-logo.svg

diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9363db0cf..b9395200a 100644
--- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
 "POT-Creation-Date: 2017-03-30 17:33+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Jon Kristensen <info@jonkri.com>, 2016\n"
+"Last-Translator: Jon Kristensen <info@jonkri.com>, 2017\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n"
 "Language: sv_SE\n"
 "MIME-Version: 1.0\n"
@@ -186,11 +186,11 @@ msgstr "Hål i gatan på Storgatan, nära brevlådan"
 
 #: templates/web/base/dashboard/index.html:152
 msgid "14-30 days old"
-msgstr ""
+msgstr "14-30 dagar gamla"
 
 #: templates/web/base/dashboard/index.html:151
 msgid "7-14 days old"
-msgstr ""
+msgstr "7-14 dagar gamla"
 
 #: templates/web/base/admin/body-form.html:48
 #: templates/web/base/admin/body-form.html:49
@@ -205,7 +205,7 @@ msgstr ""
 
 #: templates/web/base/dashboard/index.html:15
 msgid "<h2>Reports, Statistics and Actions for</h2> <h1>%s</h1>"
-msgstr ""
+msgstr "<h2>Rapporter, statistik och åtgärder för</h2> <h1>%s</h1>"
 
 #. ('The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories')
 #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories")
@@ -215,7 +215,7 @@ msgstr "<label for=\"statuses\">Visa</label> %s <label for=\"filter_categories\"
 
 #: templates/web/base/js/translation_strings.html:71
 msgid "<span>%s</span> saved."
-msgstr ""
+msgstr "<span>%s</span> sparad."
 
 #: templates/web/base/status/stats.html:18
 #: templates/web/zurich/admin/index.html:4
@@ -317,7 +317,7 @@ msgstr "Att lägga till den här rapporten i din kortlista tar bort den från ko
 
 #: templates/web/base/main_nav_items.html:47
 msgid "Admin"
-msgstr ""
+msgstr "Administratörskontrollpanel"
 
 #: templates/web/base/auth/change_password.html:39
 msgid "Again:"
@@ -338,9 +338,8 @@ msgstr "Varsko mig om framtida uppdateringar"
 #: templates/web/base/dashboard/index.html:138
 #: templates/web/base/dashboard/index.html:21
 #: templates/web/base/dashboard/index.html:30
-#, fuzzy
 msgid "All"
-msgstr "samtliga"
+msgstr "Alla"
 
 #: templates/web/base/reports/index.html:6
 #: templates/web/zurich/reports/index.html:13
@@ -467,11 +466,11 @@ msgstr "Tillgängliga kategorier"
 
 #: templates/web/base/dashboard/index.html:109
 msgid "Average time to council marking fixed (days)"
-msgstr ""
+msgstr "Genomsnittlig tid för kommun att markera som löst (dagar)"
 
 #: templates/web/base/dashboard/index.html:117
 msgid "Average time to first council state change (days)"
-msgstr ""
+msgstr "Genomsnittlig tid för kommun till första rapportstatusändring (dagar)"
 
 #: templates/web/base/report/new/after_photo.html:6
 msgid "Avoid personal information and vehicle number plates"
@@ -628,11 +627,11 @@ msgstr "Välj ett <strong>kategorinamn</strong> som å ena sidan är förståeli
 
 #: templates/web/base/report/_inspect.html:93
 msgid "Choose another"
-msgstr ""
+msgstr "Välj en annan"
 
 #: templates/web/base/js/translation_strings.html:65
 msgid "Clear offline data"
-msgstr ""
+msgstr "Rensa offline-data"
 
 #: templates/web/base/admin/stats.html:72
 #: templates/web/base/admin/stats.html:78
@@ -708,9 +707,8 @@ msgid "Cobrand:"
 msgstr "Cobrand:"
 
 #: templates/web/base/js/translation_strings.html:50
-#, fuzzy
 msgid "Collapse map"
-msgstr "Använde kartan"
+msgstr "Vik ihop karta"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:646
 #: templates/web/base/admin/config_page.html:1
@@ -796,33 +794,28 @@ msgstr "Kommunkontakter för %s"
 
 #: templates/web/base/dashboard/index.html:78
 #: templates/web/base/dashboard/index.html:83
-#, fuzzy
 msgid "Council has marked as closed"
-msgstr "markerad som stängd"
+msgstr "Kommun har markerat som stängd"
 
 #: templates/web/base/dashboard/index.html:54
 #: templates/web/base/dashboard/index.html:57
-#, fuzzy
 msgid "Council has marked as fixed"
-msgstr "markerad som löst"
+msgstr "Kommun har markerat som löst"
 
 #: templates/web/base/dashboard/index.html:78
 #: templates/web/base/dashboard/index.html:80
-#, fuzzy
 msgid "Council has marked as in progress"
-msgstr "markerad som pågående"
+msgstr "Kommun har markerat som pågående"
 
 #: templates/web/base/dashboard/index.html:78
 #: templates/web/base/dashboard/index.html:82
-#, fuzzy
 msgid "Council has marked as investigating"
-msgstr "markerad som under utredning"
+msgstr "Kommun har markerat som under utredning"
 
 #: templates/web/base/dashboard/index.html:78
 #: templates/web/base/dashboard/index.html:81
-#, fuzzy
 msgid "Council has marked as planned"
-msgstr "markerad som planerad"
+msgstr "Kommun har markerat som planerad"
 
 #: templates/web/base/report/_council_sent_info.html:6
 msgid "Council ref:&nbsp;%s"
@@ -902,7 +895,7 @@ msgstr "Hanterat av underavdelning inom 5 arbetsdagar"
 
 #: templates/web/base/report/_inspect.html:73
 msgid "Defect type"
-msgstr ""
+msgstr "Defekttyp"
 
 #: perllib/FixMyStreet/App/Controller/Admin.pm:973
 #: templates/web/base/admin/template_edit.html:50
@@ -921,7 +914,7 @@ msgstr "Borttagen"
 #: templates/web/base/report/_main.html:110
 #: templates/web/base/report/update.html:59
 msgid "Describe why you are moderating this"
-msgstr ""
+msgstr "Beskriv varför du modererar detta"
 
 #: templates/web/base/admin/responsepriorities/list.html:7
 #: templates/web/zurich/admin/index-dm.html:22
@@ -961,9 +954,8 @@ msgstr "Flitighetstopplistan"
 
 #: templates/web/base/report/_main.html:114
 #: templates/web/base/report/update.html:61
-#, fuzzy
 msgid "Discard changes"
-msgstr "Spara ändringar"
+msgstr "Ta bort ändringar"
 
 #: templates/web/base/admin/open311-form-fields.html:95
 msgid "Do not send email alerts on fetched comments to problem creator"
@@ -988,7 +980,7 @@ msgstr "Gillar du inte formulär?"
 
 #: templates/web/base/report/_item.html:25
 msgid "Down one"
-msgstr ""
+msgstr "Ner en"
 
 #: templates/web/base/js/translation_strings.html:55
 msgid "Drag and drop photos here or <u>click to upload</u>"
@@ -1004,14 +996,12 @@ msgid "Duplicate"
 msgstr "Finns redan"
 
 #: templates/web/base/report/_inspect.html:88
-#, fuzzy
 msgid "Duplicate of"
-msgstr "Finns redan"
+msgstr "Dublett av"
 
 #: templates/web/base/report/_inspect.html:98
-#, fuzzy
 msgid "Duplicates"
-msgstr "Finns redan"
+msgstr "Dubletter"
 
 #: templates/web/base/admin/body.html:116
 msgid ""
@@ -1217,16 +1207,15 @@ msgstr "Befintlig kategori"
 
 #: templates/web/base/js/translation_strings.html:49
 msgid "Expand map"
-msgstr ""
+msgstr "Expandera karta"
 
 #: templates/web/base/report/new/form_report.html:52
 msgid "Explain what’s wrong"
 msgstr "Förklara felet"
 
 #: templates/web/base/dashboard/index.html:146
-#, fuzzy
 msgid "Export as CSV"
-msgstr "Alla rapporter som CSV"
+msgstr "Exportera som CSV"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:174
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:913
@@ -1472,9 +1461,8 @@ msgid "Hidden"
 msgstr "Gömd"
 
 #: templates/web/base/report/_main.html:105
-#, fuzzy
 msgid "Hide entire report"
-msgstr "Skicka om rapporten"
+msgstr "Dölj hela rapporten"
 
 #: templates/web/base/around/display_location.html:67
 msgid "Hide old"
@@ -1486,7 +1474,7 @@ msgstr "Göm kartnålar"
 
 #: templates/web/base/report/update.html:15
 msgid "Hide update completely?"
-msgstr ""
+msgstr "Dölj uppdatering helt?"
 
 #: templates/web/base/admin/category_edit.html:49
 msgid "History"
@@ -1539,7 +1527,7 @@ msgstr "Identifiera en <strong>förälder</strong> om den här förvaltningen ä
 
 #: templates/web/base/admin/responsepriorities/edit.html:23
 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here."
-msgstr ""
+msgstr "Om denna prioritet skickas vidare till en extern tjänst (t.ex. Exor/Confirm), skriv prioritetskoden för den tjänsten här."
 
 #: templates/web/base/admin/contact-form.html:14
 msgid ""
@@ -1566,7 +1554,7 @@ msgstr "Om du skapar en problemrapport här så kommer rapporten <strong>inte</s
 
 #: templates/web/base/admin/template_edit.html:36
 msgid "If you want to use this template to prefill the update field when changing a report&rsquo;s state, select the state here."
-msgstr ""
+msgstr "Om du vill använda denna mall för att automatiskt fylla i uppdateringsfältet då en rapports status ändras, välj då statusvärdet här."
 
 #: templates/web/base/questionnaire/index.html:70
 msgid ""
@@ -1673,7 +1661,7 @@ msgstr "Interna refereringar"
 
 #: templates/web/base/offline/appcache.html:3
 msgid "Internet glitch"
-msgstr ""
+msgstr "Internet-problem"
 
 #: perllib/FixMyStreet/App/Controller/Open311.pm:336
 msgid "Invalid agency_responsible value %s"
@@ -1733,12 +1721,11 @@ msgstr "Behåll mig inloggad på den här datorn"
 
 #: templates/web/base/dashboard/index.html:50
 msgid "Last 4 weeks"
-msgstr ""
+msgstr "De senaste fyra veckorna"
 
 #: templates/web/base/dashboard/index.html:49
-#, fuzzy
 msgid "Last 7 days"
-msgstr "Senaste uppdatering:"
+msgstr "De senaste sju dagarna"
 
 #: templates/web/base/admin/body.html:74
 #: templates/web/zurich/admin/body.html:16
@@ -1756,7 +1743,7 @@ msgstr "Senaste&nbsp;uppdatering:"
 #: templates/web/base/report/_inspect.html:20
 #: templates/web/base/report/_item.html:86
 msgid "Latitude/Longitude:"
-msgstr ""
+msgstr "Latitud/Longitud:"
 
 #: templates/web/base/reports/_list-filters.html:50
 msgid "Least recently updated"
@@ -1768,7 +1755,7 @@ msgstr "Lämna den här blank om samtliga rapporter till den här förvaltningen
 
 #: templates/web/base/dashboard/index.html:150
 msgid "Less than 7 days old"
-msgstr ""
+msgstr "Mindre än sju dagar gammal"
 
 #: templates/web/base/admin/body.html:31
 msgid "List all reported problems"
@@ -1804,22 +1791,22 @@ msgstr "Lokalisera problemet på en karta över området"
 #: templates/web/base/report/new/form_user_loggedout.html:6
 #: templates/web/base/report/update/form_user_loggedout.html:7
 msgid "Log in with Facebook"
-msgstr ""
+msgstr "Logga in med Facebook"
 
 #: templates/web/base/auth/general.html:30
 #: templates/web/base/report/new/form_user_loggedout.html:14
 #: templates/web/base/report/update/form_user_loggedout.html:15
 msgid "Log in with Twitter"
-msgstr ""
+msgstr "Logga in med Twitter"
 
 #: templates/web/base/js/translation_strings.html:59
 msgid "Log in with email"
-msgstr ""
+msgstr "Logga in med e-post"
 
 #: templates/web/base/dashboard/index.html:145
 #: templates/web/base/dashboard/index.html:38
 msgid "Look up"
-msgstr ""
+msgstr "Slå upp"
 
 #: templates/web/base/js/translation_strings.html:44
 msgid "MAP"
@@ -1831,7 +1818,7 @@ msgstr "Hantera slutlista"
 
 #: templates/web/base/reports/_list-filters.html:45
 msgid "Manual order"
-msgstr ""
+msgstr "Manuell ordning"
 
 #: templates/web/base/js/translation_strings.html:46
 msgid "Map"
@@ -1890,15 +1877,13 @@ msgid "Moderate this report"
 msgstr "Moderera den här rapporten"
 
 #: templates/web/base/report/update.html:12
-#, fuzzy
 msgid "Moderate this update"
-msgstr "Moderera den här rapporten"
+msgstr "Moderera den här uppdateringen"
 
 #: templates/web/base/report/_main.html:69
 #: templates/web/base/report/update.html:49
-#, fuzzy
 msgid "Moderated by %s at %s"
-msgstr "Rapporterat av %s den %s"
+msgstr "Modererad av %s %s"
 
 #: templates/web/zurich/admin/stats.html:34
 msgid "Moderated by division within one working day"
@@ -1906,9 +1891,8 @@ msgstr "Granskat av underavdelningen inom en arbetsdag"
 
 #: templates/web/base/report/_main.html:109
 #: templates/web/base/report/update.html:57
-#, fuzzy
 msgid "Moderation reason:"
-msgstr "Moderera den här rapporten"
+msgstr "Anledning till moderering:"
 
 #: templates/web/base/admin/stats.html:11
 msgid "Month"
@@ -2121,11 +2105,11 @@ msgstr "Inga fler uppdateringar"
 
 #: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:84
 msgid "No inspections by that inspector in the selected date range."
-msgstr ""
+msgstr "Inga inspektioner av den inspektören i det valda datumintervallet."
 
 #: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:86
 msgid "No inspections in the selected date range."
-msgstr ""
+msgstr "Inga inspektioner i det valda datumintervallet."
 
 #: templates/web/base/js/translation_strings.html:37
 msgid "No result returned"
@@ -2234,11 +2218,11 @@ msgstr "OK"
 
 #: templates/web/base/js/translation_strings.html:67
 msgid "Offline data cleared"
-msgstr ""
+msgstr "Offline-data rensad"
 
 #: templates/web/base/js/translation_strings.html:64
 msgid "Offline update data saved"
-msgstr ""
+msgstr "Offline-uppdateringsdata sparade"
 
 #: templates/web/base/reports/index.html:26
 msgid "Old / unknown <br>problems"
@@ -2724,9 +2708,8 @@ msgid "Private"
 msgstr "Privat"
 
 #: templates/web/base/report/new/form_user.html:1
-#, fuzzy
 msgid "Private details"
-msgstr "Extra uppgifter"
+msgstr "Andra uppgifter"
 
 #: templates/web/base/maps/pin.html:13
 msgid "Problem"
@@ -2822,9 +2805,8 @@ msgid "Providing a password is optional, but doing so will allow you to more eas
 msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina anmälningar."
 
 #: templates/web/base/report/new/form_report.html:10
-#, fuzzy
 msgid "Public details"
-msgstr "Offentlig uppdatering:"
+msgstr "Offentliga uppgifter"
 
 #: templates/web/zurich/admin/report_edit.html:241
 #: templates/web/zurich/admin/report_edit.html:268
@@ -2997,9 +2979,8 @@ msgid "Report on %s"
 msgstr "Rappoort på %s"
 
 #: templates/web/base/dashboard/index.html:137
-#, fuzzy
 msgid "Report state:"
-msgstr "Rapportera som"
+msgstr "Rapportstatus:"
 
 #: templates/web/base/report/new/fill_in_details_form.html:1
 #: templates/web/base/report/new/login_success_form.html:1
@@ -3102,9 +3083,8 @@ msgid "Reports published"
 msgstr "Publicerade rapporter"
 
 #: templates/web/base/js/translation_strings.html:68
-#, fuzzy
 msgid "Reports saved offline."
-msgstr "Rapportera ett problem"
+msgstr "Rapporter sparade offline."
 
 #: templates/web/base/admin/index.html:56
 msgid "Reports waiting to be sent"
@@ -3151,15 +3131,15 @@ msgstr "Svarsmallar för %s"
 
 #: templates/web/base/report/update.html:40
 msgid "Revert to original"
-msgstr ""
+msgstr "Återgå till orginalrapporten"
 
 #: templates/web/base/report/_main.html:95
 msgid "Revert to original text"
-msgstr ""
+msgstr "Återgå till orginalstexten"
 
 #: templates/web/base/report/_main.html:50
 msgid "Revert to original title"
-msgstr ""
+msgstr "Återgå till orginalsammanfattningen"
 
 #: templates/web/base/js/translation_strings.html:28
 #: templates/web/base/js/translation_strings.html:40
@@ -3201,9 +3181,8 @@ msgid "Satellite"
 msgstr "Satellit"
 
 #: templates/web/base/report/_inspect.html:168
-#, fuzzy
 msgid "Save + close as duplicate"
-msgstr "markerad som dubblett av rapport"
+msgstr "Spara + stäng som dublett"
 
 #: templates/web/base/admin/contact-form.html:137
 #: templates/web/base/admin/responsepriorities/edit.html:46
@@ -3225,7 +3204,7 @@ msgstr "Spara med en offentlig uppdatering"
 #. ("This is followed by a progress count, e.g. 3/5")
 #: templates/web/base/js/translation_strings.html:69
 msgid "Saving reports offline"
-msgstr ""
+msgstr "Sparar rapporter offline"
 
 #: templates/web/base/admin/index.html:26
 #: templates/web/base/admin/reports.html:1
@@ -3261,9 +3240,8 @@ msgid "See our privacy policy"
 msgstr "Se vår integritetsskyddspolicy"
 
 #: perllib/FixMyStreet/Cobrand/Default.pm:715
-#, fuzzy
 msgid "See user detail for reports created as the council"
-msgstr "Skapa rapporter/uppdateringar som kommunen"
+msgstr "Se användarinformation för rapporter skapade som kommunen"
 
 #: templates/web/base/admin/body-form.html:39
 #: templates/web/zurich/admin/body-form.html:16
@@ -3335,9 +3313,8 @@ msgid "Shortlisted by %s"
 msgstr "Satt på slutlistan av %s"
 
 #: templates/web/base/report/update.html:20
-#, fuzzy
 msgid "Show Photo?"
-msgstr "Visa äldre"
+msgstr "Visa foto?"
 
 #: templates/web/base/report/new/form_user_loggedin.html:54
 #: templates/web/base/report/new/form_user_loggedout_by_email.html:22
@@ -3346,18 +3323,16 @@ msgid "Show my name publicly"
 msgstr "Visa mitt namn publikt"
 
 #: templates/web/base/report/update.html:17
-#, fuzzy
 msgid "Show name publicly?"
-msgstr "Visa mitt namn publikt"
+msgstr "Visa namn offentligt?"
 
 #: templates/web/base/around/display_location.html:69
 msgid "Show old"
 msgstr "Visa äldre"
 
 #: templates/web/base/report/_main.html:79
-#, fuzzy
 msgid "Show photo"
-msgstr "Visa äldre"
+msgstr "Visa foto"
 
 #: templates/web/base/around/display_location.html:60
 msgid "Show pins"
@@ -3365,7 +3340,7 @@ msgstr "Visa kartnålar"
 
 #: templates/web/base/report/_main.html:60
 msgid "Show reporter&rsquo;s name"
-msgstr ""
+msgstr "Visa rapportörens namn"
 
 #: templates/web/base/auth/general.html:117
 #: templates/web/base/auth/general.html:3
@@ -3451,7 +3426,7 @@ msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen."
 msgid ""
 "Sorry, we don’t have a good enough connection to fetch that page, or the\n"
 "page wasn’t found or there was a server error. Please try again later."
-msgstr ""
+msgstr "Anslutningen är inte tillräckligt bra för att hämta den sidan, eller så kunde inte sidan hittas, eller så inträffade ett tekniskt fel. Vänligen försök igen senare."
 
 #: perllib/FixMyStreet/App/Controller/Root.pm:107
 msgid "Sorry, you don't have permission to do that."
@@ -3949,13 +3924,12 @@ msgid "This problem has not been fixed"
 msgstr "Det här problemet har inte lösts"
 
 #: templates/web/base/report/update/form_update.html:54
-#, fuzzy
 msgid "This problem is still ongoing"
-msgstr "Det här problemet har inte lösts"
+msgstr "Detta problem är fortfarande aktuellt"
 
 #: templates/web/base/report/duplicate-no-updates.html:3
 msgid "This report is a duplicate. Please leave updates on the original report:"
-msgstr ""
+msgstr "Den här rapporten är en dublett. Lämna uppdateringar på den ursprungliga rapporten:"
 
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:161
 #: perllib/FixMyStreet/Cobrand/Zurich.pm:162
@@ -4033,21 +4007,20 @@ msgstr "Totalt"
 
 #: templates/web/base/dashboard/index.html:97
 msgid "Total marked"
-msgstr ""
+msgstr "Markerade, totalt"
 
 #: templates/web/base/dashboard/index.html:71
-#, fuzzy
 msgid "Total marked as fixed"
-msgstr "markerad som löst"
+msgstr "Markerade som lösta, totalt"
 
 #: templates/web/base/dashboard/index.html:125
 msgid "Total not marked"
-msgstr ""
+msgstr "Ej markerade, totalt"
 
 #: templates/web/base/dashboard/index.html:54
 #: templates/web/base/dashboard/index.html:56
 msgid "Total reports received"
-msgstr ""
+msgstr "Uppdateringar mottagna, totalt"
 
 #: templates/web/base/report/_inspect.html:124
 #: templates/web/base/report/_item.html:102
@@ -4109,13 +4082,12 @@ msgid "Unknown problem ID"
 msgstr "Okänt problemnummer"
 
 #: templates/web/base/reports/_list-filters.html:10
-#, fuzzy
 msgid "Unshortlisted"
-msgstr "Satt på slutlistan"
+msgstr "Okortlistade"
 
 #: templates/web/base/report/_item.html:24
 msgid "Up one"
-msgstr ""
+msgstr "Upp en"
 
 #: templates/web/base/report/update/form_update.html:29
 msgid "Update"
@@ -4226,9 +4198,8 @@ msgstr "Användaren flaggad"
 
 #: templates/web/base/dashboard/index.html:54
 #: templates/web/base/dashboard/index.html:58
-#, fuzzy
 msgid "User has marked as fixed"
-msgstr "markerad som löst"
+msgstr "Användaren har markerat som löst"
 
 #: templates/web/base/admin/users.html:5
 msgid "User search finds matches in users' names and email addresses."
@@ -4275,11 +4246,11 @@ msgstr "Visa ett problem"
 #. ("Week to date")
 #: templates/web/base/dashboard/index.html:48
 msgid "WTD"
-msgstr ""
+msgstr "VTI"
 
 #: templates/web/base/dashboard/index.html:20
 msgid "Ward:"
-msgstr ""
+msgstr "Stadsdel:"
 
 #: templates/web/base/reports/body.html:16
 msgid "Wards of this council"
@@ -4319,7 +4290,7 @@ msgstr "Tråkigt att problemet inte åtgärdats. Du kan prova att skriva direkt
 
 #: templates/web/base/dashboard/index.html:48
 msgid "Week To Date"
-msgstr ""
+msgstr "Veckor Till Idag"
 
 #: templates/web/base/contact/submit.html:7
 msgid "We’ll get back to you as soon as we can."
@@ -4340,7 +4311,7 @@ msgstr "Vid avsändning"
 
 #: templates/web/base/report/_inspect.html:89
 msgid "Which report is it a duplicate of?"
-msgstr ""
+msgstr "Vilken rapport är den en dublett av?"
 
 #: templates/web/base/js/translation_strings.html:54
 msgid "Whoa there Testino! Three photos are enough."
@@ -4380,7 +4351,7 @@ msgstr "Fel plats? Klicka i så fall på kartan igen."
 #. ("Year to date")
 #: templates/web/base/dashboard/index.html:51
 msgid "YTD"
-msgstr ""
+msgstr "ÅTI"
 
 #: templates/web/base/admin/stats.html:10
 msgid "Year"
@@ -4417,7 +4388,7 @@ msgstr "Du anmäler att den här problemrapporten var modererad i onödan:"
 
 #: templates/web/base/js/translation_strings.html:70
 msgid "You are offline"
-msgstr ""
+msgstr "Du är offline"
 
 #: templates/web/base/contact/unsuitable-text.html:2
 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
@@ -4464,7 +4435,7 @@ msgstr "Du nekade; vänligan fyll i rutan ovan"
 
 #: templates/web/base/js/translation_strings.html:72
 msgid "You have <a id=\"oFN\" href=\"\"><span>%s</span> saved to submit</a>."
-msgstr ""
+msgstr "Du har <a id=\"oFN\" href=\"\"><span>%s</span> sparad att skicka</a>."
 
 #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
@@ -4562,9 +4533,8 @@ msgid "Your name"
 msgstr "Ditt namn och efternamn"
 
 #: templates/web/base/js/translation_strings.html:62
-#, fuzzy
 msgid "Your offline reports"
-msgstr "Dina rapporter"
+msgstr "Dina offline-rapporter"
 
 #: templates/web/base/auth/general.html:85
 #: templates/web/base/report/new/form_user_loggedout_password.html:10
@@ -4597,7 +4567,7 @@ msgstr "Din slutlista"
 
 #: templates/web/base/js/translation_strings.html:63
 msgid "Your update has been saved offline for submission when back online."
-msgstr ""
+msgstr "Din uppdatering har blivit sparad offline för att skickas när du kommer tillbaka online."
 
 #: templates/web/base/my/my.html:51
 msgid "Your updates"
@@ -4764,14 +4734,12 @@ msgid "today"
 msgstr "idag"
 
 #: templates/web/base/js/translation_strings.html:73
-#, fuzzy
 msgid "update"
-msgstr "Uppdatering"
+msgstr "uppdatering"
 
 #: templates/web/base/js/translation_strings.html:74
-#, fuzzy
 msgid "updates"
-msgstr "Uppdateringar"
+msgstr "uppdateringar"
 
 #: templates/web/base/admin/report_edit.html:52
 msgid "used map"
@@ -4791,11 +4759,11 @@ msgid "ward"
 msgstr "område"
 
 #: templates/web/base/admin/bodies.html:56
-#, fuzzy, perl-format
+#, perl-format
 msgid "%d address"
 msgid_plural "%d addresses"
-msgstr[0] "E-postadress"
-msgstr[1] "E-postadress"
+msgstr[0] "%d adress"
+msgstr[1] "%d adresser"
 
 #: perllib/Utils.pm:250
 #, perl-format
@@ -4819,11 +4787,11 @@ msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
 #: perllib/Utils.pm:246
-#, fuzzy, perl-format
+#, perl-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuter"
+msgstr[0] "%d månad"
+msgstr[1] "%d månader"
 
 #: templates/web/base/report/_support.html:6
 #, perl-format
@@ -4843,8 +4811,8 @@ msgstr[1] "%d veckor"
 #, perl-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d år"
+msgstr[1] "%d år"
 
 #: templates/web/base/front/stats.html:19
 #, perl-format
@@ -4875,11 +4843,11 @@ msgstr[0] "<big>%s</big> uppdatering av rapporter"
 msgstr[1] "<big>%s</big> uppdateringar av rapporter"
 
 #: templates/web/base/report/_item.html:49
-#, fuzzy, perl-format
+#, perl-format
 msgid "Reported %d day ago"
 msgid_plural "Reported %d days ago"
-msgstr[0] "Rapporterat av %s den %s"
-msgstr[1] "Rapporterat av %s den %s"
+msgstr[0] "Rapporterad för %d dag sedan"
+msgstr[1] "Rapporterad för %d dagar sedan"
 
 #: templates/web/base/report/new/top_message_some.html:3
 #, perl-format
@@ -4896,24 +4864,15 @@ msgstr[0] "Vi har ännu ingen information om kommunen på den platsen"
 msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata."
 
 #: templates/web/base/report/_item.html:59
-#, fuzzy, perl-format
+#, perl-format
 msgid "last updated %d day ago"
 msgid_plural "last updated %d days ago"
-msgstr[0] "senast uppdaterad %s"
-msgstr[1] "senast uppdaterad %s"
+msgstr[0] "senast uppdaterad för %d dag sedan"
+msgstr[1] "senast uppdaterad för %d dagar sedan"
 
 #: templates/email/oxfordshire/archive.txt:9
-#, fuzzy, perl-format
+#, perl-format
 msgid "report"
 msgid_plural "reports"
-msgstr[0] "Rapportera"
-msgstr[1] "Rapportera"
-
-#~ msgid "Cancel"
-#~ msgstr "Avbryt"
-
-#~ msgid "Reports from users with high enough reputation will be sent immediately without requiring inspection. Each category's threshold can be managed on its edit page. Users earn reputation when a report they have made is marked as inspected by inspectors."
-#~ msgstr "Rapporter från användare med högt nog anseende kommer att skickas omedelbart, utan att kräva inspektion. Kategoriers gränser kan hanteras i administratörskontrollpanelen. Användare ökar i anseende när en av deras rapporter markeras som inspekterade av inspektörer."
-
-#~ msgid "Reputation:"
-#~ msgstr "Anseende:"
+msgstr[0] "rapport"
+msgstr[1] "rapporter"
diff --git a/perllib/Open311.pm b/perllib/Open311.pm
index b52cee0ea..999cb65cb 100644
--- a/perllib/Open311.pm
+++ b/perllib/Open311.pm
@@ -193,6 +193,7 @@ sub _generate_service_request_description {
             $description = "title: " . $problem->title . "\n\n$description";
         }
     } elsif ($problem->cobrand eq 'fixamingata') {
+        $description .= "Titel: " . $problem->title . "\n\n";
         $description .= "Beskrivning: " . $problem->detail . "\n\n";
         $description .= "Länk till ärendet: " . $extra->{url} . "\n\n";
         $description .= "Skickad via FixaMinGata\n";
diff --git a/t/open311.t b/t/open311.t
index a24a0af00..b41d42b55 100644
--- a/t/open311.t
+++ b/t/open311.t
@@ -677,6 +677,8 @@ subtest 'check FixaMinGata' => sub {
     my $results = make_service_req( $problem, $extra, $problem->category, '<?xml version="1.0" encoding="utf-8"?><service_requests><request><service_request_id>248</service_request_id></request></service_requests>' );
     is $results->{ res }, 248, 'got request id';
     my $description = <<EOT;
+Titel: a problem
+
 Beskrivning: MØØse
 
 Länk till ärendet: http://example.com/report/1
diff --git a/templates/email/fixamingata/_email_bottom.html b/templates/email/fixamingata/_email_bottom.html
new file mode 100644
index 000000000..dab4486cd
--- /dev/null
+++ b/templates/email/fixamingata/_email_bottom.html
@@ -0,0 +1,17 @@
+          </tr>
+          <tr>
+            <th colspan="[% email_columns %]" style="[% td_style %][% hint_style %]" class="hint">
+              [%~ IF email_footer %]
+                [% email_footer %]
+              [%~ ELSE %]
+                Det går inte att svara på detta mail
+              [%~ END %]
+            </th>
+          </tr>
+        </table>
+      </th>
+      <th></th>
+    </tr>
+  </table>
+</body>
+</html>
diff --git a/templates/email/fixamingata/_email_color_overrides.html b/templates/email/fixamingata/_email_color_overrides.html
new file mode 100644
index 000000000..5deaf5f88
--- /dev/null
+++ b/templates/email/fixamingata/_email_color_overrides.html
@@ -0,0 +1,15 @@
+[%
+
+color_fixamingata_grey = '#eee'
+color_fixamingata_blue = '#00b1da'
+
+header_background_color = color_fixamingata_grey
+
+secondary_column_background_color = color_fixamingata_grey
+
+button_background_color = color_fixamingata_blue
+
+logo_width = "207" # pixel measurement, but without 'px' suffix
+logo_height = "35" # pixel measurement, but without 'px' suffix
+
+%]
diff --git a/templates/email/fixamingata/_email_comment_list.html b/templates/email/fixamingata/_email_comment_list.html
new file mode 100644
index 000000000..efbb3e8da
--- /dev/null
+++ b/templates/email/fixamingata/_email_comment_list.html
@@ -0,0 +1,14 @@
+[% FOR update IN data %]
+    <div style="[% list_item_style %]">
+    [%~ IF update.item_photo %]
+      <a href="[% problem_url %]">
+        <img style="[% list_item_photo_style %]" src="[% inline_image(update.get_first_image_fp) %]" alt="">
+      </a>
+    [%~ END %]
+      <p style="[% list_item_p_style %]">&ldquo;[% update.item_text | html %]&rdquo;</p>
+      <p style="[% list_item_date_style %]">
+        [%~ update.item_name | html IF update.item_name AND NOT update.item_anonymous -%]
+        [% '(' _ cobrand.prettify_dt(update.confirmed) _ ') ' IF cobrand.include_time_in_update_alerts -%]
+      </p>
+    </div>
+[% END %]
diff --git a/templates/email/fixamingata/_email_report_list.html b/templates/email/fixamingata/_email_report_list.html
new file mode 100644
index 000000000..5f7f67864
--- /dev/null
+++ b/templates/email/fixamingata/_email_report_list.html
@@ -0,0 +1,19 @@
+[% FOR report IN data %]
+<div style="[% list_item_style %]">
+[% IF report.photo %]
+  <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]">
+    <img style="[% list_item_photo_style %]" src="[% inline_image(report.get_first_image_fp) %]" alt="">
+  </a>
+[% END %]
+  <h2 style="[% list_item_h2_style %]">
+    <a href="[% cobrand.base_url_for_report( report ) %]/report/[% report.id %]">
+      [%~ report.title | html ~%]
+    </a>
+  </h2>
+  <p style="[% list_item_p_style %]">[% report.detail | html %]</p>
+  <p style="[% list_item_date_style %]">
+    [% cobrand.prettify_dt( report.confirmed ) %].
+    [% report.nearest %]
+  </p>
+</div>
+[% END %]
diff --git a/templates/email/fixamingata/alert-confirm.html b/templates/email/fixamingata/alert-confirm.html
new file mode 100644
index 000000000..43b09fc24
--- /dev/null
+++ b/templates/email/fixamingata/alert-confirm.html
@@ -0,0 +1,21 @@
+[%
+
+email_summary = "Bekräfta din bevakning på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Bekräfta din bevakning på&nbsp;FixaMinGata</h1>
+  <p style="[% p_style %]">Vänligen klicka på knappen nedan för att bekräfta din prenumerationsbevakning på FixaMinGata:</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% token_url %]">Aktivera bevakning</a>
+  </p>
+  <p style="[% p_style %]">Om du inte vill aktivera din bevakning så behöver du inte göra något.</p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-confirm.txt b/templates/email/fixamingata/alert-confirm.txt
index c2a32b051..8f17765b6 100644
--- a/templates/email/fixamingata/alert-confirm.txt
+++ b/templates/email/fixamingata/alert-confirm.txt
@@ -1,9 +1,9 @@
-Subject: Bekräfta din bevakning på [% INCLUDE 'site-name.txt' | trim %]
+Subject: Bekräfta din bevakning på FixaMinGata
 
 Hej,
 
-vänligen klicka på länken nedan för att bekräfta den bevakning du
-just valde att prenumerera till på [% INCLUDE 'site-name.txt' | trim %]:
+Vänligen klicka på länken nedan för att bekräfta den bevakning du
+just valde att prenumerera till på FixaMinGata:
 
     [% token_url %]
 
diff --git a/templates/email/fixamingata/alert-problem-area.html b/templates/email/fixamingata/alert-problem-area.html
new file mode 100644
index 000000000..45e1b7db5
--- /dev/null
+++ b/templates/email/fixamingata/alert-problem-area.html
@@ -0,0 +1,19 @@
+[%
+
+email_summary = "Nya rapporter i " _ area_name _ " på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Nya rapporter inom [% area_name %]</h1>
+  [%~ INCLUDE '_email_report_list.html' %]
+
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration på nya rapporter i [% area_name %]</a></p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-problem-council.html b/templates/email/fixamingata/alert-problem-council.html
new file mode 100644
index 000000000..4f4df5820
--- /dev/null
+++ b/templates/email/fixamingata/alert-problem-council.html
@@ -0,0 +1,19 @@
+[%
+
+email_summary = "Nya rapporter i ${ area_name } på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Nya rapporter inom [% area_name %]</h1>
+  [%~ INCLUDE '_email_report_list.html' %]
+
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration på nya rapporter i [% area_name %]</a></p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-problem-nearby.html b/templates/email/fixamingata/alert-problem-nearby.html
new file mode 100644
index 000000000..19e086a1a
--- /dev/null
+++ b/templates/email/fixamingata/alert-problem-nearby.html
@@ -0,0 +1,19 @@
+[%
+
+email_summary = "Nya rapporter på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Nya rapporter i din&nbsp;närhet</h1>
+  [%~ INCLUDE '_email_report_list.html' %]
+
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration på den här typen av rapporter</a></p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-problem-nearby.txt b/templates/email/fixamingata/alert-problem-nearby.txt
index e278e0b7b..358032ed5 100644
--- a/templates/email/fixamingata/alert-problem-nearby.txt
+++ b/templates/email/fixamingata/alert-problem-nearby.txt
@@ -1,6 +1,6 @@
 Subject: Nya rapporter på FixaMinGata
 
-Följande rapporter har nyligen lagts till på:
+Följande rapporter har nyligen lagts till i din närhet:
 
 [% INCLUDE '_email_report_list.txt' %]
 
diff --git a/templates/email/fixamingata/alert-problem-ward.html b/templates/email/fixamingata/alert-problem-ward.html
new file mode 100644
index 000000000..b189d56a4
--- /dev/null
+++ b/templates/email/fixamingata/alert-problem-ward.html
@@ -0,0 +1,19 @@
+[%
+
+email_summary = "Nya rapporter i " _ area_name _ " på FixaMinGata"
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Nya rapporter inom [% area_name %]</h1>
+  [%~ INCLUDE '_email_report_list.html' %]
+
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration på nya rapporter i [% area_name %]</a></p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-problem.html b/templates/email/fixamingata/alert-problem.html
new file mode 100644
index 000000000..a91e3d545
--- /dev/null
+++ b/templates/email/fixamingata/alert-problem.html
@@ -0,0 +1,19 @@
+[%
+
+email_summary = "Nya rapporter på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Nya rapporter på FixaMinGata</h1>
+  [%~ INCLUDE '_email_report_list.html' %]
+
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration på nya rapporter</a></p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/alert-update.html b/templates/email/fixamingata/alert-update.html
new file mode 100644
index 000000000..e24bb4e31
--- /dev/null
+++ b/templates/email/fixamingata/alert-update.html
@@ -0,0 +1,25 @@
+[%
+
+title = title | html;
+email_summary = "Ny uppdatering - " _ title;
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Ny uppdatering i <a href="[% problem_url %]">[% title %]</a></h1>
+  [%~ INCLUDE '_email_comment_list.html' %]
+  <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Avsluta min prenumeration kring denna rapport</a></p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/change_email.html b/templates/email/fixamingata/change_email.html
new file mode 100644
index 000000000..c5514fc2f
--- /dev/null
+++ b/templates/email/fixamingata/change_email.html
@@ -0,0 +1,21 @@
+[%
+
+email_summary = "Klicka på den här länken för att ändra din FixaMinGata-epostadress";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Ändra din&nbsp;FixaMinGata-epostadress</h1>
+  <p style="[% p_style %]">Klicka på länken nedan för att bekräfta att du vill uppdatera din epostadress på FixaMinGata.</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% c.uri_for_action( 'auth/token', token ) %]">Ändra min epostadress</a>
+  </p>
+  <p style="[% p_style %]">Om du inte vill ändra din epostadress så behöver du inte göra något.</p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/change_email.txt b/templates/email/fixamingata/change_email.txt
new file mode 100644
index 000000000..c83c9bd3f
--- /dev/null
+++ b/templates/email/fixamingata/change_email.txt
@@ -0,0 +1,10 @@
+Subject: Uppdatera din e-postadress på [% site_name %]
+
+Klicka på länken nedan för att bekräfta att du vill uppdatera din
+e-postadress på [% site_name %].
+
+[% c.uri_for_action( 'auth/token', token ) %]
+
+[% INCLUDE 'signature.txt' %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/confirm_report_sent.txt b/templates/email/fixamingata/confirm_report_sent.txt
new file mode 100644
index 000000000..50b28caf4
--- /dev/null
+++ b/templates/email/fixamingata/confirm_report_sent.txt
@@ -0,0 +1,23 @@
+Subject: [% site_name %] Rapport skickad: [% title %]
+
+Hej,
+
+Tack för att du använder [% site_name %] för att skicka din rapport
+"[% title %]".
+
+Din rapport har nu skickats till [% bodies_name %].
+
+Din rapport är också tillgänglig på [% url %], där andra kan läsa eller
+diskutera kring rapporten.
+
+Du kan lämna uppdateringar på ovanstående sida, men dessa kommer inte att
+skickas till kommunen.
+
+Om du vill skicka en uppdatering till din kommun, gör då detta då de har
+återkopplat till dig, så att du kan svara direkt till kommunen.
+
+Lycka till med att få ditt problem fixat!
+
+[% signature %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/contact.html b/templates/email/fixamingata/contact.html
new file mode 100644
index 000000000..47c828a36
--- /dev/null
+++ b/templates/email/fixamingata/contact.html
@@ -0,0 +1,38 @@
+[%
+
+subject_html = subject | html;
+name = form_name | html;
+email_summary = "&ldquo;" _ subject_html _ "&rdquo; &ndash; Meddelande från " _ name _ " hos " _ host;
+email_footer = "Skickat via " _ host _ " och IP-adressen " _ ip;
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% contact_meta_style %]">
+  <table [% table_reset %]>
+    <tr>
+      <th style="[% contact_th_style %]">Från</th>
+      <td style="[% contact_td_style %]">[% name %] &lt;<a href="mailto:[% em | html %]">[% em | html %]</a>&gt;</td>
+    </tr>
+  </table>
+</th>
+</tr>
+
+<tr>
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">[% subject | html %]</h1>
+  <p style="[% p_style %]">[% message | html %]</p>
+  [%~ IF complaint %]
+  <p style="[% secondary_p_style %]">
+    [% complaint | html %]
+    - <a href="[% problem_url %]">Rapport</a>
+    - <a href="[% admin_url %]">Administratörskontrollpanel</a>
+  </p>
+  [%~ END %]
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/login.html b/templates/email/fixamingata/login.html
new file mode 100644
index 000000000..ade57f912
--- /dev/null
+++ b/templates/email/fixamingata/login.html
@@ -0,0 +1,21 @@
+[%
+
+email_summary = "Klicka på knappen för att bekräfta din e-postadress och logga in på FixaMinGata";
+email_columns = 1;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% only_column_style %]">
+  <h1 style="[% h1_style %]">Välkommen till FixaMinGata!</h1>
+  <p style="[% p_style %]">För att bekräfta din epostadress måste du nu klicka på knappen nedan.</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% c.uri_for_action( 'auth/token', token ) %]">Bekräfta min epostadress</a>
+  </p>
+  <p style="[% p_style %]">Du kommer sedan att kunna se dina rapporter och hantera dem via sajten.</p>
+</th>
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/login.txt b/templates/email/fixamingata/login.txt
index defcb57cb..e3d8f9f27 100644
--- a/templates/email/fixamingata/login.txt
+++ b/templates/email/fixamingata/login.txt
@@ -1,4 +1,4 @@
-Subject: [% loc('Your FixMyStreet.com account details') %]
+Subject: Ditt FixaMinGata-konto
 
 Välkommen till FixaMinGata!
 
@@ -6,7 +6,6 @@ För att bekräfta din epostadress måste du nu klicka på länken nedan.
 Du kommer sedan att kunna se dina rapporter och hantera dem via
 webbsidan.
 
-
 [% c.uri_for_action( 'auth/token', token ) %]
 
 [% INCLUDE 'signature.txt' %]
diff --git a/templates/email/fixamingata/other-reported.html b/templates/email/fixamingata/other-reported.html
new file mode 100644
index 000000000..3ba29dcb0
--- /dev/null
+++ b/templates/email/fixamingata/other-reported.html
@@ -0,0 +1,30 @@
+[%
+
+email_summary = "Tack för att du loggade din rapport";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Din rapport har&nbsp;loggats</h1>
+  <p style="[% p_style %]">Din rapport till [% report.body %] har blivit loggad på [% site_name %].
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Eftersom [% c.cobrand.council_name %] inte är ansvarig för den här typen av
+rapporter, så kommer rapporten istället att skickas till [% report.body %].
+[% END %]
+  </p>
+  <p style="margin: 20px auto; text-align: center">
+  <a style="[% button_style %]" href="[% cobrand.base_url_for_report(report) %][% report.url %]">Visa min rapport</a>
+  </p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/other-reported.txt b/templates/email/fixamingata/other-reported.txt
new file mode 100644
index 000000000..f530f788e
--- /dev/null
+++ b/templates/email/fixamingata/other-reported.txt
@@ -0,0 +1,26 @@
+Subject: Din rapport har&nbsp;loggats: [% report.title %]
+
+Hej [% report.name %],
+
+Din rapport till [% report.body %] har blivit loggad på [% site_name %].
+
+[% IF c.cobrand.is_council && !c.cobrand.owns_problem( report ) %]
+Eftersom [% c.cobrand.council_name %] inte är ansvarig för den här typen av
+rapporter, så kommer rapporten istället att skickas till [% report.body %].
+[% END %]
+
+Du kan se din rapport på:
+
+[% cobrand.base_url_for_report(report) %][% report.url %]
+
+Din rapport har titeln:
+
+[% report.title %]
+
+Och detaljerna:
+
+[% report.detail %]
+
+[% INCLUDE 'signature.txt' %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/other-updated.html b/templates/email/fixamingata/other-updated.html
new file mode 100644
index 000000000..7be360ef7
--- /dev/null
+++ b/templates/email/fixamingata/other-updated.html
@@ -0,0 +1,26 @@
+[%
+
+email_summary = "Tack för att du loggade din uppdatering";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Din uppdatering har&nbsp;loggats</h1>
+  <p style="[% p_style %]">Din uppdatering har blivit loggad på [% site_name %]:</p>
+  <p style="margin: 20px auto; text-align: center">
+  <a style="[% button_style %]" href="[% cobrand.base_url_for_report(problem) %][% problem.url %]#update_[% update.id %]">Visa min uppdatering</a>
+  </p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html'
+    object = update
+    report = problem %]
+    <p style="[% secondary_p_style %]">[% update.text | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/other-updated.txt b/templates/email/fixamingata/other-updated.txt
new file mode 100644
index 000000000..2010511e9
--- /dev/null
+++ b/templates/email/fixamingata/other-updated.txt
@@ -0,0 +1,15 @@
+Subject: Din uppdatering har loggats
+
+Hej [% update.name %],
+
+Din uppdatering har blivit loggad på [% site_name %]:
+
+[% cobrand.base_url_for_report(problem) %][% problem.url %]#update_[% update.id %]
+
+Din uppdatering:
+
+[% update.text %]
+
+[% INCLUDE 'signature.txt' %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/problem-confirm-not-sending.html b/templates/email/fixamingata/problem-confirm-not-sending.html
new file mode 100644
index 000000000..0a06d2880
--- /dev/null
+++ b/templates/email/fixamingata/problem-confirm-not-sending.html
@@ -0,0 +1,30 @@
+[%
+
+email_summary = "Du måste bekräfta din FixaMinGata-rapport innan den kan visas på sajten";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Bekräfta din&nbsp;FixaMinGata-rapport</h1>
+  <p style="[% p_style %]">För att bekräfta den rapport som du nyligen lade in på FixaMinGata
+måste du klicka på nedanstående länk. Notera att din rapport inte kommer att
+skickas till kommunen.</p>
+  <p style="[% p_style %]">Din rapport kommer också att visas på FixaMinGata.</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% token_url %]">Skicka min rapport</a>
+  </p>
+  <p style="[% p_style %]">Om du inte vill skicka din rapport så behöver du inte göra något.</p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/problem-confirm-not-sending.txt b/templates/email/fixamingata/problem-confirm-not-sending.txt
new file mode 100644
index 000000000..0ec162063
--- /dev/null
+++ b/templates/email/fixamingata/problem-confirm-not-sending.txt
@@ -0,0 +1,22 @@
+Subject: Bekräfta din rapport på [% INCLUDE 'site-name.txt' | trim %]
+
+Hej [% report.name %],
+
+För att bekräfta den rapport som du nyligen lade in på FixaMinGata
+måste du klicka på nedanstående länk. Notera att din rapport inte
+kommer att skickas till kommunen.
+
+[% token_url %]
+
+Om det inte går att klicka på länken kan du kopiera den och klistra in
+i adressfältet på din webläsare.
+
+Din rapport har titeln: [% report.title %]
+
+Du har angivit följande information om problemet:
+
+[% report.detail %]
+
+[% INCLUDE 'signature.txt' %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/problem-confirm.html b/templates/email/fixamingata/problem-confirm.html
new file mode 100644
index 000000000..8e2828f25
--- /dev/null
+++ b/templates/email/fixamingata/problem-confirm.html
@@ -0,0 +1,29 @@
+[%
+
+email_summary = "Du måste bekräfta din FixaMinGata-rapport innan den kan skickas till ${ report.body }";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Bekräfta din&nbsp;FixaMinGata-rapport</h1>
+  <p style="[% p_style %]">För att bekräfta den rapport som du nyligen lade in på FixaMinGata
+måste du klicka på nedanstående knapp.</p>
+  <p style="[% p_style %]">Din rapport kommer också att visas på FixaMinGata.</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% token_url %]">Skicka min rapport</a>
+  </p>
+  <p style="[% p_style %]">Om du inte vill skicka din rapport så behöver du inte göra något.</p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% report.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/problem-confirm.txt b/templates/email/fixamingata/problem-confirm.txt
index 67bc4b82d..8d020ce5d 100644
--- a/templates/email/fixamingata/problem-confirm.txt
+++ b/templates/email/fixamingata/problem-confirm.txt
@@ -16,5 +16,4 @@ Du har angivit följande information om problemet:
 
 [% report.detail %]
 
-
 [% INCLUDE 'signature.txt' %]
diff --git a/templates/email/fixamingata/problem-moderated.html b/templates/email/fixamingata/problem-moderated.html
new file mode 100644
index 000000000..02bace72f
--- /dev/null
+++ b/templates/email/fixamingata/problem-moderated.html
@@ -0,0 +1,32 @@
+[%
+
+email_summary = "Din rapport på " _ site_name _ " har blivit modererad.";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Din rapport har blivit&nbsp;modererad</h1>
+[% IF types == 'hide' -%]
+  <p style="[% p_style %]">Din rapport har dolts från sajten.</p>
+[% ELSE %]
+  <p style="[% p_style %]">Följande information har ändrats: <strong>[% types %]</strong></p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% report_uri %]">Visa min rapport</a>
+  </p>
+[% END -%]
+  <p style="[% p_style %]">Om du inte tycker att rapporten skulle ha blivit modererad kan du
+kontakta FixaMinGata:s support på <a href="[% report_complain_uri %]">[% report_complain_uri %]</a></p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = problem %]
+    <h2 style="[% h2_style %]">[% problem.moderation_original_data.title | html %]</h2>
+    <p style="[% secondary_p_style %]">[% problem.moderation_original_data.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/problem-moderated.txt b/templates/email/fixamingata/problem-moderated.txt
new file mode 100644
index 000000000..ad03ba421
--- /dev/null
+++ b/templates/email/fixamingata/problem-moderated.txt
@@ -0,0 +1,33 @@
+Subject: Din rapport har blivit modererad
+
+Hej [% user.name %],
+
+Din rapport på [% site_name %] har blivit modererad.
+
+[% IF types == 'hide' -%]
+Din rapport har dolts från sajten.
+[% ELSE %]
+Följande information har ändrats:
+
+	[% types %]
+
+[% END -%]
+
+Din rapport har titeln:
+
+[% problem.moderation_original_data.title %]
+
+Du har angivit följande information om problemet:
+
+[% problem.moderation_original_data.detail %]
+
+[% UNLESS types == 'hide' %]
+Du kan se rapporten på [% report_uri %]
+[% END %]
+
+Om du inte tycker att rapporten skulle ha blivit modererad kan du kontakta
+FixaMinGata:s support på [% report_complain_uri %]
+
+[% INCLUDE 'signature.txt' %]
+
+Det går inte att svara på detta mail.
diff --git a/templates/email/fixamingata/questionnaire.html b/templates/email/fixamingata/questionnaire.html
new file mode 100644
index 000000000..efcfbff89
--- /dev/null
+++ b/templates/email/fixamingata/questionnaire.html
@@ -0,0 +1,30 @@
+[%
+
+title = report.title | html;
+email_summary = "Har du en minut över? Informera oss om vad som hände med din FixaMinGata-rapport om ${ title }.";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Har ditt problem blivit&nbsp;fixat?</h1>
+  <p style="[% p_style %]">[% created %] sedan lämnade du en rapport på FixaMinGata.</p>
+  <p style="[% p_style %]">För att hålla alla rapporter uppdaterade skulle vi uppskatta om du kunde informera oss om huruvida problemet har blivit fixat än:</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% fixed_button_style %]" href="[% url %]">Fixat</a>
+    <a style="[% notfixed_button_style %]" href="[% url %]">Ej fixat</a>
+  </p>
+  <p style="[% p_style %]">Tack! Din feedback är värdefull.</p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% title %]</h2>
+    <p style="[% secondary_p_style %]">[% report.detail | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/reply-autoresponse b/templates/email/fixamingata/reply-autoresponse
index 7935b1717..aee80078f 100644
--- a/templates/email/fixamingata/reply-autoresponse
+++ b/templates/email/fixamingata/reply-autoresponse
@@ -2,7 +2,7 @@ Subject: Automatiskt svar på ditt brev till FixaMinGata
 
 Hej,
 
-det här ett ett automatiskt svar på ditt brev. Ditt brev har inte
+Det här ett ett automatiskt svar på ditt brev. Ditt brev har inte
 lästs eller levererats till någon.
 
 Om du svarar på ett brev om en uppdatering måste du klicka på
diff --git a/templates/email/fixamingata/submit.html b/templates/email/fixamingata/submit.html
new file mode 100644
index 000000000..da4e7f48f
--- /dev/null
+++ b/templates/email/fixamingata/submit.html
@@ -0,0 +1,57 @@
+[%
+
+email_summary = "Det här meddelandet rör en rapport om ett problem i gatumiljön som en medborgare lämnat via tjänsten FixaMinGata";
+email_footer = "Föreningen Sambruk som driver tjänsten ansvarar för en användargrupp som det går bra att gå med i för att få tillgång till ytterligare FixaMinGata-relaterade tjänster och support. Bland annat kan varje kategori ha sin egen e-postadress, och FixaMinGata kan även kopplas mot system som Open311";
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Ny rapport för [% report.body %]</h1>
+  <p style="[% p_style %]">[% missing %][% multiple %]Följande rapport
+tror medborgaren behöver er uppmärksamhet.</p>
+
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% url %]">Visa rapporten</a>
+  </p>
+  <h2 style="[% h2_style %] margin: 30px 0 10px 0">Rapporterad av:</h2>
+  <table [% table_reset %]>
+    <tr>
+      <th style="[% contact_th_style %]">Namn</th>
+      <td style="[% contact_td_style %]">[% name | html %]</td>
+    </tr>
+    <tr>
+      <th style="[% contact_th_style %]">Epost</th>
+      <td style="[% contact_td_style %]"><a href="mailto:[% email | html %]">[% email | html %]</a></td>
+    </tr>
+    [%~ IF phone %]
+      <tr>
+        <th style="[% contact_th_style %]">Telefon</th>
+        <td style="[% contact_td_style %]"><a href="tel:[% phone | html %]">[% phone | html %]</a></td>
+      </tr>
+    [%~ END %]
+  </table>
+  <p style="[% p_style %] margin-top: 0.5em;">Svar på det här brevet kommer att skickas till den person som lämnade rapporten.</p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html' object = report %]
+    <h2 style="[% h2_style %]">[% title | html %]</h2>
+    [%~ IF category_line %]
+    <p style="[% secondary_p_style %]">[% category | html %]</p>
+    [%~ END %]
+    <p style="[% secondary_p_style %]">[% detail | html %]</p>
+    <p style="[% secondary_p_style %]">
+      <strong>Plats:</strong>
+      <a href="[% osm_url %]" title="Se den här platsen på OpenStreetMap">
+        [%~ latitude %], [% longitude ~%]
+      </a>
+      [% IF closest_address %]<br>[% closest_address | trim | replace("\n\n", "<br>") %][% END %]
+    </p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/update-confirm-donotsend.txt b/templates/email/fixamingata/update-confirm-donotsend.txt
new file mode 100644
index 000000000..1dae08ac9
--- /dev/null
+++ b/templates/email/fixamingata/update-confirm-donotsend.txt
@@ -0,0 +1,2 @@
+Notera att vi inte skickar uppdateringar till [% update.problem.body %] - endast
+användare som prenumererar på uppdateringar i ärendet kommer att se ditt inlägg.
diff --git a/templates/email/fixamingata/update-confirm.html b/templates/email/fixamingata/update-confirm.html
new file mode 100644
index 000000000..3953b16fd
--- /dev/null
+++ b/templates/email/fixamingata/update-confirm.html
@@ -0,0 +1,29 @@
+[%
+
+email_summary = "Bekräfta din uppdatering på " _ site_name;
+email_columns = 2;
+
+PROCESS '_email_settings.html';
+
+INCLUDE '_email_top.html';
+
+%]
+
+<th style="[% td_style %][% primary_column_style %]" id="primary_column">
+  [% start_padded_box %]
+  <h1 style="[% h1_style %]">Bekräfta din uppdatering</h1>
+  <p style="[% p_style %]">Vänligen klicka på knappen nedan för att bekräfta den uppdatering du just lämnade:</p>
+  <p style="margin: 20px auto; text-align: center">
+    <a style="[% button_style %]" href="[% token_url %]">Bekräfta min uppdatering</a>
+  </p>
+  <p style="[% p_style %]">[% INCLUDE 'update-confirm-donotsend.txt' %]</p>
+  <p style="[% p_style %]">Om du inte vill bekräfta din uppdatering behöver du inte göra något.</p>
+  [% end_padded_box %]
+</th>
+[% WRAPPER '_email_sidebar.html'
+    object = update
+    report = problem %]
+    <p style="[% secondary_p_style %]">[% update.text | html %]</p>
+[% END %]
+
+[% INCLUDE '_email_bottom.html' %]
diff --git a/templates/email/fixamingata/update-confirm.txt b/templates/email/fixamingata/update-confirm.txt
index 6ef35f83d..6670bd0ea 100644
--- a/templates/email/fixamingata/update-confirm.txt
+++ b/templates/email/fixamingata/update-confirm.txt
@@ -2,7 +2,7 @@ Subject: Bekräfta din uppdatering på [% INCLUDE 'site-name.txt' | trim %]
 
 Hej [% update.name %],
 
-vänligen klicka på länken nedan för att bekräfta den uppdatering du
+Vänligen klicka på länken nedan för att bekräfta den uppdatering du
 just lämnade:
 
 [% token_url %]
diff --git a/templates/web/base/report/new/form_report.html b/templates/web/base/report/new/form_report.html
index e85d890c9..1d1a0e289 100644
--- a/templates/web/base/report/new/form_report.html
+++ b/templates/web/base/report/new/form_report.html
@@ -22,6 +22,8 @@
 [% END %]
     <input class="form-control" type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('10 inch pothole on Example St, near post box') %]" required>
 
+[% TRY %][% PROCESS 'report/new/after_title.html' %][% CATCH file %][% END %]
+
 [% IF c.cobrand.allow_photo_upload %]
     <input type="hidden" name="upload_fileid" value="[% upload_fileid %]">
     <label for="form_photo">
diff --git a/templates/web/fixamingata/about/faq-sv.html b/templates/web/fixamingata/about/faq-sv.html
index aea90743b..05ffdaddc 100755
--- a/templates/web/fixamingata/about/faq-sv.html
+++ b/templates/web/fixamingata/about/faq-sv.html
@@ -21,8 +21,6 @@ markera problemen på en karta. Tjänsten bygger på en förlaga från Storbrita
 där tjänsten lanserades i Februari 2007. I Norge lanserades den 2011 och i
 Sverige 2013.
 </dd>
-        <dt>Hur kan jag lämna ett förbättringsförslag kring FixaMinGata?</dt>
-        <dd>Lämna ditt förslag <a href="javascript:UserVoice.showPopupWidget();">här</a>.</dd>
         <dt>Hur kommer jag i kontakt med FixaMinGata?</dt>
         <dd>Använd vårt <a href="/contact">kontaktformulär</a>.</dd>
         <dt>Vilken typ av problem ska jag rapportera i FixaMinGata?</dt>
diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html
index 7fd490129..ad4d6c4a6 100644
--- a/templates/web/fixamingata/footer.html
+++ b/templates/web/fixamingata/footer.html
@@ -21,7 +21,6 @@
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END
                             %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>
-                          <!-- <li><a href="javascript:UserVoice.showPopupWidget();">Lämna förslag</a></li> -->
                     </ul>
                 </div>
             </div>
@@ -29,15 +28,6 @@
     </div> <!-- .wrapper -->
 
     [% INCLUDE 'common_footer_tags.html' %]
-
-<script type="text/javascript">
-  var uvOptions = {};
-  (function() {
-    var uv = document.createElement('script'); uv.type = 'text/javascript'; uv.async = true;
-    uv.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'widget.uservoice.com/vflswzMnwvfytYBz1rNw.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(uv, s);
-  })();
-</script>
 </body>
 
 </html>
diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html
index fd309708f..038343d90 100644
--- a/templates/web/fixamingata/front/tips.html
+++ b/templates/web/fixamingata/front/tips.html
@@ -1 +1 @@
-<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div>
+<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/uyiRyuIV0qY" frameborder="0" allowfullscreen></iframe></div>
diff --git a/templates/web/fixamingata/header_opengraph_image.html b/templates/web/fixamingata/header_opengraph_image.html
index 7ec1aabb0..7a681484a 100644
--- a/templates/web/fixamingata/header_opengraph_image.html
+++ b/templates/web/fixamingata/header_opengraph_image.html
@@ -1,4 +1,4 @@
-        <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixmystreet/images/fms-og_image.jpg">
+        <meta property="og:image" content="[% c.cobrand.base_url %]/cobrands/fixamingata/images/fms-og_image.jpg">
         <meta property="og:image:type" content="image/jpeg">
         <meta property="og:image:width" content="1200">
         <meta property="og:image:height" content="630">
diff --git a/templates/web/fixamingata/report/new/after_title.html b/templates/web/fixamingata/report/new/after_title.html
new file mode 100644
index 000000000..ff38624f5
--- /dev/null
+++ b/templates/web/fixamingata/report/new/after_title.html
@@ -0,0 +1,8 @@
+<div class="description_tips" aria-label="Allmänna riktlinjer kring rapporter">
+    <ul class="do">
+        <li>Rapportera endast fysiska problem som kan åtgärdas</li>
+    </ul>
+    <ul class="dont">
+        <li>Använd inte FixaMinGata för rena synpunkter och förslag</li>
+    </ul>
+</div>
diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html
index 4fab9c81c..5bce67257 100644
--- a/templates/web/fixamingata/report/new/inline-tips.html
+++ b/templates/web/fixamingata/report/new/inline-tips.html
@@ -8,7 +8,6 @@
     </ul>
     <ul class="dont">
         <li>Vid akut situation används inte FixaMinGata (ex. vattenläckor)</li>
-        <li>Använd inte FixaMinGata för rena synpunkter och förslag</li>
         <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li>
     </ul>
 </div>
diff --git a/templates/web/fixamingata/report/new/notes.html b/templates/web/fixamingata/report/new/notes.html
deleted file mode 100644
index 9ec6b0e29..000000000
--- a/templates/web/fixamingata/report/new/notes.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ul class="plain-list">
-[% IF all_councils.items.first > 0 %]
-    <li style="margin-bottom: 0em;">[% id = all_councils.items.first;
-           tprintf("Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via <a href='%s'>deras webbsida</a>.", all_body_urls.$id); %]</li>
-[% ELSE %]
-    <li style="margin-bottom: 0em;">[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</li>
-[% END %]
-</ul>
diff --git a/templates/web/fixamingata/report/new/sidebar.html b/templates/web/fixamingata/report/new/sidebar.html
index 972fccf53..e69de29bb 100644
--- a/templates/web/fixamingata/report/new/sidebar.html
+++ b/templates/web/fixamingata/report/new/sidebar.html
@@ -1,5 +0,0 @@
-<div id="report-a-problem-sidebar">
-    <div class="sidebar-notes">
-        [% INCLUDE 'report/new/notes.html' %]
-    </div>
-</div>
diff --git a/web/cobrands/fixamingata/images/email-logo.gif b/web/cobrands/fixamingata/images/email-logo.gif
new file mode 100644
index 000000000..85d6d73a1
Binary files /dev/null and b/web/cobrands/fixamingata/images/email-logo.gif differ
diff --git a/web/cobrands/fixamingata/images/email-logo.svg b/web/cobrands/fixamingata/images/email-logo.svg
new file mode 100644
index 000000000..87e40d774
--- /dev/null
+++ b/web/cobrands/fixamingata/images/email-logo.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 744.09448819 1052.3622047"
+   id="svg3372"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="email-logo.svg">
+  <defs
+     id="defs3374" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="202.78009"
+     inkscape:cy="39.85132"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="3840"
+     inkscape:window-height="2031"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3377">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#eeeeee;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3380"
+       width="606.42853"
+       height="102.5"
+       x="12.857142"
+       y="937.71936" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#20bbdf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.54330707;marker:none;enable-background:accumulate"
+       d="m 58.197149,939.92667 c -23.83446,0 -43.15204,19.31758 -43.15204,43.15202 0,20.03231 13.64373,36.87581 32.14919,41.74021 l 10.5962,13.5502 10.389,-13.297 c 19.02022,-4.5053 33.177351,-21.5959 33.177351,-41.99341 0,-23.83444 -19.325241,-43.15202 -43.159701,-43.15202 z"
+       id="path2982-5-04-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:15;marker:none;enable-background:accumulate"
+       d="m 58.197149,956.23912 c -14.80226,0 -26.83958,12.0373 -26.83958,26.83957 0,14.80226 12.03732,26.84731 26.83958,26.84731 14.802269,0 26.83959,-12.04505 26.83959,-26.84731 0,-14.80227 -12.037321,-26.83957 -26.83959,-26.83957 z m 0,3.68296 c 12.811849,0 23.15663,10.34476 23.15663,23.15661 0,12.81184 -10.344781,23.16431 -23.15663,23.16431 -12.81184,0 -23.15662,-10.35247 -23.15662,-23.16431 0,-5.77595 2.1014,-11.04869 5.58582,-15.10015 l 8.25598,8.25598 1.70337,1.71105 0.8747,0.8747 4.05126,4.04358 c 0.0488,0.0488 0.0937,0.0954 0.14577,0.13811 0.002,0.003 0.006,0 0.008,0 0.0505,0.0411 0.1003,0.0797 0.15345,0.1151 0.002,0 0.006,-0.003 0.008,0 0.0531,0.0352 0.10578,0.0703 0.16114,0.0997 0.0591,0.0318 0.1153,0.0592 0.17647,0.0844 0.0593,0.0243 0.11569,0.0431 0.17648,0.0614 0.12432,0.0381 0.24797,0.0642 0.37596,0.0767 0.12488,0.0123 0.25111,0.0123 0.37598,0 0.18729,-0.0181 0.3749,-0.065 0.55245,-0.13811 0.23706,-0.0975 0.45708,-0.24224 0.65218,-0.43736 0.0488,-0.0488 0.0954,-0.10141 0.13811,-0.15346 0.17071,-0.20834 0.29515,-0.43926 0.36829,-0.68287 0.0366,-0.12181 0.0569,-0.24295 0.0691,-0.3683 0.012,-0.12284 0.0115,-0.25309 0,-0.37598 -2.4e-4,-0.003 0,-0.005 0,-0.008 -0.0123,-0.12534 -0.0325,-0.24646 -0.0691,-0.3683 -0.0177,-0.0587 -0.0458,-0.1192 -0.069,-0.17646 0,-0.003 0,-0.006 0,-0.008 -0.0976,-0.23745 -0.24224,-0.45707 -0.43736,-0.6522 l -4.04358,-4.04357 -0.8747,-0.87471 -1.71106,-1.71105 -8.22528,-8.22529 c 4.00409,-3.30702 9.14362,-5.29423 14.75488,-5.29423 z m -0.45271,8.17157 c -0.44829,0 -0.89179,0.17057 -1.23531,0.51407 l -3.97453,3.96686 1.71103,1.71104 5.20987,-5.20985 -0.46806,-0.46805 c -0.34349,-0.3435 -0.79468,-0.51407 -1.243,-0.51407 z m 2.58576,1.85682 -5.20987,5.20985 4.0436,4.04359 c 1.24631,1.24632 1.24631,3.28066 0,4.52698 -1.24631,1.24631 -3.28066,1.24631 -4.52697,0 l -4.0436,-4.0436 -5.14846,5.14849 11.92359,11.92359 c 0,0 8.68093,0.91011 12.176779,-2.58576 3.49587,-3.49585 2.70852,-12.29955 2.70852,-12.29955 L 60.330199,969.95047 Z m -7.0897,6.92856 c 0.23004,0 0.46133,0.0854 0.63683,0.26088 0.35101,0.35101 0.35101,0.92268 0,1.27369 -0.35101,0.35101 -0.92268,0.35101 -1.27369,0 -0.35101,-0.35101 -0.35101,-0.92268 0,-1.27369 0.17551,-0.1755 0.40682,-0.26088 0.63686,-0.26088 z m -5.23288,0.22253 -3.90548,3.90546 c -0.68702,0.68702 -0.68702,1.79898 0,2.486 l 0.46805,0.46806 5.14846,-5.14849 -1.71103,-1.71103 z m 8.77005,3.30698 c 0.23003,0 0.45366,0.0931 0.62917,0.26856 0.35101,0.35101 0.35101,0.915 0,1.266 -0.35101,0.35102 -0.915,0.35102 -1.26601,0 -0.35101,-0.351 -0.35101,-0.91499 0,-1.266 0.17551,-0.17551 0.40682,-0.26856 0.63684,-0.26856 z"
+       id="rect3772-9-2-4"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:75.55453491px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+       x="123.43143"
+       y="1023.8945"
+       id="text4249-3"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4251-8"
+         x="123.43143"
+         y="1023.8945"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:75.55453491px;line-height:125%;font-family:ChunkFive;-inkscape-font-specification:ChunkFive;text-align:start;writing-mode:lr-tb;text-anchor:start">FixaMinGata</tspan></text>
+  </g>
+</svg>
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index cacf88dd9..549da6ebe 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -570,7 +570,8 @@ var fixmystreet = fixmystreet || {};
                 'Show pins', 'Hide pins',
                 'Dangos pinnau', 'Cuddio pinnau',
                 "Vis nåler", "Skjul nåler",
-                "Zeige Stecknadeln", "Stecknadeln ausblenden"
+                "Zeige Stecknadeln", "Stecknadeln ausblenden",
+                'Visa kartnålar', 'Göm kartnålar'
             ];
             for (var i=0; i<showhide.length; i+=2) {
                 if (this.innerHTML == showhide[i]) {
diff --git a/web/js/map-google.js b/web/js/map-google.js
index be2df8502..7155a372e 100644
--- a/web/js/map-google.js
+++ b/web/js/map-google.js
@@ -218,7 +218,8 @@ fixmystreet.maps = {};
                 'Show pins', 'Hide pins',
                 'Dangos pinnau', 'Cuddio pinnau',
                 "Vis nåler", "Gjem nåler",
-                "Zeige Stecknadeln", "Stecknadeln ausblenden"
+                "Zeige Stecknadeln", "Stecknadeln ausblenden",
+                'Visa kartnålar', 'Göm kartnålar'
             ];
             for (i=0; i<showhide.length; i+=2) {
                 if (this.innerHTML == showhide[i]) {
-- 
cgit v1.2.3