Merge branch 'hotfix/0.6.8.3' into develop

Conflicts:
    Gemfile.lock
    locale/ar/app.po
    locale/cs/app.po
    locale/cy/app.po
    locale/en_IE/app.po
    locale/es/app.po
    locale/pt_BR/app.po

9 files changed, 1649 insertions, 21 deletions

diff --git a/Gemfile b/Gemfile
index 61569d63f..3c31ba6a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ if File.exist? "/etc/debian_version" and File.open("/etc/debian_version").read.s
 end
 source :rubygems
 
-gem 'rails', '2.3.14'
+gem 'rails', '2.3.15'
 gem 'pg'
 
 gem 'fast_gettext', '>= 0.6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a7c59518..3f584e1ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,16 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    actionmailer (2.3.15)
+      actionpack (= 2.3.15)
+    actionpack (2.3.15)
+      activesupport (= 2.3.15)
+      rack (~> 1.1.3)
+    activerecord (2.3.15)
+      activesupport (= 2.3.15)
+    activeresource (2.3.15)
+      activesupport (= 2.3.15)
+    activesupport (2.3.15)
     annotate (2.4.0)
     archive-tar-minitar (0.5.2)
     bootstrap-sass (2.1.1.0)
@@ -73,16 +73,16 @@ GEM
     net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    newrelic_rpm (3.4.1)
+    newrelic_rpm (3.5.4.34)
     pg (0.13.2)
     polyglot (0.3.3)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
+    rack (1.1.4)
+    rails (2.3.15)
+      actionmailer (= 2.3.15)
+      actionpack (= 2.3.15)
+      activerecord (= 2.3.15)
+      activeresource (= 2.3.15)
+      activesupport (= 2.3.15)
       rake (>= 0.8.3)
     rake (0.9.2.2)
     rbx-require-relative (0.0.9)
@@ -165,7 +165,7 @@ DEPENDENCIES
   newrelic_rpm
   pg
   rack (~> 1.1.0)
-  rails (= 2.3.14)
+  rails (= 2.3.15)
   rake (= 0.9.2.2)
   rdoc (~> 2.4.3)
   recaptcha (~> 0.3.1)
diff --git a/config/environment.rb b/config/environment.rb
index 5670aed0b..b32eeeb01 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -18,7 +18,7 @@ end
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.15' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
diff --git a/locale/ar/app.po b/locale/ar/app.po
index 2fc7afa86..1af453795 100644
--- a/locale/ar/app.po
+++ b/locale/ar/app.po
@@ -1,6 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
+<<<<<<< HEAD
 #
 # Translators:
 msgid ""
@@ -24,6 +25,37 @@ msgid " (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation
 msgstr ""
 
 msgid " (<strong>patience</strong>, especially for large files, it may take a while!)"
+=======
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: alaveteli\n"
+"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2011-03-09 17:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+msgid ""
+"  This will appear on your {{site_name}} profile, to make it\\n            "
+"easier for others to get involved with what you're doing."
+msgstr ""
+
+msgid ""
+" (<strong>no ranty</strong> politics, read our <a href=\"%s\">moderation "
+"policy</a>)"
+msgstr ""
+
+msgid ""
+" (<strong>patience</strong>, especially for large files, it may take a "
+"while!)"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid " (you)"
@@ -35,7 +67,13 @@ msgstr ""
 msgid " - wall"
 msgstr ""
 
+<<<<<<< HEAD
 msgid " <strong>Note:</strong>\\n    We will send you an email. Follow the instructions in it to change\\n    your password."
+=======
+msgid ""
+" <strong>Note:</strong>\\n    We will send you an email. Follow the "
+"instructions in it to change\\n    your password."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid " <strong>Privacy note:</strong> Your email address will be given to"
@@ -47,6 +85,7 @@ msgstr ""
 msgid " Advise on how to <strong>best clarify</strong> the request."
 msgstr ""
 
+<<<<<<< HEAD
 msgid " Ideas on what <strong>other documents to request</strong> which the authority may hold. "
 msgstr ""
 
@@ -66,6 +105,43 @@ msgid " Say how you've <strong>used the information</strong>, with links if poss
 msgstr ""
 
 msgid " Suggest <strong>where else</strong> the requester might find the information. "
+=======
+msgid ""
+" Ideas on what <strong>other documents to request</strong> which the "
+"authority may hold. "
+msgstr ""
+
+msgid ""
+" If you know the address to use, then please <a href=\"%s\">send it to "
+"us</a>.\\n        You may be able to find the address on their website, or "
+"by phoning them up and asking."
+msgstr ""
+
+msgid ""
+" Include relevant links, such as to a campaign page, your blog or a\\n"
+"            twitter account. They will be made clickable. \\n            "
+"e.g."
+msgstr ""
+
+msgid ""
+" Link to the information requested, if it is <strong>already "
+"available</strong> on the Internet. "
+msgstr ""
+
+msgid ""
+" Offer better ways of <strong>wording the request</strong> to get the "
+"information. "
+msgstr ""
+
+msgid ""
+" Say how you've <strong>used the information</strong>, with links if "
+"possible."
+msgstr ""
+
+msgid ""
+" Suggest <strong>where else</strong> the requester might find the "
+"information. "
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid " What are you investigating using Freedom of Information? "
@@ -86,7 +162,14 @@ msgstr ""
 msgid " when you send this message."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "\"Hello! We have an  <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
+=======
+msgid ""
+"\"Hello! We have an  <a "
+"href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important"
+" message</a> for visitors outside {{country_name}}\""
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "%d Freedom of Information request to %s"
@@ -155,7 +238,13 @@ msgstr ""
 msgid "<a href=\"%s\">Are we missing a public authority?</a>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "<a href=\"%s\">Are you the owner of\\n            any commercial copyright on this page?</a>"
+=======
+msgid ""
+"<a href=\"%s\">Are you the owner of\\n            any commercial copyright "
+"on this page?</a>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "<a href=\"%s\">Browse all</a> or <a href=\"%s\">ask us to add one</a>."
@@ -164,7 +253,13 @@ msgstr ""
 msgid "<a href=\"%s\">Can't find the one you want?</a>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "<a href=\"%s\">Sign in</a> to change password, subscriptions and more ({{user_name}} only)"
+=======
+msgid ""
+"<a href=\"%s\">Sign in</a> to change password, subscriptions and more "
+"({{user_name}} only)"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "<a href=\"%s\">details</a>"
@@ -173,6 +268,7 @@ msgstr ""
 msgid "<a href=\"%s\">what's that?</a>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "<p>All done! Thank you very much for your help.</p><p>There are <a href=\"{{helpus_url}}\">more things you can do</a> to help {{site_name}}.</p>"
 msgstr ""
 
@@ -229,6 +325,133 @@ msgstr ""
 
 msgid "<span id='follow_count'>%d</span> person is following this authority"
 msgid_plural "<span id='follow_count'>%d</span> people are following this authority"
+=======
+msgid ""
+"<p>All done! Thank you very much for your help.</p><p>There are <a "
+"href=\"{{helpus_url}}\">more things you can do</a> to help "
+"{{site_name}}.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! Here are some ideas on what to do next:</p>\\n            "
+"<ul>\\n            <li>To send your request to another authority, first copy"
+" the text of your request below, then <a "
+"href=\"{{find_authority_url}}\">find the other authority</a>.</li>\\n"
+"            <li>If you would like to contest the authority's claim that they"
+" do not hold the information, here is\\n            <a "
+"href=\"{{complain_url}}\">how to complain</a>.\\n            </li>\\n"
+"            <li>We have <a href=\"{{other_means_url}}\">suggestions</a>\\n"
+"            on other means to answer your question.\\n            </li>\\n"
+"            </ul>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! Hope you don't have to wait much longer.</p> <p>By law, you "
+"should have got a response promptly, and normally before the end of "
+"<strong>{{date_response_required_by}}</strong>.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! Hopefully your wait isn't too long.</p> <p>By law, you should "
+"get a response promptly, and normally before the end of "
+"<strong>\\n{{date_response_required_by}}</strong>.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! Hopefully your wait isn't too long.</p><p>You should get a "
+"response within {{late_number_of_days}} days, or be told if it will take "
+"longer (<a href=\"{{review_url}}\">details</a>).</p>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! We'll look into what happened and try and fix it up.</p><p>If "
+"the error was a delivery failure, and you can find an up to date FOI email "
+"address for the authority, please tell us using the form below.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thank you! Your request is long overdue, by more than "
+"{{very_late_number_of_days}} working days. Most requests should be answered "
+"within {{late_number_of_days}} working days. You might like to complain "
+"about this, see below.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thanks for changing the text about you on your profile.</p>\\n"
+"            <p><strong>Next...</strong> You can upload a profile photograph "
+"too.</p>"
+msgstr ""
+
+msgid ""
+"<p>Thanks for updating your profile photo.</p>\\n                "
+"<p><strong>Next...</strong> You can put some text about you and your "
+"research on your profile.</p>"
+msgstr ""
+
+msgid ""
+"<p>We recommend that you edit your request and remove the email address.\\n"
+"                If you leave it, the email address will be sent to the "
+"authority, but will not be displayed on the site.</p>"
+msgstr ""
+
+msgid ""
+"<p>We're glad you got all the information that you wanted. If you write "
+"about or make use of the information, please come back and add an annotation"
+" below saying what you did.</p><p>If you found {{site_name}} useful, <a "
+"href=\"{{donation_url}}\">make a donation</a> to the charity which runs "
+"it.</p>"
+msgstr ""
+
+msgid ""
+"<p>We're glad you got some of the information that you wanted. If you found "
+"{{site_name}} useful, <a href=\"{{donation_url}}\">make a donation</a> to "
+"the charity which runs it.</p><p>If you want to try and get the rest of the "
+"information, here's what to do now.</p>"
+msgstr ""
+
+msgid ""
+"<p>You do not need to include your email in the request in order to get a "
+"reply (<a href=\"%s\">details</a>).</p>"
+msgstr ""
+
+msgid ""
+"<p>You do not need to include your email in the request in order to get a "
+"reply, as we will ask for it on the next screen (<a "
+"href=\"%s\">details</a>).</p>"
+msgstr ""
+
+msgid ""
+"<p>Your request contains a <strong>postcode</strong>. Unless it directly "
+"relates to the subject of your request, please remove any address as it will"
+" <strong>appear publicly on the Internet</strong>.</p>"
+msgstr ""
+
+msgid ""
+"<p>Your {{law_used_full}} request has been <strong>sent on its "
+"way</strong>!</p>\\n            <p><strong>We will email you</strong> when "
+"there is a response, or after {{late_number_of_days}} working days if the "
+"authority still hasn't\\n            replied by then.</p>\\n            "
+"<p>If you write about this request (for example in a forum or a blog) please"
+" link to this page, and add an\\n            annotation below telling people"
+" about your writing.</p>"
+msgstr ""
+
+msgid ""
+"<p>{{site_name}} is currently in maintenance. You can only view existing "
+"requests. You cannot make new ones, add followups or annotations, or "
+"otherwise change the database.</p> <p>{{read_only}}</p>"
+msgstr ""
+
+msgid ""
+"<small>If you use web-based email or have \"junk mail\" filters, also check "
+"your\\nbulk/spam mail folders. Sometimes, our messages are marked that "
+"way.</small>\\n</p>"
+msgstr ""
+
+msgid "<span id='follow_count'>%d</span> person is following this authority"
+msgid_plural ""
+"<span id='follow_count'>%d</span> people are following this authority"
+>>>>>>> hotfix/0.6.8.3
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
@@ -236,6 +459,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+<<<<<<< HEAD
 msgid "<strong> Can I request information about myself?</strong>\\n\t\t\t<a href=\"%s\">No! (Click here for details)</a>"
 msgstr ""
 
