13 files changed, 151 insertions, 608 deletions
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 87b56efd8..6778c4ef3 100644
--- a/locale/FixMyStreet.po
+++ b/locale/FixMyStreet.po
@@ -2296,611 +2296,3 @@ msgstr ""
 msgid "Not reported before"
 msgstr ""
 
-#. Please leave the first word "Subject:" untranslated
-
-#: templates/emails/alert-confirm
-msgid ""
-"Subject: Confirm your alert on FixMyStreet\n"
-"\n"
-"Hi,\n"
-"\n"
-"Please click on the link below to confirm the alert you just\n"
-"asked to subscribe to on FixMyStreet:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"If you can't click the link, please copy and paste it to the\n"
-"address bar of your web browser.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/alert-problem
-msgid ""
-"Subject: New problems on FixMyStreet\n"
-"\n"
-"The following new problems have been added:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are new problems,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/alert-problem-area
-msgid ""
-"Subject: New problems in <?=$values['area_name']?> on FixMyStreet\n"
-"\n"
-"The following new problems have been added within\n"
-"<?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are new problems in\n"
-"<?=$values['area_name']?>, please follow this link: \n"
-"<?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/alert-problem-council
-msgid ""
-"Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet\n"
-"\n"
-"The following new problems have been reported to <?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are new problems reported to\n"
-"<?=$values['area_name']?>, please follow this link: \n"
-"<?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/alert-problem-nearby
-msgid ""
-"Subject: New nearby problems on FixMyStreet\n"
-"\n"
-"The following nearby problems have been added:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are nearby problems,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/alert-problem-ward
-msgid ""
-"Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet\n"
-"\n"
-"The following new problems have been reported to <?=$values['area_name']?>\n"
-"within <?=$values['ward_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are new problems reported to\n"
-"<?=$values['area_name']?> within <?=$values['ward_name']?>,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/alert-update
-msgid ""
-"Subject: New updates on problem - '<?=$values['title']?>'\n"
-"\n"
-"The following updates have been left on this problem:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"<?=$values['state_message']?>\n"
-"\n"
-"To view or reply to these updates, please visit the following URL:\n"
-"    <?=$values['problem_url']?>\n"
-"\n"
-"You cannot contact anyone by replying to this email.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"To stop receiving emails when there are new updates on this problem,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/empty property-confirm
-msgid ""
-"Subject: Confirm your empty property report\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Please click on the link below to confirm the empty property\n"
-"report you just added to the site:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"If your email program does not let you click on this link,\n"
-"copy and paste it into your web browser and press return.\n"
-"\n"
-"Your report had the subject:\n"
-"<?=$values['title']?>\n"
-"\n"
-"And details:\n"
-"<?=$values['detail']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-msgstr ""
-
-#: templates/emails/flickr-confirm
-msgid ""
-"Subject: Confirm your email address on FixMyStreet\n"
-"\n"
-"Hi,\n"
-"\n"
-"Please click on the link below to confirm the email address\n"
-"you just gave to FixMyStreet:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"This is so we can look up the photos you tag with FixMyStreet,\n"
-"and send you an email letting you know about your new problems.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/flickr-submit
-msgid ""
-"Subject: New photo pulled from Flickr to FixMyStreet\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"We've fetched a photo you uploaded to Flickr and tagged with\n"
-"FixMyStreet. To check the details we have, and to add any more,\n"
-"please visit the following URL:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"Then we can send your photo to the council. Thanks!\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/partial
-msgid ""
-"Subject: Confirm your report on FixMyStreet\n"
-"\n"
-"Hi<?=$values['name']?>,\n"
-"\n"
-"To confirm the report you have uploaded to FixMyStreet via\n"
-"<?=$values['service']?>, and to check or add any details,\n"
-"please visit the following URL:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"Thanks!\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/problem-confirm
-msgid ""
-"Subject: Confirm your problem on FixMyStreet\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Please click on the link below to confirm the problem you just\n"
-"added to FixMyStreet:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"If your email program does not let you click on this link,\n"
-"copy and paste it into your web browser and press return.\n"
-"\n"
-"Your problem had the title:\n"
-"<?=$values['title']?>\n"
-"\n"
-"And details:\n"
-"<?=$values['detail']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/questionnaire
-msgid ""
-"Subject: Questionnaire about your problem on FixMyStreet\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"<?=$values['created']?> ago, you left a problem on FixMyStreet\n"
-"with the details provided at the end of this email. To keep our\n"
-"site up to date and relevant, we'd appreciate it if you could\n"
-"follow the link below and fill in our short questionnaire\n"
-"updating the status of your problem:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"Please do not reply to this email; there is a public comment\n"
-"box on the questionnaire.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"Your problem was as follows:\n"
-"\n"
-"<?=$values['title']?>\n"
-"\n"
-"<?=$values['detail']?>\n"
-"\n"
-msgstr ""
-
-#: templates/emails/questionnaire-eha-26weeks
-msgid ""
-"Subject: Questionnaire about your empty property report\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Six months ago, you reported an empty home on ReportEmptyHomes.com with the\n"
-"details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
-"us what has happened: \n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"Please do not reply to this email; there is a public comment\n"
-"box on the questionnaire.\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"Your report was as follows:\n"
-"\n"
-"<?=$values['title']?>\n"
-"\n"
-"Property type: <?=$values['category']?>\n"
-"\n"
-"<?=$values['detail']?>\n"
-"\n"
-msgstr ""
-
-#: templates/emails/questionnaire-eha-4weeks
-msgid ""
-"Subject: Questionnaire about your empty property report\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Four weeks ago, you reported an empty home on ReportEmptyHomes.com with the\n"
-"details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
-"us what has happened:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"Please do not reply to this email; there is a public comment\n"
-"box on the questionnaire.\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"Your report was as follows:\n"
-"\n"
-"<?=$values['title']?>\n"
-"\n"
-"Property type: <?=$values['category']?>\n"
-"\n"
-"<?=$values['detail']?>\n"
-"\n"
-msgstr ""
-
-#: templates/emails/reply-autoresponse
-msgid ""
-"Subject: Automatic reply to your message to FixMyStreet\n"
-"\n"
-"Hi,\n"
-"\n"
-"This is an automatic response to your email; your email has not been delivered.\n"
-"\n"
-"If you're replying to an email about a report update, please visit\n"
-"the URL given in the email in order to leave a reply. You cannot\n"
-"reply to an update via email.\n"
-"\n"
-"If you are trying to confirm something, such as a report or an email\n"
-"alert, please click the link in the email that we sent you, or, if\n"
-"you cannot click the link, copy and paste it into the address bar of\n"
-"your web browser.\n"
-"\n"
-"If you're trying to unsubscribe from an email alert, there is an\n"
-"unsubscribe link at the bottom of the email.\n"
-"\n"
-"If you have a question or comment about the site, please send your\n"
-"email to team@fixmystreet.com\n"
-"\n"
-"Yours,\n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/submit-brent
-msgid ""
-"Subject: FMS Problem Report: <?=$values['title']?>\n"
-"\n"
-"Dear <?=$values['councils_name']?>,\n"
-"\n"
-"<?=$values['missing']?><?=$values['multiple']?>A user of\n"
-"FixMyStreet has submitted the following report\n"
-"of a local problem that they believe might require your attention.\n"
-"\n"
-"<?=$values['fuzzy']?>, or to provide an update on the problem,\n"
-"please visit the following link:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"<?=$values['has_photo']?>----------\n"
-"\n"
-"Name: <?=$values['name']?>\n"
-"\n"
-"Email: <?=$values['email']?>\n"
-"\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
-"\n"
-"Details: <?=$values['detail']?>\n"
-"\n"
-"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
-"\n"
-"Longitude: <?=$values['longitude']?>\n"
-"\n"
-"<?=$values['closest_address_machine']?>----------\n"
-"\n"
-"Replies to this email will go to the user who submitted the problem.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"[ This message was sent via FixMyStreet, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
-"This will help improve the service for local people. We\n"
-"also welcome any other feedback you may have. ]\n"
-"\n"
-msgstr ""
-
-#: templates/emails/submit-council
-msgid ""
-"Subject: Problem Report: <?=$values['title']?>\n"
-"\n"
-"Dear <?=$values['councils_name']?>,\n"
-"\n"
-"<?=$values['missing']?><?=$values['multiple']?>A user of\n"
-"FixMyStreet has submitted the following report\n"
-"of a local problem that they believe might require your attention.\n"
-"\n"
-"<?=$values['fuzzy']?>, or to provide an update on the problem,\n"
-"please visit the following link:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"<?=$values['has_photo']?>----------\n"
-"\n"
-"Name: <?=$values['name']?>\n"
-"\n"
-"Email: <?=$values['email']?>\n"
-"\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
-"\n"
-"Details: <?=$values['detail']?>\n"
-"\n"
-"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
-"\n"
-"Longitude: <?=$values['longitude']?>\n"
-"\n"
-"<?=$values['closest_address']?>----------\n"
-"\n"
-"Replies to this email will go to the user who submitted the problem.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-"\n"
-"[ This message was sent via FixMyStreet, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
-"This will help improve the service for local people. We\n"
-"also welcome any other feedback you may have. ]\n"
-"\n"
-msgstr ""
-
-#: templates/emails/submit-eha
-msgid ""
-"Subject: Empty property report\n"
-"\n"
-"Dear Empty Property Officer,\n"
-"\n"
-"This is a new referral of an empty property in your area made by a user of the\n"
-"website ReportEmptyHomes.com; the website user has been told that the case has\n"
-"been referred to you.  We would be grateful if you could do whatever you can to\n"
-"help get this property back into use. We will contact the user in a month and\n"
-"again in six months and ask them what has happened to the property.  \n"
-"\n"
-"We'd encourage you to tell us what you have done, and when the property comes\n"
-"back into use, by filling in an update against the property referral on the\n"
-"website:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"This gives useful feedback to website users and helps them understand what\n"
-"action you are taking. We will offer advice to the user on other action they\n"
-"might take if the property isn't successfully dealt with.  \n"
-"\n"
-"<?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use\n"
-"there is lots of useful information on the Empty Homes Agency's website\n"
-"www.EmptyHomes.com - if you have further questions please give us a call. \n"
-"\n"
-"----------\n"
-"\n"
-"Name: <?=$values['name']?>\n"
-"\n"
-"Email: <?=$values['email']?>\n"
-"\n"
-"<?=$values['phone_line']?>Subject: <?=$values['title']?>\n"
-"\n"
-"Property type: <?=$values['category']?>\n"
-"\n"
-"Details: <?=$values['detail']?>\n"
-"\n"
-"<?=$values['closest_address']?>----------\n"
-"\n"
-"Replies to this email will go to the user who submitted the report, if\n"
-"you would like to ask for any further information.\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-msgstr ""
-
-#: templates/emails/tms-confirm
-msgid ""
-"Subject: Confirm your expression of interest in TextMyStreet\n"
-"\n"
-"Hi,\n"
-"\n"
-"Please click on the link below to confirm your expression of\n"
-"interest in TextMyStreet:\n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"If you can't click the link, please copy and paste it to the\n"
-"address bar of your web browser.\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/update-confirm
-msgid ""
-"Subject: Confirm your update on FixMyStreet\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Please click on the link below to confirm the update you just wrote:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"If you can't click the link, please copy and paste it to the\n"
-"address bar of your web browser.\n"
-"\n"
-"Your update reads:\n"
-"\n"
-"<?=$values['update']?>\n"
-"\n"
-"Yours,  \n"
-"The FixMyStreet team\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-problem
-msgid ""
-"Subject: New empty properties on reportemptyhomes.com\n"
-"\n"
-"The following empty properties have been added:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are new properties,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-problem-area
-msgid ""
-"Subject: New empty properties in <?=$values['area_name']?> on reportemptyhomes.com\n"
-"\n"
-"The following empty properties have been added within\n"
-"<?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are new properties in\n"
-"<?=$values['area_name']?>, please follow this link: \n"
-"<?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-problem-council
-msgid ""
-"Subject: New empty properties reported to <?=$values['area_name']?> on reportemptyhomes.com\n"
-"\n"
-"The following empty properties have been reported to <?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are new properties reported to\n"
-"<?=$values['area_name']?>, please follow this link: \n"
-"<?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-problem-nearby
-msgid ""
-"Subject: New nearby empty properties on reportemptyhomes.com\n"
-"\n"
-"The following nearby empty properties have been added:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are nearby properties,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-problem-ward
-msgid ""
-"Subject: New empty properties reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com\n"
-"\n"
-"The following empty properties have been reported to <?=$values['area_name']?>\n"
-"within <?=$values['ward_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are new properties reported to\n"
-"<?=$values['area_name']?> within <?=$values['ward_name']?>,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
-
-#: templates/emails/emptyhomes/alert-update
-msgid ""
-"Subject: New updates on empty property- '<?=$values['title']?>'\n"
-"\n"
-"The following updates have been left on this empty property:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"View or reply to these updates: <?=$values['problem_url']?>\n"
-"\n"
-"Yours,  \n"
-"reportemptyhomes.com\n"
-"\n"
-"To stop receiving emails when there are new updates on this property,\n"
-"please follow this link: <?=$values['unsubscribe_url']?>\n"
-msgstr ""
diff --git a/templates/email/emptyhomes/cy/alert-problem-area.txt b/templates/email/emptyhomes/cy/alert-problem-area.txt
new file mode 100644
index 000000000..c7712f62f
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-problem-area.txt
@@ -0,0 +1,13 @@
+Subject: Adroddiadau newydd am eiddo gwag yn ardal <?=$values['area_name']?> ar reportemptyhomes.com
+
+Mae'r eiddo gwag canlynol wedi cael eu hychwanegu yn ardal
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos yn ardal
+<?=$values['area_name']?>, dilynwch y ddolen hon: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/cy/alert-problem-council.txt b/templates/email/emptyhomes/cy/alert-problem-council.txt
new file mode 100644
index 000000000..678e3fa9f
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-problem-council.txt
@@ -0,0 +1,12 @@
+Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?> ar reportemptyhomes.com
+
+Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo gwag newydd eu hysbysu i ardal 
+<?=$values['area_name']?>, dilynwch y ddolen hon: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/cy/alert-problem-nearby.txt b/templates/email/emptyhomes/cy/alert-problem-nearby.txt
new file mode 100644
index 000000000..b72d68979
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-problem-nearby.txt
@@ -0,0 +1,11 @@
+Subject: Eiddo gwag cyfagos newydd ar reportemptyhomes.com
+
+Mae'r eiddo gwag cyfagos newydd wedi cael eu hychwanegu:
+
+<?=$values['data']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo gerllaw,
+dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/cy/alert-problem-ward.txt b/templates/email/emptyhomes/cy/alert-problem-ward.txt
new file mode 100644
index 000000000..603c55fa0
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-problem-ward.txt
@@ -0,0 +1,13 @@
+Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?>, yn ward <?=$values['ward_name']?> ar reportemptyhomes.com
+
+Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values['area_name']?>,
+o fewn ward <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo newydd eu hysbysu i ardal 
+<?=$values['area_name']?>, o fewn ward <?=$values['ward_name']?>,
+dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/cy/alert-problem.txt b/templates/email/emptyhomes/cy/alert-problem.txt
new file mode 100644
index 000000000..a2c56cf52
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-problem.txt
@@ -0,0 +1,11 @@
+Subject: Adroddiadau newydd am eiddo gwag ar reportemptyhomes.com
+
+Mae'r eiddo gwag canlynol wedi cael eu hychwanegu:
+
+<?=$values['data']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos,
+dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/emptyhomes/cy/alert-update.txt b/templates/email/emptyhomes/cy/alert-update.txt
new file mode 100644
index 000000000..9a80d55c5
--- /dev/null
+++ b/templates/email/emptyhomes/cy/alert-update.txt
@@ -0,0 +1,13 @@
+Subject: Diweddariadau newydd am eiddo gwag - '<?=$values['title']?>'
+
+Mae'r diweddariadau canlynol wedi cael eu gadael am yr eiddo gwag hwn:
+
+<?=$values['data']?>
+
+Gweld y diweddariadau hyn neu eu hateb: <?=$values['problem_url']?>
+
+Yn gywir,  
+reportemptyhomes.com
+
+I roi'r gorau i dderbyn negeseuon e-bost pan fydd diweddariadau newydd yn ymddangos am yr eiddo hwn,
+dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-problem-area.txt b/templates/email/fiksgatami/alert-problem-area.txt
new file mode 100644
index 000000000..93819d6f2
--- /dev/null
+++ b/templates/email/fiksgatami/alert-problem-area.txt
@@ -0,0 +1,13 @@
+Subject: Nye saker i <?=$values['area_name']?> sendt via FiksGataMi.no
+
+Følgende saker er sendt til
+<?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Vennlig hilsen,  
+FiksGataMi-gruppen
+
+Hvis du ikke ønsker å motta epost om saker som er sendt til
+<?=$values['area_name']?> i fremtiden, klikk på følgende link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-problem-council.txt b/templates/email/fiksgatami/alert-problem-council.txt
new file mode 100644
index 000000000..54a51c7b2
--- /dev/null
+++ b/templates/email/fiksgatami/alert-problem-council.txt
@@ -0,0 +1,12 @@
+Subject: Nye saker sendt til <?=$values['area_name']?> via FiksGataMi.no
+
+Følgende saker er sendt til <?=$values['area_name']?>:
+
+<?=$values['data']?>
+
+Vennlig hilsen,  
+FiksGataMi-gruppen
+
+Hvis du ikke ønsker å motta epost om saker som er sendt til
+<?=$values['area_name']?> i fremtiden, klikk på følgende link: 
+<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-problem-nearby.txt b/templates/email/fiksgatami/alert-problem-nearby.txt
new file mode 100644
index 000000000..b470de203
--- /dev/null
+++ b/templates/email/fiksgatami/alert-problem-nearby.txt
@@ -0,0 +1,11 @@
+Subject: Nye saker i nærheten på FiksGataMi.no
+
+Følgende saker i nærheten er sendt via FiksGataMi.no:
+
+<?=$values['data']?>
+
+Vennlig hilsen,  
+FiksGataMi-gruppen
+
+Hvis du ikke ønsker å abonnere på epost om problemer i nærheten,
+klikk på følgende link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-problem-ward.txt b/templates/email/fiksgatami/alert-problem-ward.txt
new file mode 100644
index 000000000..2fbf0b068
--- /dev/null
+++ b/templates/email/fiksgatami/alert-problem-ward.txt
@@ -0,0 +1,13 @@
+Subject: Nye saker sendt til <?=$values['area_name']?> innenfor <?=$values['ward_name']?> via FiksGataMi.no
+
+Følgende saker er sendt til <?=$values['area_name']?>
+innenfor <?=$values['ward_name']?>:
+
+<?=$values['data']?>
+
+Vennlig hilsen,  
+FiksGataMi-gruppen
+
+Hvis du ikke ønsker å abonnere via epost på saker som er sendt til
+<?=$values['area_name']?> innenfor <?=$values['ward_name']?>,
+klikk på denne linken: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-problem.txt b/templates/email/fiksgatami/alert-problem.txt
new file mode 100644
index 000000000..a62745bef
--- /dev/null
+++ b/templates/email/fiksgatami/alert-problem.txt
@@ -0,0 +1,11 @@
+Subject: Ny saker på FiksGataMi.no
+
+Følgende ny saker er lagt til:
+
+<?=$values['data']?>
+
+Vennlig hilsen,  
+FiksGataMi-gruppen
+
+Hvis du ikke ønsker å stå på denne epostlisten,
+klikk på linken: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fiksgatami/alert-update.txt b/templates/email/fiksgatami/alert-update.txt
new file mode 100644
index 000000000..80bc8dbf8
--- /dev/null
+++ b/templates/email/fiksgatami/alert-update.txt
@@ -0,0 +1,18 @@
+Subject: Nye oppdateringer for problem - '<?=$values['title']?>'
+
+Følgende oppdateringer har blitt lagt inn for dette problemet:
+
+<?=$values['data']?>
+
+<?=$values['state_message']?>
+
+For å se på eller svare på disse oppdateringene, besøk denne URLen:
+    <?=$values['problem_url']?>
+
+Du kan ikke kontakte noen ved å svare på denne eposten.
+
+Vennlig hilsen,  
+Fiksgata-laget
+
+For å slutte å motta epost når det er nye oppdateringer om dettte
+problemet, følg denne lenken: <?=$values['unsubscribe_url']?>