Merge remote branch 'origin/zurich'

Conflicts:
	bin/open311-populate-service-list
	bin/send-comments
	bin/update-all-reports
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/App/Controller/Reports.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/LichfieldDC.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/FixMyStreet/SendReport.pm
	perllib/FixMyStreet/SendReport/Email.pm
	perllib/FixMyStreet/SendReport/Open311.pm
	perllib/Open311/GetServiceRequestUpdates.pm
	perllib/Open311/PopulateServiceList.pm
	t/app/controller/report_new.t
	t/app/controller/rss.t
	templates/web/bromley/report/display.html
	templates/web/default/admin/council_contacts.html
	templates/web/default/common_header_tags.html
	templates/web/default/dashboard/index.html
	templates/web/default/front/stats.html
	templates/web/default/report/_main.html
	templates/web/default/report/update-form.html
	templates/web/emptyhomes/index.html
	templates/web/emptyhomes/report/display.html
	templates/web/emptyhomes/report/new/councils_text_all.html
	templates/web/emptyhomes/reports/body.html
	templates/web/emptyhomes/reports/index.html
	templates/web/fixmystreet/report/new/fill_in_details_form.html
	templates/web/fixmystreet/report/update-form.html
	web/cobrands/fixmystreet/fixmystreet.js
	web/js/fixmystreet.js

1 files changed, 18 insertions, 1 deletions

diff --git a/templates/web/default/js/validation_strings.html b/templates/web/default/js/translation_strings.html
index c33bd2b81..a0cfc02c9 100644
--- a/templates/web/default/js/validation_strings.html
+++ b/templates/web/default/js/translation_strings.html
@@ -1,4 +1,4 @@
-    validation_strings = {
+    translation_strings = {
         update: '[% loc('Please enter a message') | replace("'", "\\'") %]',
         title: '[% loc('Please enter a subject') | replace("'", "\\'") %]',
         detail: '[% loc('Please enter some details') | replace("'", "\\'") %]',
@@ -19,5 +19,22 @@
         first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]',
         last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]',
         geolocate: '[% loc('or locate me automatically') | replace("'", "\\'") %]',
+        right_place: '[% loc('Right place?') | replace("'", "\\'") %]',
+        try_again: '[% loc('Try again') | replace("'", "\\'") %]',
+        place_pin_on_map: '[% loc('Place pin on map') | replace("'", "\\'") %]',
+        home: '[% loc('Home') | replace("'", "\\'") %]',
+        back: '[% loc('Back') | replace("'", "\\'") %]',
+        how_to_send: '[% loc('How to send successful reports') | replace("'", "\\'") %]',
+        more_details: '[% loc('Details') | replace("'", "\\'") %]',
+
+        geolocation_declined: '[% loc('You declined; please fill in the box above') | replace("'", "\\'") %]',
+        geolocation_no_position: '[% loc('Could not look up location') | replace("'", "\\'") %]',
+        geolocation_no_result: '[% loc('No result returned') | replace("'", "\\'") %]',
+        geolocation_unknown: '[% loc('Unknown error') | replace("'", "\\'") %]',
+
+        reporting_a_problem: '[% loc('Reporting a problem') | replace("'", "\\'") %]',
+        ok: '[% loc('OK') | replace("'", "\\'") %]',
+        map: '[% loc('MAP') | replace("'", "\\'") %]',
+
         report_problem_heading: '[% loc('Click map to report a problem') | replace("'", "\\'") %]'
     };