@@ -264,20 +488,91 @@ msgid "<strong><code>variety:</code></strong> to select type of thing to search
 msgstr ""
 
 msgid "<strong>Advice</strong> on how to get a response that will satisfy the requester. </li>"
+=======
+msgid ""
+"<strong> Can I request information about myself?</strong>\\n\t\t\t<a "
+"href=\"%s\">No! (Click here for details)</a>"
+msgstr ""
+
+msgid ""
+"<strong><code>commented_by:tony_bowden</code></strong> to search annotations"
+" made by Tony Bowden, typing the name as in the URL."
+msgstr ""
+
+msgid ""
+"<strong><code>filetype:pdf</code></strong> to find all responses with PDF "
+"attachments. Or try these: <code>{{list_of_file_extensions}}</code>"
+msgstr ""
+
+msgid ""
+"<strong><code>request:</code></strong> to restrict to a specific request, "
+"typing the title as in the URL."
+msgstr ""
+
+msgid ""
+"<strong><code>requested_by:julian_todd</code></strong> to search requests "
+"made by Julian Todd, typing the name as in the URL."
+msgstr ""
+
+msgid ""
+"<strong><code>requested_from:home_office</code></strong> to search requests "
+"from the Home Office, typing the name as in the URL."
+msgstr ""
+
+msgid ""
+"<strong><code>status:</code></strong> to select based on the status or "
+"historical status of the request, see the <a href=\"{{statuses_url}}\">table"
+" of statuses</a> below."
+msgstr ""
+
+msgid ""
+"<strong><code>tag:charity</code></strong> to find all public authorities or "
+"requests with a given tag. You can include multiple tags, \\n    and tag "
+"values, e.g. <code>tag:openlylocal AND "
+"tag:financial_transaction:335633</code>. Note that by default any of the "
+"tags\\n    can be present, you have to put <code>AND</code> explicitly if "
+"you only want results them all present."
+msgstr ""
+
+msgid ""
+"<strong><code>variety:</code></strong> to select type of thing to search "
+"for, see the <a href=\"{{varieties_url}}\">table of varieties</a> below."
+msgstr ""
+
+msgid ""
+"<strong>Advice</strong> on how to get a response that will satisfy the "
+"requester. </li>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "<strong>All the information</strong> has been sent"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "<strong>Anything else</strong>, such as clarifying, prompting, thanking"
 msgstr ""
 
 msgid "<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need \\na good internal knowledge of user behaviour on {{site_name}}. How, \\nwhy and by whom requests are categorised is not straightforward, and there will\\nbe user error and ambiguity. You will also need to understand FOI law, and the\\nway authorities use it. Plus you'll need to be an elite statistician.  Please\\n<a href=\"{{contact_path}}\">contact us</a> with questions."
+=======
+msgid ""
+"<strong>Anything else</strong>, such as clarifying, prompting, thanking"
+msgstr ""
+
+msgid ""
+"<strong>Caveat emptor!</strong> To use this data in an honourable way, you "
+"will need \\na good internal knowledge of user behaviour on {{site_name}}. "
+"How, \\nwhy and by whom requests are categorised is not straightforward, and"
+" there will\\nbe user error and ambiguity. You will also need to understand "
+"FOI law, and the\\nway authorities use it. Plus you'll need to be an elite "
+"statistician.  Please\\n<a href=\"{{contact_path}}\">contact us</a> with "
+"questions."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "<strong>Clarification</strong> has been requested"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "<strong>No response</strong> has been received\\n                <small>(maybe there's just an acknowledgement)</small>"
 msgstr ""
 
@@ -297,6 +592,41 @@ msgid "<strong>Privacy note:</strong> Your photo will be shown in public on the
 msgstr ""
 
 msgid "<strong>Privacy warning:</strong> Your message, and any response\\n        to it, will be displayed publicly on this website."
+=======
+msgid ""
+"<strong>No response</strong> has been received\\n                "
+"<small>(maybe there's just an acknowledgement)</small>"
+msgstr ""
+
+msgid ""
+"<strong>Note:</strong> Because we're testing, requests are being sent to "
+"{{email}} rather than to the actual authority."
+msgstr ""
+
+msgid ""
+"<strong>Note:</strong> You're sending a message to yourself, presumably\\n"
+"            to try out how it works."
+msgstr ""
+
+msgid ""
+"<strong>Note:</strong>\\n    We will send an email to your new email "
+"address. Follow the\\n    instructions in it to confirm changing your email."
+msgstr ""
+
+msgid ""
+"<strong>Privacy note:</strong> If you want to request private information "
+"about\\n    yourself then <a href=\"%s\">click here</a>."
+msgstr ""
+
+msgid ""
+"<strong>Privacy note:</strong> Your photo will be shown in public on the "
+"Internet,\\n    wherever you do something on {{site_name}}."
+msgstr ""
+
+msgid ""
+"<strong>Privacy warning:</strong> Your message, and any response\\n        "
+"to it, will be displayed publicly on this website."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "<strong>Some of the information</strong> has been sent "
@@ -308,6 +638,7 @@ msgstr ""
 msgid "<strong>did not have</strong> the information requested."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
 msgstr ""
 
@@ -315,12 +646,33 @@ msgid "A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em>
 msgstr ""
 
 msgid "A <strong>summary</strong> of the response if you have received it by post. "
+=======
+msgid ""
+"A <a href=\"{{request_url}}\">follow up</a> to <em>{{request_title}}</em> "
+"was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr ""
+
+msgid ""
+"A <a href=\"{{request_url}}\">response</a> to <em>{{request_title}}</em> was"
+" sent by {{public_body_name}} to {{info_request_user}} on {{date}}.  The "
+"request status is: {{request_status}}"
+msgstr ""
+
+msgid ""
+"A <strong>summary</strong> of the response if you have received it by post. "
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "A Freedom of Information request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+=======
+msgid ""
+"A new request, <em><a href=\"{{request_url}}\">{{request_title}}</a></em>, "
+"was sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "A public authority"
@@ -344,7 +696,13 @@ msgstr ""
 msgid "Add an annotation"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Add an annotation to your request with choice quotes, or\\n                a <strong>summary of the response</strong>."
+=======
+msgid ""
+"Add an annotation to your request with choice quotes, or\\n                a"
+" <strong>summary of the response</strong>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Added on {{date}}"
@@ -362,19 +720,48 @@ msgstr ""
 msgid "Advanced search tips"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Advise on whether the <strong>refusal is legal</strong>, and how to complain about it if not."
 msgstr ""
 
 msgid "Air, water, soil, land, flora and fauna (including how these effect\\n            human beings)"
+=======
+msgid ""
+"Advise on whether the <strong>refusal is legal</strong>, and how to complain"
+" about it if not."
+msgstr ""
+
+msgid ""
+"Air, water, soil, land, flora and fauna (including how these effect\\n"
+"            human beings)"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "All of the information requested has been received"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "All the options below can use <strong>status</strong> or <strong>latest_status</strong> before the colon. For example, <strong>status:not_held</strong> will match requests which have <em>ever</em> been marked as not held; <strong>latest_status:not_held</strong> will match only requests that are <em>currently</em> marked as not held."
 msgstr ""
 
 msgid "All the options below can use <strong>variety</strong> or <strong>latest_variety</strong> before the colon. For example, <strong>variety:sent</strong> will match requests which have <em>ever</em> been sent; <strong>latest_variety:sent</strong> will match only requests that are <em>currently</em> marked as sent."
+=======
+msgid ""
+"All the options below can use <strong>status</strong> or "
+"<strong>latest_status</strong> before the colon. For example, "
+"<strong>status:not_held</strong> will match requests which have "
+"<em>ever</em> been marked as not held; "
+"<strong>latest_status:not_held</strong> will match only requests that are "
+"<em>currently</em> marked as not held."
+msgstr ""
+
+msgid ""
+"All the options below can use <strong>variety</strong> or "
+"<strong>latest_variety</strong> before the colon. For example, "
+"<strong>variety:sent</strong> will match requests which have <em>ever</em> "
+"been sent; <strong>latest_variety:sent</strong> will match only requests "
+"that are <em>currently</em> marked as sent."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Also called {{other_name}}."
@@ -386,10 +773,21 @@ msgstr ""
 msgid "Alter your subscription"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Although all responses are automatically published, we depend on\\nyou, the original requester, to evaluate them."
 msgstr ""
 
 msgid "An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> was made by {{event_comment_user}} on {{date}}"
+=======
+msgid ""
+"Although all responses are automatically published, we depend on\\nyou, the "
+"original requester, to evaluate them."
+msgstr ""
+
+msgid ""
+"An <a href=\"{{request_url}}\">annotation</a> to <em>{{request_title}}</em> "
+"was made by {{event_comment_user}} on {{date}}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "An <strong>error message</strong> has been received"
@@ -407,10 +805,21 @@ msgstr ""
 msgid "Annotations"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Annotations are so anyone, including you, can help the requester with their request. For example:"
 msgstr ""
 
 msgid "Annotations will be posted publicly here, and are\\n        <strong>not</strong> sent to {{public_body_name}}."
+=======
+msgid ""
+"Annotations are so anyone, including you, can help the requester with their "
+"request. For example:"
+msgstr ""
+
+msgid ""
+"Annotations will be posted publicly here, and are\\n        "
+"<strong>not</strong> sent to {{public_body_name}}."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Anonymous user"
@@ -419,10 +828,21 @@ msgstr ""
 msgid "Anyone:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries."
 msgstr ""
 
 msgid "At the bottom of this page, write a reply to them trying to persuade them to scan it in\\n            (<a href=\"%s\">more details</a>)."
+=======
+msgid ""
+"Ask for <strong>specific</strong> documents or information, this site is not"
+" suitable for general enquiries."
+msgstr ""
+
+msgid ""
+"At the bottom of this page, write a reply to them trying to persuade them to"
+" scan it in\\n            (<a href=\"%s\">more details</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Attachment (optional):"
@@ -443,19 +863,41 @@ msgstr ""
 msgid "Beginning with"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Browse <a href='{{url}}'>other requests</a> for examples of how to word your request."
 msgstr ""
 
 msgid "Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for examples of how to word your request."
