After discussing this with Seb, we have decided to keep the

msgids equal to the English strings even in the case of minor
changes, to avoid confusion when reading the code. So this
commit reverts locale/en/app.po to having blank msgstr entries
everywhere, and shifts the changes into the source code and
hence the msgids.

4 files changed, 36 insertions, 35 deletions

diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml
index 51c2379e9..40f8942ae 100644
--- a/app/views/general/search.rhtml
+++ b/app/views/general/search.rhtml
@@ -4,7 +4,7 @@
     <% @title = _("Search Freedom of Information requests, public authorities and users") %>
     <h1><%=@title%></h1>
 <% elsif @total_hits == 0 %>
-    <%= _("Nothing found for '{{search_terms}}'", :search_terms => h(@query)) %>
+    <%= _("Nothing found for ‘{{search_terms}}’", :search_terms => h(@query)) %>
 <% else %>
     <% @title = _("Results page {{page_number}}", :page_number => @page.to_s) %>
 <% end%>
@@ -68,7 +68,7 @@
 
     <% if @xapian_bodies.results.size > 0 %>
         <% if @xapian_bodies.results.size == 1 && @page == 1 %>
-            <h1><%= _('One public authority matching {{user_search_query}}', :user_search_query => h(@query)) %></h1>
+            <h1><%= _('One public authority matching ‘{{user_search_query}}’', :user_search_query => h(@query)) %></h1>
         <% else %>
             <h1><%= _('Public authorities {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}', :start_count => ((@page-1)*@bodies_per_page+1).to_s, :end_count => [@page*@bodies_per_page, @xapian_bodies.matches_estimated].min.to_s, :total_count => @xapian_bodies.matches_estimated.to_s, :user_search_query => h(@query)) %></h1>
         <% end %>
@@ -82,9 +82,9 @@
 
     <% if @xapian_users.results.size > 0 %>
         <% if @xapian_users.results.size == 1 && @page == 1 %>
