[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk

2 files changed, 15 insertions, 15 deletions

diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 83119f58ed1..cd4ae4a432c 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-08-03 08:48+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-10 08:27+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-11 04:46+0000\n"
+"X-Generator: Launchpad (build 16356)\n"
 "Language: hr\n"
 
 #. module: process
@@ -39,7 +39,7 @@ msgstr "Povezani izbornik"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -50,7 +50,7 @@ msgstr "Tipke"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: process
 #: view:process.node:0
@@ -137,7 +137,7 @@ msgstr "Prijelazi Hodograma"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "Promijenio:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -149,7 +149,7 @@ msgstr "ID Radnje"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "Proces"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -171,7 +171,7 @@ msgstr "Prazan"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "Procesi"
 
 #. module: process
 #: field:process.transition.action,transition_id:0
@@ -197,7 +197,7 @@ msgstr "Početni prijelazi"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "Povezani:"
 
 #. module: process
 #: view:process.node:0
@@ -213,7 +213,7 @@ msgstr "Bilješke"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "Uredi proces"
 
 #. module: process
 #. openerp-web
@@ -252,7 +252,7 @@ msgstr "Radnja"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "Odaberi proces"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -300,7 +300,7 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "Ostali uvjeti"
 
 #. module: process
 #: model:ir.ui.menu,name:process.menu_process
@@ -339,7 +339,7 @@ msgstr "Čvorište neke vrste"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "Podtokovi:"
 
 #. module: process
 #: view:process.node:0
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 73ca4396ce6..0737bce1522 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -228,7 +228,7 @@ instance.web.ViewManager.include({
                     context: dataset.context
                     }).done(function(result) {
                         action_manager.replace(self.$el);
-                        action_manager.do_action(result.result);
+                        action_manager.do_action(result);
                     })
             });
     },