+=======
+msgid ""
+"Browse <a href='{{url}}'>other requests</a> for examples of how to word your"
+" request."
+msgstr ""
+
+msgid ""
+"Browse <a href='{{url}}'>other requests</a> to '{{public_body_name}}' for "
+"examples of how to word your request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Browse all authorities..."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "By law, under all circumstances, {{public_body_link}} should have responded by now"
 msgstr ""
 
 msgid "By law, {{public_body_link}} should normally have responded <strong>promptly</strong> and"
+=======
+msgid ""
+"By law, under all circumstances, {{public_body_link}} should have responded "
+"by now"
+msgstr ""
+
+msgid ""
+"By law, {{public_body_link}} should normally have responded "
+"<strong>promptly</strong> and"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Cancel a {{site_name}} alert"
@@ -536,10 +978,23 @@ msgstr ""
 msgid "Clear photo"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal\\nreview, asking them to find out why response to the request has been so slow."
 msgstr ""
 
 msgid "Click on the link below to send a message to {{public_body}} reminding them to reply to your request."
+=======
+msgid ""
+"Click on the link below to send a message to {{public_body_name}} telling "
+"them to reply to your request. You might like to ask for an "
+"internal\\nreview, asking them to find out why response to the request has "
+"been so slow."
+msgstr ""
+
+msgid ""
+"Click on the link below to send a message to {{public_body}} reminding them "
+"to reply to your request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Close"
@@ -566,7 +1021,12 @@ msgstr ""
 msgid "Confirm you want to follow new requests"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Confirm you want to follow new requests or responses matching your search"
+=======
+msgid ""
+"Confirm you want to follow new requests or responses matching your search"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Confirm you want to follow requests by '{{user_name}}'"
@@ -593,7 +1053,12 @@ msgstr ""
 msgid "Confirm your new email address on {{site_name}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Considered by administrators as not an FOI request and hidden from site."
+=======
+msgid ""
+"Considered by administrators as not an FOI request and hidden from site."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Considered by administrators as vexatious and hidden from site."
@@ -608,16 +1073,33 @@ msgstr ""
 msgid "Could not identify the request from the email address"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and many other common image file formats are supported."
+=======
+msgid ""
+"Couldn't understand the image file that you uploaded. PNG, JPEG, GIF and "
+"many other common image file formats are supported."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Crop your profile photo"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Cultural sites and built structures (as they may be affected by the\\n            environmental factors listed above)"
 msgstr ""
 
 msgid "Currently <strong>waiting for a response</strong> from {{public_body_link}}, they must respond promptly and"
+=======
+msgid ""
+"Cultural sites and built structures (as they may be affected by the\\n"
+"            environmental factors listed above)"
+msgstr ""
+
+msgid ""
+"Currently <strong>waiting for a response</strong> from {{public_body_link}},"
+" they must respond promptly and"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Date:"
@@ -641,13 +1123,25 @@ msgstr ""
 msgid "Did you mean: {{correction}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Disclaimer: This message and any reply that you make will be published on the internet. Our privacy and copyright policies:"
+=======
+msgid ""
+"Disclaimer: This message and any reply that you make will be published on "
+"the internet. Our privacy and copyright policies:"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Disclosure log"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Don't want to address your message to {{person_or_body}}?  You can also write to:"
+=======
+msgid ""
+"Don't want to address your message to {{person_or_body}}?  You can also "
+"write to:"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Done"
@@ -665,7 +1159,13 @@ msgstr ""
 msgid "EIR"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Edit and add <strong>more details</strong> to the message above,\\n                explaining why you are dissatisfied with their response."
+=======
+msgid ""
+"Edit and add <strong>more details</strong> to the message above,\\n"
+"                explaining why you are dissatisfied with their response."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Edit language version:"
@@ -680,7 +1180,13 @@ msgstr ""
 msgid "Either the email or password was not recognised, please try again."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Either the email or password was not recognised, please try again. Or create a new account using the form on the right."
+=======
+msgid ""
+"Either the email or password was not recognised, please try again. Or create"
+" a new account using the form on the right."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Email doesn't look like a valid address"
@@ -689,10 +1195,21 @@ msgstr ""
 msgid "Email me future updates to this request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Enter words that you want to find separated by spaces, e.g. <strong>climbing lane</strong>"
 msgstr ""
 
 msgid "Enter your response below. You may attach one file (use email, or\\n  <a href=\"%s\">contact us</a> if you need more)."
