Merge branch 'hotfix/0.26.0.5'

mysociety · Jan 20, 2017 · 1fbed2a · 1fbed2a
2 parents 0196ef5 + 49b2bd3
commit 1fbed2a
Show file tree

Hide file tree

Showing 5 changed files with 295 additions and 281 deletions.
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
@@ -11,7 +11,7 @@
 load "util.rb"
 
 # Application version
-ALAVETELI_VERSION = '0.26.0.4'
+ALAVETELI_VERSION = '0.26.0.5'
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -6,6 +6,18 @@
 
 ### Changed Templates
 
+# 0.26.0.5
+
+## Highlighted Features
+
+* Added an instruction line to the translation source to warn against using
+  double quotes for the email name translation string (Liz Conlan)
+* Updated translations for Italy and Nepal (Liz Conlan)
+
+## Upgrade Notes
+
+* This hotfix just includes translation updates.
+
 # 0.26.0.4
 
 ## Highlighted Features

diff --git a/locale/en/app.po b/locale/en/app.po
@@ -4225,6 +4225,7 @@ msgstr "{{info_request_user_name}}"
 msgid "{{law_used_full}} request - {{title}}"
 msgstr "{{law_used_full}} request - {{title}}"
 
+#, Please don't use double quotes (") in this translation or it will break the site's ability to send emails to authorities!
 msgid "{{law_used}} requests at {{public_body}}"
 msgstr "{{law_used}} requests at {{public_body}}"
 

diff --git a/locale/it/app.po b/locale/it/app.po
@@ -6,6 +6,7 @@
 # Translators:
 # Translators:
 # Translators:
+# Translators:
 # Antonella <[email protected]>, 2014-2015
 # Claudio Cesarano <[email protected]>, 2015-2016
 # Giancarlo <[email protected]>, 2015
@@ -19,7 +20,7 @@ msgstr ""
 "Project-Id-Version: alaveteli\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-01-12 08:44-0800\n"
-"PO-Revision-Date: 2017-01-16 09:59+0000\n"
+"PO-Revision-Date: 2017-01-20 13:35+0000\n"
 "Last-Translator: Liz Conlan <[email protected]>\n"
 "Language-Team: Italian (http://www.transifex.com/mysociety/alaveteli/language/it/)\n"
 "Language: it\n"
@@ -4244,7 +4245,7 @@ msgid "{{law_used_full}} request - {{title}}"
 msgstr "Richiesta di accesso secondo il {{law_used_full}}  - {{title}}"
 
 msgid "{{law_used}} requests at {{public_body}}"
-msgstr "Richieste di accesso inviate a {{public_body}} secondo il {{law_used}}"
+msgstr "Destinatario delle richieste di {{law_used}} o generalizzato indirizzate a '{{public_body}}'"
 
 msgid "{{length_of_time}} ago"
 msgstr "{{length_of_time}} fa"