[MERGE] change placeholder inclusion logic

bzr revid: nwi@openerp.com-20121228094324-9mtvfbcm4cthefzr

addons/web/i18n/es.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-22 07:01+0000\n"
-"Last-Translator: Santi (Pexego) <santiago@pexego.es>\n"
+"PO-Revision-Date: 2012-12-27 16:27+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-23 05:09+0000\n"
+"X-Launchpad-Export-Date: 2012-12-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: web
@@ -103,7 +103,7 @@ msgstr "Acceso denegado"
 #: code:addons/web/static/src/js/view_form.js:5183
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Error de subida"
 
 #. module: web
 #. openerp-web
@@ -126,7 +126,7 @@ msgstr "Respaldar base de datos"
 #: code:addons/web/static/src/js/views.js:463
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "Vista %(view_type)s"
 
 #. module: web
 #. openerp-web
@@ -271,7 +271,7 @@ msgstr "Contraseña nueva:"
 #: code:addons/web/static/src/xml/base.xml:610
 #, python-format
 msgid "Attachment :"
-msgstr ""
+msgstr "Adjunto:"
 
 #. module: web
 #. openerp-web
@@ -539,7 +539,7 @@ msgstr "Operador no soportado %s en el dominio %s"
 #: code:addons/web/static/src/js/formats.js:242
 #, python-format
 msgid "'%s' is not a correct float"
-msgstr ""
+msgstr "'%s' no es un decimal correcto"
 
 #. module: web
 #. openerp-web
@@ -644,7 +644,7 @@ msgstr "Campos del Modelo %s"
 #: code:addons/web/static/src/js/view_list.js:893
 #, python-format
 msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
+msgstr "Estableciendo atributo 'id' en registro %s existente"
 
 #. module: web
 #. openerp-web
@@ -755,7 +755,7 @@ msgstr "Guardar como"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:3
 #, python-format
 msgid "00:00:00"
-msgstr ""
+msgstr "00:00:00"
 
 #. module: web
 #. openerp-web
@@ -1026,7 +1026,7 @@ msgstr "Guardar lista de campos"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:5
 #, python-format
 msgid "Start"
-msgstr ""
+msgstr "Iniciar"
 
 #. module: web
 #. openerp-web
@@ -1369,7 +1369,7 @@ msgstr "La confirmación no coincide con la contraseña"
 #: code:addons/web/static/src/xml/base.xml:441
 #, python-format
 msgid "Edit Company data"
-msgstr ""
+msgstr "Editar datos de la compañía"
 
 #. module: web
 #. openerp-web
@@ -1871,7 +1871,7 @@ msgstr "OpenERP"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:8
 #, python-format
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. module: web
 #. openerp-web
@@ -2057,7 +2057,7 @@ msgstr "Añadir: "
 #: code:addons/web/static/src/xml/base.xml:1858
 #, python-format
 msgid "Quick Add"
-msgstr ""
+msgstr "Añadido rápido"
 
 #. module: web
 #. openerp-web
@@ -2098,7 +2098,7 @@ msgstr "Cargar datos de demostración:"
 #: code:addons/web/static/src/xml/base.xml:615
 #, python-format
 msgid "Created by :"
-msgstr ""
+msgstr "Creado por:"
 
 #. module: web
 #. openerp-web
@@ -2479,7 +2479,7 @@ msgstr "Campo:"
 #: code:addons/web/static/src/xml/base.xml:620
 #, python-format
 msgid "Modified by :"
-msgstr ""
+msgstr "Modificado por:"
 
 #. module: web
 #. openerp-web
@@ -2523,6 +2523,8 @@ msgstr "Especial:"
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
 msgstr ""
+"La antigua contraseña que se ha introducido no es correcta. Su contraseña no "
+"se ha cambiado."
 
 #. module: web
 #. openerp-web

addons/web/i18n/hu.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-22 07:03+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-27 09:12+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-23 05:09+0000\n"
+"X-Launchpad-Export-Date: 2012-12-28 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: web
@@ -103,7 +103,7 @@ msgstr "Hozzáférés megtagadva"
 #: code:addons/web/static/src/js/view_form.js:5183
 #, python-format
 msgid "Uploading error"
-msgstr ""
+msgstr "Feltültési hiba"
 
 #. module: web
 #. openerp-web
@@ -126,7 +126,7 @@ msgstr "Adatbázis mentése"
 #: code:addons/web/static/src/js/views.js:463
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "%(view_type)s nézet"
 
 #. module: web
 #. openerp-web
@@ -271,7 +271,7 @@ msgstr "Új jelszó:"
 #: code:addons/web/static/src/xml/base.xml:610
 #, python-format
 msgid "Attachment :"
-msgstr ""
+msgstr "Melléklet :"
 
 #. module: web
 #. openerp-web
@@ -753,7 +753,7 @@ msgstr "Mentés másként"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:3
 #, python-format
 msgid "00:00:00"
-msgstr ""
+msgstr "00:00:00"
 
 #. module: web
 #. openerp-web
@@ -1022,7 +1022,7 @@ msgstr "Mezőlisták mentése"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:5
 #, python-format
 msgid "Start"
-msgstr ""
+msgstr "Indítás"
 
 #. module: web
 #. openerp-web
@@ -1365,7 +1365,7 @@ msgstr "A megerősítés nem egyezik a jelszóval"
 #: code:addons/web/static/src/xml/base.xml:441
 #, python-format
 msgid "Edit Company data"
-msgstr ""
+msgstr "Vállalkozás adatainak szerkesztése"
 
 #. module: web
 #. openerp-web
@@ -1863,7 +1863,7 @@ msgstr "OpenERP"
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:8
 #, python-format
 msgid "Stop"
-msgstr ""
+msgstr "Leállítás"
 
 #. module: web
 #. openerp-web
@@ -2090,7 +2090,7 @@ msgstr "Bemutató adatok betöltése:"
 #: code:addons/web/static/src/xml/base.xml:615
 #, python-format
 msgid "Created by :"
-msgstr ""
+msgstr "Hétrehozta:"
 
 #. module: web
 #. openerp-web
@@ -2470,7 +2470,7 @@ msgstr "Mező:"
 #: code:addons/web/static/src/xml/base.xml:620
 #, python-format
 msgid "Modified by :"
-msgstr ""
+msgstr "Módosította:"
 
 #. module: web
 #. openerp-web