+=======
+msgid ""
+"Enter words that you want to find separated by spaces, e.g. <strong>climbing"
+" lane</strong>"
+msgstr ""
+
+msgid ""
+"Enter your response below. You may attach one file (use email, or\\n  <a "
+"href=\"%s\">contact us</a> if you need more)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Environmental Information Regulations"
@@ -710,10 +1227,24 @@ msgstr ""
 msgid "Event history details"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Everything that you enter on this page \\n                will be <strong>displayed publicly</strong> on\\n                this website forever (<a href=\"%s\">why?</a>)."
 msgstr ""
 
 msgid "Everything that you enter on this page, including <strong>your name</strong>, \\n                will be <strong>displayed publicly</strong> on\\n                this website forever (<a href=\"%s\">why?</a>)."
+=======
+msgid ""
+"Everything that you enter on this page \\n                will be "
+"<strong>displayed publicly</strong> on\\n                this website "
+"forever (<a href=\"%s\">why?</a>)."
+msgstr ""
+
+msgid ""
+"Everything that you enter on this page, including <strong>your "
+"name</strong>, \\n                will be <strong>displayed "
+"publicly</strong> on\\n                this website forever (<a "
+"href=\"%s\">why?</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "FOI"
@@ -737,13 +1268,26 @@ msgstr ""
 msgid "Failed to convert image to a PNG"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Failed to convert image to the correct size: at %{cols}x%{rows}, need %{width}x%{height}"
+=======
+msgid ""
+"Failed to convert image to the correct size: at %{cols}x%{rows}, need "
+"%{width}x%{height}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Filter"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "First, type in the <strong>name of the UK public authority</strong> you'd \\n           like information from. <strong>By law, they have to respond</strong>\\n           (<a href=\"%s#%s\">why?</a>)."
+=======
+msgid ""
+"First, type in the <strong>name of the UK public authority</strong> you'd "
+"\\n           like information from. <strong>By law, they have to "
+"respond</strong>\\n           (<a href=\"%s#%s\">why?</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Foi attachment"
@@ -809,16 +1353,34 @@ msgstr ""
 msgid "Follow up messages to existing requests are sent to "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Follow ups and new responses to this request have been stopped to prevent spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and need to send a follow up."
+=======
+msgid ""
+"Follow ups and new responses to this request have been stopped to prevent "
+"spam. Please <a href=\"{{url}}\">contact us</a> if you are {{user_link}} and"
+" need to send a follow up."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Follow us on twitter"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Followups cannot be sent for this request, as it was made externally, and published here by {{public_body_name}} on the requester's behalf."
 msgstr ""
 
 msgid "For an unknown reason, it is not possible to make a request to this authority."
+=======
+msgid ""
+"Followups cannot be sent for this request, as it was made externally, and "
+"published here by {{public_body_name}} on the requester's behalf."
+msgstr ""
+
+msgid ""
+"For an unknown reason, it is not possible to make a request to this "
+"authority."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Forgotten your password?"
@@ -839,13 +1401,25 @@ msgstr ""
 msgid "Freedom of Information Act"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Freedom of Information law does not apply to this authority, so you cannot make\\n                a request to it."
+=======
+msgid ""
+"Freedom of Information law does not apply to this authority, so you cannot "
+"make\\n                a request to it."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Freedom of Information law no longer applies to"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to "
+=======
+msgid ""
+"Freedom of Information law no longer applies to this authority.Follow up "
+"messages to existing requests are sent to "
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Freedom of Information requests made"
@@ -866,7 +1440,15 @@ msgstr ""
 msgid "From"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"From the request page, try replying to a particular message, rather than "
+"sending\\n    a general followup. If you need to make a general followup, "
+"and know\\n    an email which will go to the right place, please <a "
+"href=\"%s\">send it to us</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "From:"
@@ -878,7 +1460,13 @@ msgstr ""
 msgid "Handled by post."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Hello! You can make Freedom of Information requests within {{country_name}} at {{link_to_website}}"
+=======
+msgid ""
+"Hello! You can make Freedom of Information requests within {{country_name}} "
+"at {{link_to_website}}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Hello, {{username}}!"
@@ -887,6 +1475,7 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Here <strong>described</strong> means when a user selected a status for the request, and\\nthe most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by\\n{{site_name}} for intermediate events, which weren't given an explicit\\ndescription by a user. See the <a href=\"{{search_path}}\">search tips</a> for description of the states."
 msgstr ""
 
@@ -894,6 +1483,27 @@ msgid "Here is the message you wrote, in case you would like to copy the text an
 msgstr ""
 
 msgid "Hi! We need your help. The person who made the following request\\n    hasn't told us whether or not it was successful. Would you mind taking\\n    a moment to read it and help us keep the place tidy for everyone?\\n    Thanks."
+=======
+msgid ""
+"Here <strong>described</strong> means when a user selected a status for the "
+"request, and\\nthe most recent event had its status updated to that value. "
+"<strong>calculated</strong> is then inferred by\\n{{site_name}} for "
+"intermediate events, which weren't given an explicit\\ndescription by a "
+"user. See the <a href=\"{{search_path}}\">search tips</a> for description of"
+" the states."
+msgstr ""
+
+msgid ""
+"Here is the message you wrote, in case you would like to copy the text and "
+"save it for later."
+msgstr ""
+
+msgid ""
+"Hi! We need your help. The person who made the following request\\n    "
+"hasn't told us whether or not it was successful. Would you mind taking\\n"
+"    a moment to read it and help us keep the place tidy for everyone?\\n    "
+"Thanks."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Holiday"
@@ -911,7 +1521,13 @@ msgstr ""
 msgid "Home page of authority"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "However, you have the right to request environmental\\n            information under a different law"
+=======
+msgid ""
+"However, you have the right to request environmental\\n            "
+"information under a different law"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Human health and safety"
@@ -935,7 +1551,13 @@ msgstr ""
 msgid "I would like to <strong>withdraw this request</strong>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "I'm still <strong>waiting</strong> for my information\\n                <small>(maybe you got an acknowledgement)</small>"
+=======
+msgid ""
+"I'm still <strong>waiting</strong> for my information\\n                "
+"<small>(maybe you got an acknowledgement)</small>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "I'm still <strong>waiting</strong> for the internal review"
@@ -956,6 +1578,7 @@ msgstr ""
 msgid "I've received an <strong>error message</strong>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "If the address is wrong, or you know a better address, please <a href=\"%s\">contact us</a>."
 msgstr ""
 
@@ -963,20 +1586,49 @@ msgid "If this is incorrect, or you would like to send a late response to the re
 msgstr ""
 
 msgid "If you are dissatisfied by the response you got from\\n            the public authority, you have the right to\\n            complain (<a href=\"%s\">details</a>)."
+=======
+msgid ""
+"If the address is wrong, or you know a better address, please <a "
+"href=\"%s\">contact us</a>."
+msgstr ""
+
+msgid ""
+"If this is incorrect, or you would like to send a late response to the "
+"request\\nor an email on another subject to {{user}}, then please\\nemail "
+"{{contact_email}} for help."
+msgstr ""
+
+msgid ""
+"If you are dissatisfied by the response you got from\\n            the "
+"public authority, you have the right to\\n            complain (<a "
+"href=\"%s\">details</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "If you are still having trouble, please <a href=\"%s\">contact us</a>."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "If you are the requester, then you may <a href=\"%s\">sign in</a> to view the request."
 msgstr ""
 
 msgid "If you are thinking of using a pseudonym,\\n                please <a href=\"%s\">read this first</a>."
+=======
+msgid ""
+"If you are the requester, then you may <a href=\"%s\">sign in</a> to view "
+"the request."
+msgstr ""
+
+msgid ""
+"If you are thinking of using a pseudonym,\\n                please <a "
+"href=\"%s\">read this first</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "If you are {{user_link}}, please"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "If you believe this request is not suitable, you can report it for attention by the site administrators"
 msgstr ""
 
@@ -1002,6 +1654,55 @@ msgid "If you use web-based email or have \"junk mail\" filters, also check your
 msgstr ""
 
 msgid "If you would like us to lift this ban, then you may politely\\n<a href=\"/help/contact\">contact us</a> giving reasons.\\n"
+=======
+msgid ""
+"If you believe this request is not suitable, you can report it for attention"
+" by the site administrators"
+msgstr ""
+
+msgid ""
+"If you can't click on it in the email, you'll have to <strong>select and "
+"copy\\nit</strong> from the email.  Then <strong>paste it into your "
+"browser</strong>, into the place\\nyou would type the address of any other "
+"webpage."
+msgstr ""
+
+msgid ""
+"If you can, scan in or photograph the response, and <strong>send us\\n"
+"                    a copy to upload</strong>."
+msgstr ""
+
+msgid ""
+"If you find this service useful as an FOI officer, please ask your web "
+"manager to link to us from your organisation's FOI page."
+msgstr ""
+
+msgid ""
+"If you got the email <strong>more than six months ago</strong>, then this "
+"login link won't work any\\nmore. Please try doing what you were doing from "
+"the beginning."
+msgstr ""
+
+msgid ""
+"If you have not done so already, please write a message below telling the "
+"authority that you have withdrawn your request. Otherwise they will not know"
+" it has been withdrawn."
+msgstr ""
+
+msgid ""
+"If you reply to this message it will go directly to {{user_name}}, who "
+"will\\nlearn your email address. Only reply if that is okay."
+msgstr ""
+
+msgid ""
+"If you use web-based email or have \"junk mail\" filters, also check "
+"your\\nbulk/spam mail folders. Sometimes, our messages are marked that way."
+msgstr ""
+
+msgid ""
+"If you would like us to lift this ban, then you may politely\\n<a "
+"href=\"/help/contact\">contact us</a> giving reasons.\\n"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "If you're new to {{site_name}}"
@@ -1010,7 +1711,13 @@ msgstr ""
 msgid "If you've used {{site_name}} before"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "If your browser is set to accept cookies and you are seeing this message,\\nthen there is probably a fault with our server."
+=======
+msgid ""
+"If your browser is set to accept cookies and you are seeing this "
+"message,\\nthen there is probably a fault with our server."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Incoming message"
@@ -1112,12 +1819,19 @@ msgstr ""
 msgid "Information not held."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Information on emissions and discharges (e.g. noise, energy,\\n            radiation, waste materials)"
+=======
+msgid ""
+"Information on emissions and discharges (e.g. noise, energy,\\n            "
+"radiation, waste materials)"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Internal review request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Is {{email_address}} the wrong address for {{type_of_request}} requests to {{public_body_name}}? If so, please contact us using this form:"
 msgstr ""
 
@@ -1125,6 +1839,22 @@ msgid "It may be that your browser is not set to accept a thing called \"cookies
 msgstr ""
 
 msgid "Items matching the following conditions are currently displayed on your wall."
+=======
+msgid ""
+"Is {{email_address}} the wrong address for {{type_of_request}} requests to "
+"{{public_body_name}}? If so, please contact us using this form:"
+msgstr ""
+
+msgid ""
+"It may be that your browser is not set to accept a thing called "
+"\"cookies\",\\nor cannot do so.  If you can, please enable cookies, or try "
+"using a different\\nbrowser.  Then press refresh to have another go."
+msgstr ""
+
+msgid ""
+"Items matching the following conditions are currently displayed on your "
+"wall."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Joined in"
@@ -1133,7 +1863,13 @@ msgstr ""
 msgid "Joined {{site_name}} in"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Keep it <strong>focused</strong>, you'll be more likely to get what you want (<a href=\"%s\">why?</a>)."
+=======
+msgid ""
+"Keep it <strong>focused</strong>, you'll be more likely to get what you want"
+" (<a href=\"%s\">why?</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Keywords"
@@ -1145,7 +1881,13 @@ msgstr ""
 msgid "Last request viewed: "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Let us know what you were doing when this message\\nappeared and your browser and operating system type and version."
+=======
+msgid ""
+"Let us know what you were doing when this message\\nappeared and your "
+"browser and operating system type and version."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Link to this"
@@ -1187,10 +1929,21 @@ msgstr ""
 msgid "Make a new <strong>Environmental Information</strong> request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Make a new <strong>Freedom of Information</strong> request to {{public_body}}"
 msgstr ""
 
 msgid "Make a new<br/>\\n  <strong>Freedom <span>of</span><br/>\\n  Information<br/>\\n  request</strong>"
+=======
+msgid ""
+"Make a new <strong>Freedom of Information</strong> request to "
+"{{public_body}}"
+msgstr ""
+
+msgid ""
+"Make a new<br/>\\n  <strong>Freedom <span>of</span><br/>\\n  "
+"Information<br/>\\n  request</strong>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Make a request"
@@ -1295,7 +2048,13 @@ msgstr ""
 msgid "No similar requests found."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Nobody has made any Freedom of Information requests to {{public_body_name}} using this site yet."
+=======
+msgid ""
+"Nobody has made any Freedom of Information requests to {{public_body_name}} "
+"using this site yet."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "None found."
@@ -1304,7 +2063,13 @@ msgstr ""
 msgid "None made."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Note that the requester will not be notified about your annotation, because the request was published by {{public_body_name}} on their behalf."
+=======
+msgid ""
+"Note that the requester will not be notified about your annotation, because "
+"the request was published by {{public_body_name}} on their behalf."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Now check your email!"
@@ -1325,13 +2090,24 @@ msgstr ""
 msgid "Offensive? Unsuitable?"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Oh no! Sorry to hear that your request was refused. Here is what to do now."
+=======
+msgid ""
+"Oh no! Sorry to hear that your request was refused. Here is what to do now."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Old e-mail:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Old email address isn't the same as the address of the account you are logged in with"
+=======
+msgid ""
+"Old email address isn't the same as the address of the account you are "
+"logged in with"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Old email doesn't look like a valid address"
@@ -1352,10 +2128,21 @@ msgstr ""
 msgid "Only requests made using {{site_name}} are shown."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Only the authority can reply to this request, and I don't recognise the address this reply was sent from"
 msgstr ""
 
 msgid "Only the authority can reply to this request, but there is no \"From\" address to check against"
+=======
+msgid ""
+"Only the authority can reply to this request, and I don't recognise the "
+"address this reply was sent from"
+msgstr ""
+
+msgid ""
+"Only the authority can reply to this request, but there is no \"From\" "
+"address to check against"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Or search in their website for this information."
@@ -1424,6 +2211,7 @@ msgstr ""
 msgid "Please <a href=\"%s\">get in touch</a> with us so we can fix it."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please <strong>answer the question above</strong> so we know whether the "
 msgstr ""
 
@@ -1431,12 +2219,34 @@ msgid "Please <strong>go to the following requests</strong>, and let us\\n
 msgstr ""
 
 msgid "Please <strong>only</strong> write messages directly relating to your request {{request_link}}. If you would like to ask for information that was not in your original request, then <a href=\"{{new_request_link}}\">file a new request</a>."
+=======
+msgid ""
+"Please <strong>answer the question above</strong> so we know whether the "
+msgstr ""
+
+msgid ""
+"Please <strong>go to the following requests</strong>, and let us\\n        "
+"know if there was information in the recent responses to them."
+msgstr ""
+
+msgid ""
+"Please <strong>only</strong> write messages directly relating to your "
+"request {{request_link}}. If you would like to ask for information that was "
+"not in your original request, then <a href=\"{{new_request_link}}\">file a "
+"new request</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please ask for environmental information only"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please check the URL (i.e. the long code of letters and numbers) is copied\\ncorrectly from your email."
+=======
+msgid ""
+"Please check the URL (i.e. the long code of letters and numbers) is "
+"copied\\ncorrectly from your email."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please choose a file containing your photo."
@@ -1445,22 +2255,46 @@ msgstr ""
 msgid "Please choose what sort of reply you are making."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please choose whether or not you got some of the information that you wanted."
+=======
+msgid ""
+"Please choose whether or not you got some of the information that you "
+"wanted."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please click on the link below to cancel or alter these emails."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please click on the link below to confirm that you want to \\nchange the email address that you use for {{site_name}}\\nfrom {{old_email}} to {{new_email}}"
+=======
+msgid ""
+"Please click on the link below to confirm that you want to \\nchange the "
+"email address that you use for {{site_name}}\\nfrom {{old_email}} to "
+"{{new_email}}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please click on the link below to confirm your email address."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please describe more what the request is about in the subject. There is no need to say it is an FOI request, we add that on anyway."
 msgstr ""
 
 msgid "Please don't upload offensive pictures. We will take down images\\n    that we consider inappropriate."
+=======
+msgid ""
+"Please describe more what the request is about in the subject. There is no "
+"need to say it is an FOI request, we add that on anyway."
+msgstr ""
+
+msgid ""
+"Please don't upload offensive pictures. We will take down images\\n    that "
+"we consider inappropriate."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please enable \"cookies\" to carry on"
@@ -1517,6 +2351,7 @@ msgstr ""
 msgid "Please keep it shorter than 500 characters"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please keep the summary short, like in the subject of an email. You can use a phrase, rather than a full sentence."
 msgstr ""
 
@@ -1527,14 +2362,38 @@ msgid "Please select each of these requests in turn, and <strong>let everyone kn
 msgstr ""
 
 msgid "Please sign at the bottom with your name, or alter the \"%{signoff}\" signature"
+=======
+msgid ""
+"Please keep the summary short, like in the subject of an email. You can use "
+"a phrase, rather than a full sentence."
+msgstr ""
+
+msgid ""
+"Please only request information that comes under those categories, "
+"<strong>do not waste your\\n            time</strong> or the time of the "
+"public authority by requesting unrelated information."
+msgstr ""
+
+msgid ""
+"Please select each of these requests in turn, and <strong>let everyone "
+"know</strong>\\nif they are successful yet or not."
+msgstr ""
+
+msgid ""
+"Please sign at the bottom with your name, or alter the \"%{signoff}\" "
+"signature"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Please sign in as "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please sign in or make a new account."
 msgstr ""
 
+=======
+>>>>>>> hotfix/0.6.8.3
 msgid "Please type a message and/or choose a file containing your response."
 msgstr ""
 
@@ -1547,6 +2406,7 @@ msgstr ""
 msgid "Please write a summary with some text in it"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Please write the summary using a mixture of capital and lower case letters. This makes it easier for others to read."
 msgstr ""
 
@@ -1560,6 +2420,31 @@ msgid "Please write your message using a mixture of capital and lower case lette
 msgstr ""
 
 msgid "Point to <strong>related information</strong>, campaigns or forums which may be useful."
+=======
+msgid ""
+"Please write the summary using a mixture of capital and lower case letters. "
+"This makes it easier for others to read."
+msgstr ""
+
+msgid ""
+"Please write your annotation using a mixture of capital and lower case "
+"letters. This makes it easier for others to read."
+msgstr ""
+
+msgid ""
+"Please write your follow up message containing the necessary clarifications "
+"below."
+msgstr ""
+
+msgid ""
+"Please write your message using a mixture of capital and lower case letters."
+" This makes it easier for others to read."
+msgstr ""
+
+msgid ""
+"Point to <strong>related information</strong>, campaigns or forums which may"
+" be useful."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Possibly related requests:"
@@ -1730,7 +2615,13 @@ msgstr ""
 msgid "Re-edit this message"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Read about <a href=\"{{advanced_search_url}}\">advanced search operators</a>, such as proximity and wildcards."
+=======
+msgid ""
+"Read about <a href=\"{{advanced_search_url}}\">advanced search "
+"operators</a>, such as proximity and wildcards."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Read blog"
@@ -1745,7 +2636,13 @@ msgstr ""
 msgid "Refused."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Remember me</label> (keeps you signed in longer;\\n    do not use on a public computer) "
+=======
+msgid ""
+"Remember me</label> (keeps you signed in longer;\\n    do not use on a "
+"public computer) "
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Report abuse"
@@ -1769,6 +2666,7 @@ msgstr ""
 msgid "Request has been removed"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
 msgstr ""
 
@@ -1776,12 +2674,31 @@ msgid "Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{
 msgstr ""
 
 msgid "Requested from {{public_body_name}} by {{info_request_user}} on {{date}}"
+=======
+msgid ""
+"Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}."
+msgstr ""
+
+msgid ""
+"Request to {{public_body_name}} by {{info_request_user}}. Annotated by "
+"{{event_comment_user}} on {{date}}."
+msgstr ""
+
+msgid ""
+"Requested from {{public_body_name}} by {{info_request_user}} on {{date}}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Requested on {{date}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Requests for personal information and vexatious requests are not considered valid for FOI purposes (<a href=\"/help/about\">read more</a>)."
+=======
+msgid ""
+"Requests for personal information and vexatious requests are not considered "
+"valid for FOI purposes (<a href=\"/help/about\">read more</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Requests or responses matching your saved search"
@@ -1844,7 +2761,14 @@ msgstr ""
 msgid "Search in"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Search over<br/>\\n  <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>\\n  <strong>{{number_of_authorities}} authorities</strong>"
+=======
+msgid ""
+"Search over<br/>\\n  <strong>{{number_of_requests}} requests</strong> "
+"<span>and</span><br/>\\n  <strong>{{number_of_authorities}} "
+"authorities</strong>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Search queries"
@@ -1940,7 +2864,16 @@ msgstr ""
 msgid "Some of the information requested has been received"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Some people who've made requests haven't let us know whether they were\\nsuccessful or not.  We need <strong>your</strong> help &ndash;\\nchoose one of these requests, read it, and let everyone know whether or not the\\ninformation has been provided. Everyone'll be exceedingly grateful."
+=======
+msgid ""
+"Some people who've made requests haven't let us know whether they "
+"were\\nsuccessful or not.  We need <strong>your</strong> help "
+"&ndash;\\nchoose one of these requests, read it, and let everyone know "
+"whether or not the\\ninformation has been provided. Everyone'll be "
+"exceedingly grateful."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Somebody added a note to your FOI request - "
@@ -1949,10 +2882,21 @@ msgstr ""
 msgid "Someone has updated the status of your request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Someone, perhaps you, just tried to change their email address on\\n{{site_name}} from {{old_email}} to {{new_email}}."
 msgstr ""
 
 msgid "Sorry - you cannot respond to this request via {{site_name}}, because this is a copy of the request originally at {{link_to_original_request}}."
+=======
+msgid ""
+"Someone, perhaps you, just tried to change their email address "
+"on\\n{{site_name}} from {{old_email}} to {{new_email}}."
+msgstr ""
+
+msgid ""
+"Sorry - you cannot respond to this request via {{site_name}}, because this "
+"is a copy of the request originally at {{link_to_original_request}}."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Sorry, but only {{user_name}} is allowed to do that."
@@ -2003,7 +2947,13 @@ msgstr ""
 msgid "Successful."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Suggest how the requester can find the <strong>rest of the information</strong>."
+=======
+msgid ""
+"Suggest how the requester can find the <strong>rest of the "
+"information</strong>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Summary:"
@@ -2030,10 +2980,22 @@ msgstr ""
 msgid "Thank you for making an annotation!"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to "
 msgstr ""
 
 msgid "Thank you for updating the status of the request '<a href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests below for you to classify."
+=======
+msgid ""
+"Thank you for responding to this FOI request! Your response has been "
+"published below, and a link to your response has been emailed to "
+msgstr ""
+
+msgid ""
+"Thank you for updating the status of the request '<a "
+"href=\"{{url}}\">{{info_request_title}}</a>'. There are some more requests "
+"below for you to classify."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Thank you for updating this request!"
@@ -2042,6 +3004,7 @@ msgstr ""
 msgid "Thank you for updating your profile photo"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Thanks for helping - your work will make it easier for everyone to find successful\\nresponses, and maybe even let us make league tables..."
 msgstr ""
 
@@ -2052,6 +3015,28 @@ msgid "Thanks very much for helping keep everything <strong>neat and organised</
 msgstr ""
 
 msgid "That doesn't look like a valid email address. Please check you have typed it correctly."
+=======
+msgid ""
+"Thanks for helping - your work will make it easier for everyone to find "
+"successful\\nresponses, and maybe even let us make league tables..."
+msgstr ""
+
+msgid ""
+"Thanks very much - this will help others find useful stuff. We'll\\n"
+"            also, if you need it, give advice on what to do next about "
+"your\\n            requests."
+msgstr ""
+
+msgid ""
+"Thanks very much for helping keep everything <strong>neat and "
+"organised</strong>.\\n    We'll also, if you need it, give you advice on "
+"what to do next about each of your\\n    requests."
+msgstr ""
+
+msgid ""
+"That doesn't look like a valid email address. Please check you have typed it"
+" correctly."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "The <strong>review has finished</strong> and overall:"
@@ -2063,6 +3048,7 @@ msgstr ""
 msgid "The accounts have been left as they previously were."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "The authority do <strong>not have</strong> the information <small>(maybe they say who does)"
 msgstr ""
 
@@ -2076,6 +3062,30 @@ msgid "The authority would like to / has <strong>responded by post</strong> to t
 msgstr ""
 
 msgid "The email that you, on behalf of {{public_body}}, sent to\\n{{user}} to reply to an {{law_used_short}}\\nrequest has not been delivered."
+=======
+msgid ""
+"The authority do <strong>not have</strong> the information <small>(maybe "
+"they say who does)"
+msgstr ""
+
+msgid ""
+"The authority only has a <strong>paper copy</strong> of the information."
+msgstr ""
+
+msgid ""
+"The authority say that they <strong>need a postal\\n            "
+"address</strong>, not just an email, for it to be a valid FOI request"
+msgstr ""
+
+msgid ""
+"The authority would like to / has <strong>responded by post</strong> to this"
+" request."
+msgstr ""
+
+msgid ""
+"The email that you, on behalf of {{public_body}}, sent to\\n{{user}} to "
+"reply to an {{law_used_short}}\\nrequest has not been delivered."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "The page doesn't exist. Things you can try now:"
@@ -2093,7 +3103,13 @@ msgstr ""
 msgid "The request has been <strong>refused</strong>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "The request has been updated since you originally loaded this page. Please check for any new incoming messages below, and try again."
+=======
+msgid ""
+"The request has been updated since you originally loaded this page. Please "
+"check for any new incoming messages below, and try again."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "The request is <strong>waiting for clarification</strong>."
@@ -2111,12 +3127,20 @@ msgstr ""
 msgid "The request was refused by the public authority"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "The request you have tried to view has been removed. There are\\nvarious reasons why we might have done this, sorry we can't be more specific here. Please <a\\n    href=\"%s\">contact us</a> if you have any questions."
+=======
+msgid ""
+"The request you have tried to view has been removed. There are\\nvarious "
+"reasons why we might have done this, sorry we can't be more specific here. "
+"Please <a\\n    href=\"%s\">contact us</a> if you have any questions."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "The requester has abandoned this request for some reason"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "The response to your request has been <strong>delayed</strong>.  You can say that, \\n            by law, the authority should normally have responded\\n            <strong>promptly</strong> and"
 msgstr ""
 
@@ -2127,6 +3151,28 @@ msgid "The search index is currently offline, so we can't show the Freedom of In
 msgstr ""
 
 msgid "The search index is currently offline, so we can't show the Freedom of Information requests this person has made."
+=======
+msgid ""
+"The response to your request has been <strong>delayed</strong>.  You can say"
+" that, \\n            by law, the authority should normally have "
+"responded\\n            <strong>promptly</strong> and"
+msgstr ""
+
+msgid ""
+"The response to your request is <strong>long overdue</strong>.   You can say"
+" that, by \\n            law, under all circumstances, the authority should "
+"have responded\\n            by now"
+msgstr ""
+
+msgid ""
+"The search index is currently offline, so we can't show the Freedom of "
+"Information requests that have been made to this authority."
+msgstr ""
+
+msgid ""
+"The search index is currently offline, so we can't show the Freedom of "
+"Information requests this person has made."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Then you can cancel the alert."
@@ -2177,19 +3223,41 @@ msgstr ""
 msgid "Then you will be following all new FOI requests."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Then you will be notified whenever '{{user_name}}' requests something or gets a response."
 msgstr ""
 
 msgid "Then you will be notified whenever a new request or response matches your search."
+=======
+msgid ""
+"Then you will be notified whenever '{{user_name}}' requests something or "
+"gets a response."
+msgstr ""
+
+msgid ""
+"Then you will be notified whenever a new request or response matches your "
+"search."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Then you will be notified whenever an FOI request succeeds."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Then you will be notified whenever someone requests something or gets a response from '{{public_body_name}}'."
 msgstr ""
 
 msgid "Then you will be updated whenever the request '{{request_title}}' is updated."
+=======
+msgid ""
+"Then you will be notified whenever someone requests something or gets a "
+"response from '{{public_body_name}}'."
+msgstr ""
+
+msgid ""
+"Then you will be updated whenever the request '{{request_title}}' is "
+"updated."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Then you'll be allowed to send FOI requests."
@@ -2201,7 +3269,13 @@ msgstr ""
 msgid "Then your annotation to {{info_request_title}} will be posted."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "There are {{count}} new annotations on your {{info_request}} request. Follow this link to see what they wrote."
+=======
+msgid ""
+"There are {{count}} new annotations on your {{info_request}} request. Follow"
+" this link to see what they wrote."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "There is %d person following this request"
@@ -2213,6 +3287,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+<<<<<<< HEAD
 msgid "There is <strong>more than one person</strong> who uses this site and has this name.\\n    One of them is shown below, you may mean a different one:"
 msgstr ""
 
@@ -2220,6 +3295,24 @@ msgid "There is a limit on the number of requests you can make in a day, because
 msgstr ""
 
 msgid "There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team."
+=======
+msgid ""
+"There is <strong>more than one person</strong> who uses this site and has "
+"this name.\\n    One of them is shown below, you may mean a different one:"
+msgstr ""
+
+msgid ""
+"There is a limit on the number of requests you can make in a day, because we"
+" don’t want public authorities to be bombarded with large numbers of "
+"inappropriate requests. If you feel you have a good reason to ask for the "
+"limit to be lifted in your case, please <a href='{{help_contact_path}}'>get "
+"in touch</a>."
+msgstr ""
+
+msgid ""
+"There was a <strong>delivery error</strong> or similar, which needs fixing "
+"by the {{site_name}} team."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "There was an error with the words you entered, please try again."
@@ -2234,16 +3327,33 @@ msgstr ""
 msgid "They are going to reply <strong>by post</strong>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "They do <strong>not have</strong> the information <small>(maybe they say who does)</small>"
+=======
+msgid ""
+"They do <strong>not have</strong> the information <small>(maybe they say who"
+" does)</small>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "They have been given the following explanation:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law"
 msgstr ""
 
 msgid "They have not replied to your {{law_used_short}} request {{title}}, \\nas required by law"
+=======
+msgid ""
+"They have not replied to your {{law_used_short}} request {{title}} promptly,"
+" as normally required by law"
+msgstr ""
+
+msgid ""
+"They have not replied to your {{law_used_short}} request {{title}}, \\nas "
+"required by law"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Things to do with this request"
@@ -2255,15 +3365,28 @@ msgstr ""
 msgid "This authority no longer exists, so you cannot make a request to it."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This comment has been hidden. See annotations to\\n            find out why.  If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response."
 msgstr ""
 
 msgid "This covers a very wide spectrum of information about the state of\\n            the <strong>natural and built environment</strong>, such as:"
+=======
+msgid ""
+"This comment has been hidden. See annotations to\\n            find out why."
+"  If you are the requester, then you may <a href=\"%s\">sign in</a> to view "
+"the response."
+msgstr ""
+
+msgid ""
+"This covers a very wide spectrum of information about the state of\\n"
+"            the <strong>natural and built environment</strong>, such as:"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This external request has been hidden"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This is a plain-text version of the Freedom of Information request \"{{request_title}}\".  The latest, full version is available online at {{full_url}}"
 msgstr ""
 
@@ -2277,12 +3400,44 @@ msgid "This is your own request, so you will be automatically emailed when new r
 msgstr ""
 
 msgid "This outgoing message has been hidden. See annotations to\\n\t\t\t\t\t\tfind out why.  If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response."
+=======
+msgid ""
+"This is a plain-text version of the Freedom of Information request "
+"\"{{request_title}}\".  The latest, full version is available online at "
+"{{full_url}}"
+msgstr ""
+
+msgid ""
+"This is an HTML version of an attachment to the Freedom of Information "
+"request"
+msgstr ""
+
+msgid ""
+"This is because {{title}} is an old request that has been\\nmarked to no "
+"longer receive responses."
+msgstr ""
+
+msgid ""
+"This is your own request, so you will be automatically emailed when new "
+"responses arrive."
+msgstr ""
+
+msgid ""
+"This outgoing message has been hidden. See annotations to\\n\t\t\t\t\t\tfind"
+" out why.  If you are the requester, then you may <a href=\"%s\">sign in</a>"
+" to view the response."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This particular request is finished:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This person has made no Freedom of Information requests using this site."
+=======
+msgid ""
+"This person has made no Freedom of Information requests using this site."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This person's %d Freedom of Information request"
@@ -2315,6 +3470,7 @@ msgstr ""
 msgid "This request has an <strong>unknown status</strong>."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This request has been <strong>hidden</strong> from the site, because an administrator considers it not to be an FOI request"
 msgstr ""
 
@@ -2328,11 +3484,40 @@ msgid "This request has been <strong>withdrawn</strong> by the person who made i
 msgstr ""
 
 msgid "This request has been marked for review by the site administrators, who have not hidden it at this time. If you believe it should be hidden, please <a href=\"%s\">contact us</a>."
+=======
+msgid ""
+"This request has been <strong>hidden</strong> from the site, because an "
+"administrator considers it not to be an FOI request"
+msgstr ""
+
+msgid ""
+"This request has been <strong>hidden</strong> from the site, because an "
+"administrator considers it vexatious"
+msgstr ""
+
+msgid ""
+"This request has been <strong>reported</strong> as needing administrator "
+"attention (perhaps because it is vexatious, or a request for personal "
+"information)"
+msgstr ""
+
+msgid ""
+"This request has been <strong>withdrawn</strong> by the person who made "
+"it.\\n               There may be an explanation in the correspondence "
+"below."
+msgstr ""
+
+msgid ""
+"This request has been marked for review by the site administrators, who have"
+" not hidden it at this time. If you believe it should be hidden, please <a "
+"href=\"%s\">contact us</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This request has been reported for administrator attention"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This request has been set by an administrator to \"allow new responses from nobody\""
 msgstr ""
 
@@ -2343,6 +3528,26 @@ msgid "This request has prominence 'hidden'. You can only see it because you are
 msgstr ""
 
 msgid "This request is hidden, so that only you the requester can see it. Please\\n    <a href=\"%s\">contact us</a> if you are not sure why."
+=======
+msgid ""
+"This request has been set by an administrator to \"allow new responses from "
+"nobody\""
+msgstr ""
+
+msgid ""
+"This request has had an unusual response, and <strong>requires "
+"attention</strong> from the {{site_name}} team."
+msgstr ""
+
+msgid ""
+"This request has prominence 'hidden'. You can only see it because you are "
+"logged\\n    in as a super user."
+msgstr ""
+
+msgid ""
+"This request is hidden, so that only you the requester can see it. Please\\n"
+"    <a href=\"%s\">contact us</a> if you are not sure why."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This request is still in progress:"
@@ -2351,16 +3556,36 @@ msgstr ""
 msgid "This request was not made via {{site_name}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This response has been hidden. See annotations to find out why.\\n            If you are the requester, then you may <a href=\"%s\">sign in</a> to view the response."
 msgstr ""
 
 msgid "This table shows the technical details of the internal events that happened\\nto this request on {{site_name}}. This could be used to generate information about\\nthe speed with which authorities respond to requests, the number of requests\\nwhich require a postal response and much more."
+=======
+msgid ""
+"This response has been hidden. See annotations to find out why.\\n"
+"            If you are the requester, then you may <a href=\"%s\">sign "
+"in</a> to view the response."
+msgstr ""
+
+msgid ""
+"This table shows the technical details of the internal events that "
+"happened\\nto this request on {{site_name}}. This could be used to generate "
+"information about\\nthe speed with which authorities respond to requests, "
+"the number of requests\\nwhich require a postal response and much more."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "This user has been banned from {{site_name}} "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "This was not possible because there is already an account using \\nthe email address {{email}}."
+=======
+msgid ""
+"This was not possible because there is already an account using \\nthe email"
+" address {{email}}."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "To cancel these alerts"
@@ -2369,7 +3594,13 @@ msgstr ""
 msgid "To cancel this alert"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "To carry on, you need to sign in or make an account. Unfortunately, there\\nwas a technical problem trying to do this."
+=======
+msgid ""
+"To carry on, you need to sign in or make an account. Unfortunately, "
+"there\\nwas a technical problem trying to do this."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "To change your email address used on {{site_name}}"
@@ -2399,16 +3630,34 @@ msgstr ""
 msgid "To follow requests by '{{user_name}}'"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "To follow requests made using {{site_name}} to the public authority '{{public_body_name}}'"
+=======
+msgid ""
+"To follow requests made using {{site_name}} to the public authority "
+"'{{public_body_name}}'"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "To follow the request '{{request_title}}'"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "To help us keep the site tidy, someone else has updated the status of the \\n{{law_used_full}} request {{title}} that you made to {{public_body}}, to \"{{display_status}}\" If you disagree with their categorisation, please update the status again yourself to what you believe to be more accurate."
 msgstr ""
 
 msgid "To let everyone know, follow this link and then select the appropriate box."
+=======
+msgid ""
+"To help us keep the site tidy, someone else has updated the status of the "
+"\\n{{law_used_full}} request {{title}} that you made to {{public_body}}, to "
+"\"{{display_status}}\" If you disagree with their categorisation, please "
+"update the status again yourself to what you believe to be more accurate."
+msgstr ""
+
+msgid ""
+"To let everyone know, follow this link and then select the appropriate box."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "To log into the administrative interface"
@@ -2438,6 +3687,7 @@ msgstr ""
 msgid "To update the status of this FOI request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "To upload a response, you must be logged in using an email address from "
 msgstr ""
 
@@ -2445,6 +3695,20 @@ msgid "To use the advanced search, combine phrases and labels as described in th
 msgstr ""
 
 msgid "To view the email address that we use to send FOI requests to {{public_body_name}}, please enter these words."
+=======
+msgid ""
+"To upload a response, you must be logged in using an email address from "
+msgstr ""
+
+msgid ""
+"To use the advanced search, combine phrases and labels as described in the "
+"search tips below."
+msgstr ""
+
+msgid ""
+"To view the email address that we use to send FOI requests to "
+"{{public_body_name}}, please enter these words."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "To view the response, click on the link below."
@@ -2489,7 +3753,13 @@ msgstr ""
 msgid "Tweet this request"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January."
+=======
+msgid ""
+"Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show "
+"things that happened in the first two weeks of January."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "URL name can't be blank"
@@ -2510,10 +3780,22 @@ msgstr ""
 msgid "Unexpected search result type "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Unfortunately we don't know the FOI\\nemail address for that authority, so we can't validate this.\\nPlease <a href=\"%s\">contact us</a> to sort it out."
 msgstr ""
 
 msgid "Unfortunately, we do not have a working {{info_request_law_used_full}}\\naddress for"
+=======
+msgid ""
+"Unfortunately we don't know the FOI\\nemail address for that authority, so "
+"we can't validate this.\\nPlease <a href=\"%s\">contact us</a> to sort it "
+"out."
+msgstr ""
+
+msgid ""
+"Unfortunately, we do not have a working "
+"{{info_request_law_used_full}}\\naddress for"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Unknown"
@@ -2534,10 +3816,21 @@ msgstr ""
 msgid "Upload FOI response"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Use OR (in capital letters) where you don't mind which word,  e.g. <strong><code>commons OR lords</code></strong>"
 msgstr ""
 
 msgid "Use quotes when you want to find an exact phrase, e.g. <strong><code>\"Liverpool City Council\"</code></strong>"
+=======
+msgid ""
+"Use OR (in capital letters) where you don't mind which word,  e.g. "
+"<strong><code>commons OR lords</code></strong>"
+msgstr ""
+
+msgid ""
+"Use quotes when you want to find an exact phrase, e.g. "
+"<strong><code>\"Liverpool City Council\"</code></strong>"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "User"
@@ -2627,10 +3920,21 @@ msgstr ""
 msgid "Waiting clarification."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request."
 msgstr ""
 
 msgid "Waiting for the public authority to complete an internal review of their handling of the request"
+=======
+msgid ""
+"Waiting for an <strong>internal review</strong> by {{public_body_link}} of "
+"their handling of this request."
+msgstr ""
+
+msgid ""
+"Waiting for the public authority to complete an internal review of their "
+"handling of the request"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Waiting for the public authority to reply"
@@ -2642,6 +3946,7 @@ msgstr ""
 msgid "We do not have a working request email address for this authority."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "We do not have a working {{law_used_full}} address for {{public_body_name}}."
 msgstr ""
 
@@ -2655,6 +3960,31 @@ msgid "We will not reveal your email address to anybody unless you\\nor the law
 msgstr ""
 
 msgid "We will not reveal your email addresses to anybody unless you\\nor the law tell us to."
+=======
+msgid ""
+"We do not have a working {{law_used_full}} address for {{public_body_name}}."
+msgstr ""
+
+msgid ""
+"We don't know whether the most recent response to this request contains\\n"
+"    information or not\\n        &ndash;\\n\tif you are {{user_link}} please"
+" <a href=\"{{url}}\">sign in</a> and let everyone know."
+msgstr ""
+
+msgid ""
+"We will not reveal your email address to anybody unless you or\\n        the"
+" law tell us to (<a href=\"%s\">details</a>). "
+msgstr ""
+
+msgid ""
+"We will not reveal your email address to anybody unless you\\nor the law "
+"tell us to."
+msgstr ""
+
+msgid ""
+"We will not reveal your email addresses to anybody unless you\\nor the law "
+"tell us to."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "We're waiting for"
@@ -2663,6 +3993,7 @@ msgstr ""
 msgid "We're waiting for someone to read"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "We've sent an email to your new email address. You'll need to click the link in\\nit before your email address will be changed."
 msgstr ""
 
@@ -2670,6 +4001,21 @@ msgid "We've sent you an email, and you'll need to click the link in it before y
 msgstr ""
 
 msgid "We've sent you an email, click the link in it, then you can change your password."
+=======
+msgid ""
+"We've sent an email to your new email address. You'll need to click the link"
+" in\\nit before your email address will be changed."
+msgstr ""
+
+msgid ""
+"We've sent you an email, and you'll need to click the link in it before you "
+"can\\ncontinue."
+msgstr ""
+
+msgid ""
+"We've sent you an email, click the link in it, then you can change your "
+"password."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "What are you doing?"
@@ -2684,6 +4030,7 @@ msgstr ""
 msgid "What information has been requested?"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "When you get there, please update the status to say if the response \\ncontains any useful information."
 msgstr ""
 
@@ -2691,6 +4038,21 @@ msgid "When you receive the paper response, please help\\n            others fin
 msgstr ""
 
 msgid "When you're done, <strong>come back here</strong>, <a href=\"%s\">reload this page</a> and file your new request."
+=======
+msgid ""
+"When you get there, please update the status to say if the response "
+"\\ncontains any useful information."
+msgstr ""
+
+msgid ""
+"When you receive the paper response, please help\\n            others find "
+"out what it says:"
+msgstr ""
+
+msgid ""
+"When you're done, <strong>come back here</strong>, <a href=\"%s\">reload "
+"this page</a> and file your new request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Which of these is happening?"
@@ -2741,7 +4103,13 @@ msgstr ""
 msgid "You are already following updates about {{track_description}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You are currently receiving notification of new activity on your wall by email."
+=======
+msgid ""
+"You are currently receiving notification of new activity on your wall by "
+"email."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You are following all new successful responses"
@@ -2750,12 +4118,19 @@ msgstr ""
 msgid "You are no longer following {{track_description}}."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You are now <a href=\"{{wall_url_user}}\">following</a> updates about {{track_description}}"
+=======
+msgid ""
+"You are now <a href=\"{{wall_url_user}}\">following</a> updates about "
+"{{track_description}}"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You can <strong>complain</strong> by"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You can change the requests and users you are following on <a href=\"{{profile_url}}\">your profile page</a>."
 msgstr ""
 
@@ -2763,15 +4138,42 @@ msgid "You can get this page in computer-readable format as part of the main JSO
 msgstr ""
 
 msgid "You can only request information about the environment from this authority."
+=======
+msgid ""
+"You can change the requests and users you are following on <a "
+"href=\"{{profile_url}}\">your profile page</a>."
+msgstr ""
+
+msgid ""
+"You can get this page in computer-readable format as part of the main "
+"JSON\\npage for the request.  See the <a href=\"{{api_path}}\">API "
+"documentation</a>."
+msgstr ""
+
+msgid ""
+"You can only request information about the environment from this authority."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You have a new response to the {{law_used_full}} request "
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You have found a bug.  Please <a href=\"{{contact_url}}\">contact us</a> to tell us about the problem"
 msgstr ""
 
 msgid "You have hit the rate limit on new requests. Users are ordinarily limited to {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. You will be able to make another request in {{can_make_another_request}}."
+=======
+msgid ""
+"You have found a bug.  Please <a href=\"{{contact_url}}\">contact us</a> to "
+"tell us about the problem"
+msgstr ""
+
+msgid ""
+"You have hit the rate limit on new requests. Users are ordinarily limited to"
+" {{max_requests_per_user_per_day}} requests in any rolling 24-hour period. "
+"You will be able to make another request in {{can_make_another_request}}."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You have made no Freedom of Information requests using this site."
@@ -2783,6 +4185,7 @@ msgstr ""
 msgid "You have now changed your email address used on {{site_name}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You just tried to sign up to {{site_name}}, when you\\nalready have an account. Your name and password have been\\nleft as they previously were.\\n\\nPlease click on the link below."
 msgstr ""
 
@@ -2796,6 +4199,34 @@ msgid "You may be able to find\\n    one on their website, or by phoning them up
 msgstr ""
 
 msgid "You may be able to find\\none on their website, or by phoning them up and asking. If you manage\\nto find one, then please <a href=\"{{help_url}}\">send it to us</a>."
+=======
+msgid ""
+"You just tried to sign up to {{site_name}}, when you\\nalready have an "
+"account. Your name and password have been\\nleft as they previously "
+"were.\\n\\nPlease click on the link below."
+msgstr ""
+
+msgid ""
+"You know what caused the error, and can <strong>suggest a solution</strong>,"
+" such as a working email address."
+msgstr ""
+
+msgid ""
+"You may <strong>include attachments</strong>. If you would like to attach "
+"a\\n  file too large for email, use the form below."
+msgstr ""
+
+msgid ""
+"You may be able to find\\n    one on their website, or by phoning them up "
+"and asking. If you manage\\n    to find one, then please <a href=\"%s\">send"
+" it to us</a>."
+msgstr ""
+
+msgid ""
+"You may be able to find\\none on their website, or by phoning them up and "
+"asking. If you manage\\nto find one, then please <a "
+"href=\"{{help_url}}\">send it to us</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You need to be logged in to change the text about you on your profile."
@@ -2810,6 +4241,7 @@ msgstr ""
 msgid "You need to be logged in to edit your profile."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You previously submitted that exact follow up message for this request."
 msgstr ""
 
@@ -2820,15 +4252,47 @@ msgid "You want to <strong>give your postal address</strong> to the authority in
 msgstr ""
 
 msgid "You will be unable to make new requests, send follow ups, add annotations or\\nsend messages to other users. You may continue to view other requests, and set\\nup\\nemail alerts."
+=======
+msgid ""
+"You previously submitted that exact follow up message for this request."
+msgstr ""
+
+msgid ""
+"You should have received a copy of the request by email, and you can "
+"respond\\n  by <strong>simply replying</strong> to that email. For your "
+"convenience, here is the address:"
+msgstr ""
+
+msgid ""
+"You want to <strong>give your postal address</strong> to the authority in "
+"private."
+msgstr ""
+
+msgid ""
+"You will be unable to make new requests, send follow ups, add annotations "
+"or\\nsend messages to other users. You may continue to view other requests, "
+"and set\\nup\\nemail alerts."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You will no longer be emailed updates for those alerts"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "You will now be emailed updates about {{track_description}}. <a href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>"
 msgstr ""
 
 msgid "You will only get an answer to your request if you follow up\\nwith the clarification."
+=======
+msgid ""
+"You will now be emailed updates about {{track_description}}. <a "
+"href=\"{{change_email_alerts_url}}\">Prefer not to receive emails?</a>"
+msgstr ""
+
+msgid ""
+"You will only get an answer to your request if you follow up\\nwith the "
+"clarification."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>"
@@ -2861,19 +4325,39 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
+<<<<<<< HEAD
 msgid "Your <strong>name will appear publicly</strong> \\n        (<a href=\"%s\">why?</a>)\\n        on this website and in search engines. If you\\n        are thinking of using a pseudonym, please \\n        <a href=\"%s\">read this first</a>."
+=======
+msgid ""
+"Your <strong>name will appear publicly</strong> \\n        (<a "
+"href=\"%s\">why?</a>)\\n        on this website and in search engines. If "
+"you\\n        are thinking of using a pseudonym, please \\n        <a "
+"href=\"%s\">read this first</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your annotations"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your details, including your email address, have not been given to anyone."
+=======
+msgid ""
+"Your details, including your email address, have not been given to anyone."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your e-mail:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your follow up has not been sent because this request has been stopped to prevent spam. Please <a href=\"%s\">contact us</a> if you really want to send a follow up message."
+=======
+msgid ""
+"Your follow up has not been sent because this request has been stopped to "
+"prevent spam. Please <a href=\"%s\">contact us</a> if you really want to "
+"send a follow up message."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your follow up message has been sent on its way."
@@ -2882,7 +4366,13 @@ msgstr ""
 msgid "Your internal review request has been sent on its way."
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your message has been sent. Thank you for getting in touch! We'll get back to you soon."
+=======
+msgid ""
+"Your message has been sent. Thank you for getting in touch! We'll get back "
+"to you soon."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your message to {{recipient_user_name}} has been sent"
@@ -2894,10 +4384,20 @@ msgstr ""
 msgid "Your message will appear in <strong>search engines</strong>"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your name and annotation will appear in <strong>search engines</strong>."
 msgstr ""
 
 msgid "Your name, request and any responses will appear in <strong>search engines</strong>\\n        (<a href=\"%s\">details</a>)."
+=======
+msgid ""
+"Your name and annotation will appear in <strong>search engines</strong>."
+msgstr ""
+
+msgid ""
+"Your name, request and any responses will appear in <strong>search "
+"engines</strong>\\n        (<a href=\"%s\">details</a>)."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your name:"
@@ -2912,10 +4412,21 @@ msgstr ""
 msgid "Your password:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your photo will be shown in public <strong>on the Internet</strong>,\\n    wherever you do something on {{site_name}}."
 msgstr ""
 
 msgid "Your request was called {{info_request}}. Letting everyone know whether you got the information will help us keep tabs on"
+=======
+msgid ""
+"Your photo will be shown in public <strong>on the Internet</strong>,\\n    "
+"wherever you do something on {{site_name}}."
+msgstr ""
+
+msgid ""
+"Your request was called {{info_request}}. Letting everyone know whether you "
+"got the information will help us keep tabs on"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your request:"
@@ -2924,10 +4435,21 @@ msgstr ""
 msgid "Your response to an FOI request was not delivered"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "Your response will <strong>appear on the Internet</strong>, <a href=\"%s\">read why</a> and answers to other questions."
 msgstr ""
 
 msgid "Your thoughts on what the {{site_name}} <strong>administrators</strong> should do about the request."
+=======
+msgid ""
+"Your response will <strong>appear on the Internet</strong>, <a "
+"href=\"%s\">read why</a> and answers to other questions."
+msgstr ""
+
+msgid ""
+"Your thoughts on what the {{site_name}} <strong>administrators</strong> "
+"should do about the request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "Your {{site_name}} email alert"
@@ -2948,7 +4470,13 @@ msgstr ""
 msgid "[{{site_name}} contact email]"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had strange characters removed. ]"
