aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2015-04-16 09:41:43 +0100
committerGareth Rees <gareth@mysociety.org>2015-04-16 09:41:43 +0100
commite8d41fe0bee2d6ca178ff06324f01dfca2bf638e (patch)
treeb1b65c86e94a59a6479e17a757ebaea8bc6302fc
parent5ee6f349f65fd1336db67f2ac16adf171f2d903b (diff)
parent048d915913aa1e0201e2154191021e9e90d69c5d (diff)
Merge branch 'hotfix/0.21.0.18'0.21.0.18
-rw-r--r--config/initializers/alaveteli.rb2
-rw-r--r--locale/es_NI/app.po4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb
index b263ef97f..54fb5f870 100644
--- a/config/initializers/alaveteli.rb
+++ b/config/initializers/alaveteli.rb
@@ -10,7 +10,7 @@ load "debug_helpers.rb"
load "util.rb"
# Application version
-ALAVETELI_VERSION = '0.21.0.17'
+ALAVETELI_VERSION = '0.21.0.18'
# Add new inflection rules using the following format
# (all these examples are active by default):
diff --git a/locale/es_NI/app.po b/locale/es_NI/app.po
index 43dd00715..a14a1e249 100644
--- a/locale/es_NI/app.po
+++ b/locale/es_NI/app.po
@@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-03-24 10:21+0000\n"
-"PO-Revision-Date: 2015-04-15 17:43+0000\n"
+"PO-Revision-Date: 2015-04-16 08:38+0000\n"
"Last-Translator: Gareth Rees <gareth@mysociety.org>\n"
"Language-Team: Spanish (Nicaragua) (http://www.transifex.com/projects/p/alaveteli/language/es_NI/)\n"
"Language: es_NI\n"
@@ -249,7 +249,7 @@ msgstr "<strong><code>status:</code></strong> para filtrar en función del estad
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 ""
"<strong><code>tag:salud</code></strong> para buscar todas las Entidades Públicas o solicitudes con la etiqueta dada. Puedes incluir múltiples etiquetas, \n"
-" y valores, e.g. <code>tag:salud AND tag:financial_transaction:335633</code>. Por defecto, basta con que cualquiera de las etiquetas\n"
+" y valores, e.g. <code>tag:salud AND tag:no_de_recibo:335633</code>. Por defecto, basta con que cualquiera de las etiquetas\n"
" esté presente, añade <code>AND</code> explícitamente si sólo quiere resultados con todas ellas presentes."
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."