-            <h1><%= _("One person matching {{user_search_query}}", :user_search_query => h(@query)) %></h1>
+            <h1><%= _("One person matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1>
         <% else %>
-            <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count =>  [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count =>  @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1>
+            <h1><%= _("People {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@users_per_page+1).to_s, :end_count =>  [@page*@users_per_page, @xapian_users.matches_estimated].min.to_s, :total_count =>  @xapian_users.matches_estimated.to_s, :user_search_query => h(@query)) %></h1>
         <% end %>
 
         <% for result in @xapian_users.results %>
@@ -96,9 +96,9 @@
 
     <% if @xapian_requests.results.size > 0 %>
         <% if @xapian_requests.results.size == 1 && @page == 1 %>
-            <h1><%= _("One FOI request matching {{user_search_query}}", :user_search_query => h(@query)) %></h1>
+            <h1><%= _("One FOI request matching ‘{{user_search_query}}’", :user_search_query => h(@query)) %></h1>
         <% else %>
-            <h1><%= _("FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for {{user_search_query}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count =>  @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1>
+            <h1><%= _("FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for ‘{{user_search_query}}’", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count =>  @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1>
         <% end %>
 
         <% if @track_thing %>
diff --git a/locale/app.pot b/locale/app.pot
index 17241b59e..3e14bbf1d 100644
--- a/locale/app.pot
+++ b/locale/app.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2011-06-16 00:36+0100\n"
+"POT-Creation-Date: 2011-06-16 19:20+0100\n"
 "PO-Revision-Date: 2011-06-14 09:06+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,7 +189,7 @@ msgstr ""
 #: app/views/general/search.rhtml:101
 msgid ""
 "FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
+"‘{{user_search_query}}’"
 msgstr ""
 
 #: app/models/profile_photo.rb:101
@@ -378,7 +378,7 @@ msgid ""
 msgstr ""
 
 #: app/views/general/search.rhtml:7
-msgid "Nothing found for '{{search_terms}}'"
+msgid "Nothing found for ‘{{search_terms}}’"
 msgstr ""
 
 #: app/views/general/frontpage.rhtml:25
@@ -388,15 +388,15 @@ msgid ""
 msgstr ""
 
 #: app/views/general/search.rhtml:99
-msgid "One FOI request matching {{user_search_query}}"
+msgid "One FOI request matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/general/search.rhtml:85
-msgid "One person matching {{user_search_query}}"
+msgid "One person matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/general/search.rhtml:71
-msgid "One public authority matching {{user_search_query}}"
+msgid "One public authority matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/public_body/show.rhtml:90
@@ -426,7 +426,7 @@ msgstr ""
 #: app/views/general/search.rhtml:87
 msgid ""
 "People {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
+"‘{{user_search_query}}’"
 msgstr ""
 
 #: app/models/profile_photo.rb:91
diff --git a/locale/en/app.po b/locale/en/app.po
index af7eb3c9a..91b90b4a7 100644
--- a/locale/en/app.po
+++ b/locale/en/app.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2011-06-16 00:36+0100\n"
+"POT-Creation-Date: 2011-06-16 19:20+0100\n"
 "PO-Revision-Date: 2011-06-14 09:06+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -189,10 +189,8 @@ msgstr ""
 #: app/views/general/search.rhtml:101
 msgid ""
 "FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
-msgstr ""
-"FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for "
 "‘{{user_search_query}}’"
+msgstr ""
 
 #: app/models/profile_photo.rb:101
 msgid "Failed to convert image to a PNG"
@@ -380,8 +378,8 @@ msgid ""
 msgstr ""
 
 #: app/views/general/search.rhtml:7
-msgid "Nothing found for '{{search_terms}}'"
-msgstr "Nothing found for ‘{{search_terms}}’"
+msgid "Nothing found for ‘{{search_terms}}’"
+msgstr ""
 
 #: app/views/general/frontpage.rhtml:25
 msgid ""
@@ -390,16 +388,16 @@ msgid ""
 msgstr ""
 
 #: app/views/general/search.rhtml:99
-msgid "One FOI request matching {{user_search_query}}"
-msgstr "One FOI request matching ‘{{user_search_query}}’"
+msgid "One FOI request matching ‘{{user_search_query}}’"
+msgstr ""
 
 #: app/views/general/search.rhtml:85
-msgid "One person matching {{user_search_query}}"
-msgstr "One person matching ‘{{user_search_query}}’"
+msgid "One person matching ‘{{user_search_query}}’"
+msgstr ""
 
 #: app/views/general/search.rhtml:71
-msgid "One public authority matching {{user_search_query}}"
-msgstr "One public authority matching ‘{{user_search_query}}’"
+msgid "One public authority matching ‘{{user_search_query}}’"
+msgstr ""
 
 #: app/views/public_body/show.rhtml:90
 msgid "Only requests made using {{site_name}} are shown."
@@ -428,10 +426,8 @@ msgstr ""
 #: app/views/general/search.rhtml:87
 msgid ""
 "People {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
-msgstr ""
-"People {{start_count}} to {{end_count}} of {{total_count}} for "
 "‘{{user_search_query}}’"
+msgstr ""
 
 #: app/models/profile_photo.rb:91
 msgid "Please choose a file containing your photo."
diff --git a/locale/es/app.po b/locale/es/app.po
index e628465f6..2186f3e45 100644
--- a/locale/es/app.po
+++ b/locale/es/app.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
-"POT-Creation-Date: 2011-06-16 00:36+0100\n"
+"POT-Creation-Date: 2011-06-16 19:20+0100\n"
 "PO-Revision-Date: 2011-06-14 09:18+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -196,10 +196,13 @@ msgid "EximLog|Order"
 msgstr ""
 
 #: app/views/general/search.rhtml:101
+#, fuzzy
 msgid ""
 "FOI requests  {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
+"‘{{user_search_query}}’"
 msgstr ""
+"Peuples {{start_count}} a {{end_count}} de {{total_count}} pour "
+"{{user_search_query}}"
 
 #: app/models/profile_photo.rb:101
 msgid "Failed to convert image to a PNG"
@@ -392,7 +395,8 @@ msgstr ""
 "con esto sita"
 
 #: app/views/general/search.rhtml:7
-msgid "Nothing found for '{{search_terms}}'"
+#, fuzzy
+msgid "Nothing found for ‘{{search_terms}}’"
 msgstr "Rien por {{search_terms}}"
 
 #: app/views/general/frontpage.rhtml:25
@@ -403,15 +407,15 @@ msgstr ""
 "Ou <strong>busqar</strong> per infos los autros requesta com {{site_name}}"
 
 #: app/views/general/search.rhtml:99
-msgid "One FOI request matching {{user_search_query}}"
+msgid "One FOI request matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/general/search.rhtml:85
-msgid "One person matching {{user_search_query}}"
+msgid "One person matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/general/search.rhtml:71
-msgid "One public authority matching {{user_search_query}}"
+msgid "One public authority matching ‘{{user_search_query}}’"
 msgstr ""
 
 #: app/views/public_body/show.rhtml:90
@@ -439,9 +443,10 @@ msgid "OutgoingMessage|What doing"
 msgstr ""
 
 #: app/views/general/search.rhtml:87
+#, fuzzy
 msgid ""
 "People {{start_count}} to {{end_count}} of {{total_count}} for "
-"{{user_search_query}}"
+"‘{{user_search_query}}’"
 msgstr ""
 "Peuples {{start_count}} a {{end_count}} de {{total_count}} pour "
 "{{user_search_query}}"