+=======
+msgid ""
+"\\n\\n[ {{site_name}} note: The above text was badly encoded, and has had "
+"strange characters removed. ]"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "a one line summary of the information you are requesting, \\n\t\t\te.g."
@@ -2969,7 +4497,13 @@ msgstr ""
 msgid "and"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "and update the status accordingly. Perhaps <strong>you</strong> might like to help out by doing that?"
+=======
+msgid ""
+"and update the status accordingly. Perhaps <strong>you</strong> might like "
+"to help out by doing that?"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "and update the status."
@@ -3017,7 +4551,13 @@ msgstr ""
 msgid "comments"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "containing your postal address, and asking them to reply to this request.\\n            Or you could phone them."
+=======
+msgid ""
+"containing your postal address, and asking them to reply to this request.\\n"
+"            Or you could phone them."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "details"
@@ -3086,7 +4626,15 @@ msgstr ""
 msgid "no later than"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "no longer exists. If you are trying to make\\n    From the request page, try replying to a particular message, rather than sending\\n    a general followup. If you need to make a general followup, and know\\n    an email which will go to the right place, please <a href=\"%s\">send it to us</a>."
+=======
+msgid ""
+"no longer exists. If you are trying to make\\n    From the request page, try"
+" replying to a particular message, rather than sending\\n    a general "
+"followup. If you need to make a general followup, and know\\n    an email "
+"which will go to the right place, please <a href=\"%s\">send it to us</a>."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "normally"
@@ -3104,7 +4652,13 @@ msgstr ""
 msgid "requests which are {{list_of_statuses}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "response as needing administrator attention. Take a look, and reply to this\\nemail to let them know what you are going to do about it."
+=======
+msgid ""
+"response as needing administrator attention. Take a look, and reply to "
+"this\\nemail to let them know what you are going to do about it."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "send a follow up message"
@@ -3185,7 +4739,15 @@ msgstr ""
 msgid "{{count}} FOI requests found"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{existing_request_user}} already\\n      created the same request on {{date}}. You can either view the <a href=\"{{existing_request}}\">existing request</a>,\\n      or edit the details below to make a new but similar request."
+=======
+msgid ""
+"{{existing_request_user}} already\\n      created the same request on "
+"{{date}}. You can either view the <a href=\"{{existing_request}}\">existing "
+"request</a>,\\n      or edit the details below to make a new but similar "
+"request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "{{info_request_user_name}} only:"
@@ -3218,21 +4780,30 @@ msgstr ""
 msgid "{{public_body_name}} only:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{public_body}} has asked you to explain part of your {{law_used}} request."
+=======
+msgid ""
+"{{public_body}} has asked you to explain part of your {{law_used}} request."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "{{public_body}} sent a response to {{user_name}}"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{reason}}, please sign in or make a new account."
 msgstr ""
 
+=======
+>>>>>>> hotfix/0.6.8.3
 msgid "{{search_results}} matching '{{query}}'"
 msgstr ""
 
 msgid "{{site_name}} blog and tweets"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{site_name}} covers requests to {{number_of_authorities}} authorities, including:"
 msgstr ""
 
@@ -3240,6 +4811,20 @@ msgid "{{site_name}} sends new requests to <strong>{{request_email}}</strong> fo
 msgstr ""
 
 msgid "{{site_name}} users have made {{number_of_requests}} requests, including:"
+=======
+msgid ""
+"{{site_name}} covers requests to {{number_of_authorities}} authorities, "
+"including:"
+msgstr ""
+
+msgid ""
+"{{site_name}} sends new requests to <strong>{{request_email}}</strong> for "
+"this authority."
+msgstr ""
+
+msgid ""
+"{{site_name}} users have made {{number_of_requests}} requests, including:"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "{{title}} - a Freedom of Information request to {{public_body}}"
@@ -3257,7 +4842,13 @@ msgstr ""
 msgid "{{user_name}} added an annotation"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this link to see what they wrote."
+=======
+msgid ""
+"{{user_name}} has annotated your {{law_used_short}} \\nrequest. Follow this "
+"link to see what they wrote."
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "{{user_name}} has used {{site_name}} to send you the message below."
@@ -3272,7 +4863,14 @@ msgstr ""
 msgid "{{username}} left an annotation:"
 msgstr ""
 
+<<<<<<< HEAD
 msgid "{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a href=\"{{public_body_admin_url}}\">admin</a>)"
+=======
+msgid ""
+"{{user}} ({{user_admin_link}}) made this {{law_used_full}} request (<a "
+"href=\"{{request_admin_url}}\">admin</a>) to {{public_body_link}} (<a "
+"href=\"{{public_body_admin_url}}\">admin</a>)"
+>>>>>>> hotfix/0.6.8.3
 msgstr ""
 
 msgid "{{user}} made this {{law_used_full}} request"
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 52e05a063..68cae9493 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -13,9 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-12-18 10:11+0000\n"
 "PO-Revision-Date: 2012-12-18 10:14+0000\n"
 "Last-Translator: louisecrow <louise@mysociety.org>\n"
+=======
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2012-11-29 14:58+0000\n"
+"Last-Translator: janakneschke <jana.kneschke@gmail.com>\n"
+>>>>>>> hotfix/0.6.8.3
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/cy/app.po b/locale/cy/app.po
index 2ed1354a8..8e45ac3f1 100644
--- a/locale/cy/app.po
+++ b/locale/cy/app.po
@@ -8,9 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-12-18 10:11+0000\n"
 "PO-Revision-Date: 2012-12-18 10:14+0000\n"
 "Last-Translator: louisecrow <louise@mysociety.org>\n"
+=======
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2012-11-20 22:54+0000\n"
+"Last-Translator: skenaja <alex@alexskene.com>\n"
+>>>>>>> hotfix/0.6.8.3
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/en_IE/app.po b/locale/en_IE/app.po
index 5b7ec0eb7..3834d0613 100644
--- a/locale/en_IE/app.po
+++ b/locale/en_IE/app.po
@@ -9,9 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-12-18 10:11+0000\n"
 "PO-Revision-Date: 2012-12-18 10:14+0000\n"
 "Last-Translator: louisecrow <louise@mysociety.org>\n"
+=======
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2012-12-06 18:57+0000\n"
+"Last-Translator: confirmordeny <mrjohncross@googlemail.com>\n"
+>>>>>>> hotfix/0.6.8.3
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/es/app.po b/locale/es/app.po
index f9995d57b..e38669b7b 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -12,9 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-12-18 10:11+0000\n"
 "PO-Revision-Date: 2012-12-18 10:14+0000\n"
 "Last-Translator: louisecrow <louise@mysociety.org>\n"
+=======
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2012-11-29 00:22+0000\n"
+"Last-Translator: David Cabo <david.cabo@gmail.com>\n"
+>>>>>>> hotfix/0.6.8.3
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/locale/pt_BR/app.po b/locale/pt_BR/app.po
index 32597cd08..96f22eba6 100644
--- a/locale/pt_BR/app.po
+++ b/locale/pt_BR/app.po
@@ -22,9 +22,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-12-18 10:11+0000\n"
 "PO-Revision-Date: 2012-12-18 10:14+0000\n"
 "Last-Translator: louisecrow <louise@mysociety.org>\n"
+=======
+"POT-Creation-Date: 2012-11-06 16:35+0000\n"
+"PO-Revision-Date: 2012-12-16 02:00+0000\n"
+"Last-Translator: gabinardy <gabileitao@gmail.com>\n"
+>>>>>>> hotfix/0.6.8.3
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"