From 5bf6176b43caacdae2eecf391959d37a346d35b0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 11:58:21 +0100
Subject: [PATCH 01/22] [WIP] relflow

bzr revid: fme@openerp.com-20121213105821-i2f5o693fyljpc9n
---
 addons/web/static/src/js/chrome.js | 22 ++++++++++++++++++++--
 addons/web/static/src/xml/base.xml | 17 +++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 56af4c9d564..00cff06b139 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -804,6 +804,7 @@ instance.web.Menu =  instance.web.Widget.extend({
         this.maximum_visible_links = 'auto'; // # of menu to show. 0 = do not crop, 'auto' = algo
         this.data = {data:{children:[]}};
         this.on("menu_loaded", this, function (menu_data) {
+            self.reflow();
             // launch the fetch of needaction counters, asynchronous
             if (!_.isEmpty(menu_data.all_menu_ids)) {
                 this.rpc("/web/menu/load_needaction", {menu_ids: menu_data.all_menu_ids}).done(function(r) {
@@ -811,7 +812,6 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
-        
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -829,7 +829,6 @@ instance.web.Menu =  instance.web.Widget.extend({
         var self = this;
         this.data = {data: data};
         this.renderElement();
-        this.limit_entries();
         // Hide toplevel item if there is only one
         var $toplevel = this.$("li");
         if($toplevel.length == 1) {
@@ -856,6 +855,25 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
         });
     },
+    reflow: function() {
+        var self = this;
+        var $more_container = $('.oe_menu_more_container');
+        var $more = $('.oe_menu_more');
+        $more.find('li').before($more_container);
+        var $li = this.$el.find('> li').not($more_container).hide();
+        var remaining_space = self.$el.parent().width();
+        remaining_space -= self.$el.parent().children(':visible').not(this.$el).width();
+        //debugger
+        $li.each(function() {
+            remaining_space -= self.$el.children(':visible').width();
+            if ($(this).width() > remaining_space) {
+                return false;
+            }
+            $(this).show();
+        });
+        $li.filter(':hidden').appendTo($more);
+        $more_container.toggle(!!$more.children().length);
+    },
     limit_entries: function() {
         var maximum_visible_links = this.maximum_visible_links;
         if (maximum_visible_links === 'auto') {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 576f179854d..cfaf2a2dc4f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -348,16 +348,17 @@
         <li t-foreach="widget.data.data.children" t-as="menu">
             <t t-call="Menu.link"/>
         </li>
+        <li t-foreach="widget.data.data.children" t-as="menu">
+            <t t-call="Menu.link"/>
+        </li>
+        <li class="oe_menu_more_container">
+            <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
+                More
+                <ul class="oe_menu_more oe_dropdown_menu"/>
+            </span>
+        </li>
     </ul>
 </t>
-<t t-name="Menu.more">
-    <li class="oe_menu_more_container">
-        <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
-            More
-            <ul class="oe_menu_more oe_dropdown_menu"/>
-        </span>
-    </li>
-</t>
 <t t-name="Menu.secondary">
     <div t-foreach="widget.data.data.children" t-as="menu" style="display: none" class="oe_secondary_menu" t-att-data-menu-parent="menu.id">
         <t t-foreach="menu.children" t-as="menu">

From e611e759ce16128ca3a83680fe8d6aad5f042528 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 12:04:32 +0100
Subject: [PATCH 02/22] [FIX] remaining width computing

bzr revid: fme@openerp.com-20121213110432-crxrhp4xc08bixql
---
 addons/web/static/src/js/chrome.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 00cff06b139..2481b3821e8 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -861,11 +861,11 @@ instance.web.Menu =  instance.web.Widget.extend({
         var $more = $('.oe_menu_more');
         $more.find('li').before($more_container);
         var $li = this.$el.find('> li').not($more_container).hide();
-        var remaining_space = self.$el.parent().width();
-        remaining_space -= self.$el.parent().children(':visible').not(this.$el).width();
-        //debugger
         $li.each(function() {
-            remaining_space -= self.$el.children(':visible').width();
+            var remaining_space = self.$el.parent().width();
+            self.$el.parent().children(':visible').each(function() {
+                remaining_space -= $(this).outerWidth();
+            });
             if ($(this).width() > remaining_space) {
                 return false;
             }

From c50dd4839683292e306ea3c83f1a80377246fef7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 12:32:20 +0100
Subject: [PATCH 03/22] [FIX] reflow on window resize

bzr revid: fme@openerp.com-20121213113220-y6smha0sjp7bagk3
---
 addons/web/static/src/js/chrome.js | 35 +++++++++++-------------------
 addons/web/static/src/xml/base.xml |  5 +----
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2481b3821e8..3bf5d6fb846 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -812,6 +812,15 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
+        var resizing_timer = null;
+        instance.web.bus.on('resize', this, function() {
+            if (resizing_timer) {
+                clearTimeout(resizing_timer);
+            }
+            resizing_timer = setTimeout(function() {
+                self.reflow();
+            }, 500);
+        });
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -857,12 +866,12 @@ instance.web.Menu =  instance.web.Widget.extend({
     },
     reflow: function() {
         var self = this;
-        var $more_container = $('.oe_menu_more_container');
+        var $more_container = $('.oe_menu_more_container').hide();
         var $more = $('.oe_menu_more');
-        $more.find('li').before($more_container);
+        $more.find('> li').insertBefore($more_container);
         var $li = this.$el.find('> li').not($more_container).hide();
         $li.each(function() {
-            var remaining_space = self.$el.parent().width();
+            var remaining_space = self.$el.parent().width() - $more_container.outerWidth();
             self.$el.parent().children(':visible').each(function() {
                 remaining_space -= $(this).outerWidth();
             });
@@ -871,27 +880,9 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
             $(this).show();
         });
-        $li.filter(':hidden').appendTo($more);
+        $more.append($li.filter(':hidden').show());
         $more_container.toggle(!!$more.children().length);
     },
-    limit_entries: function() {
-        var maximum_visible_links = this.maximum_visible_links;
-        if (maximum_visible_links === 'auto') {
-            maximum_visible_links = this.auto_limit_entries();
-        }
-        if (maximum_visible_links < this.data.data.children.length) {
-            var $more = $(QWeb.render('Menu.more')),
-                $index = this.$el.find('li').eq(maximum_visible_links - 1);
-            $index.after($more);
-            //$('.oe_topbar').append($more);
-            $more.find('.oe_menu_more').append($index.next().nextAll());
-        }
-    },
-    auto_limit_entries: function() {
-        // TODO: auto detect overflow and bind window on resize
-        var width = $(window).width();
-        return Math.floor(width / 125);
-    },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand
      * except does not trigger any event on the way
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index cfaf2a2dc4f..1897eed3292 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -348,10 +348,7 @@
         <li t-foreach="widget.data.data.children" t-as="menu">
             <t t-call="Menu.link"/>
         </li>
-        <li t-foreach="widget.data.data.children" t-as="menu">
-            <t t-call="Menu.link"/>
-        </li>
-        <li class="oe_menu_more_container">
+        <li class="oe_menu_more_container" style="display: none;">
             <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
                 More
                 <ul class="oe_menu_more oe_dropdown_menu"/>

From 66e925213e635e12d74bfe4f72dcd453f371cab0 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 12:45:55 +0100
Subject: [PATCH 04/22] [IMP] Hide menu during resize

bzr revid: fme@openerp.com-20121213114555-bhimmbx8i11hqahn
---
 addons/web/static/src/js/chrome.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3bf5d6fb846..f49fd41cd97 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -813,13 +813,16 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
         });
         var resizing_timer = null;
-        instance.web.bus.on('resize', this, function() {
+        instance.web.bus.on('resize', this, function(ev) {
             if (resizing_timer) {
                 clearTimeout(resizing_timer);
+            } else {
+                self.$el.hide();
             }
             resizing_timer = setTimeout(function() {
                 self.reflow();
-            }, 500);
+                resizing_timer = null;
+            }, 300);
         });
     },
     start: function() {
@@ -866,6 +869,7 @@ instance.web.Menu =  instance.web.Widget.extend({
     },
     reflow: function() {
         var self = this;
+        this.$el.show();
         var $more_container = $('.oe_menu_more_container').hide();
         var $more = $('.oe_menu_more');
         $more.find('> li').insertBefore($more_container);

From 5e91c006830416325c822f918364ad91ed500075 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 13:26:34 +0100
Subject: [PATCH 05/22] [FIX] Move single toplevel element exception in reflow
 code

bzr revid: fme@openerp.com-20121213122634-li7j4pvpcw02lchx
---
 addons/web/static/src/js/chrome.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index f49fd41cd97..2510d136cfd 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -873,7 +873,7 @@ instance.web.Menu =  instance.web.Widget.extend({
         var $more_container = $('.oe_menu_more_container').hide();
         var $more = $('.oe_menu_more');
         $more.find('> li').insertBefore($more_container);
-        var $li = this.$el.find('> li').not($more_container).hide();
+        var $li = this.$('> li').not($more_container).hide();
         $li.each(function() {
             var remaining_space = self.$el.parent().width() - $more_container.outerWidth();
             self.$el.parent().children(':visible').each(function() {
@@ -886,6 +886,11 @@ instance.web.Menu =  instance.web.Widget.extend({
         });
         $more.append($li.filter(':hidden').show());
         $more_container.toggle(!!$more.children().length);
+        // Hide toplevel item if there is only one
+        var $toplevel = this.$("> li:visible");
+        if ($toplevel.length === 1) {
+            $toplevel.hide();
+        }
     },
     /**
      * Opens a given menu by id, as if a user had browsed to that menu by hand

From e38a9501a4f0a7035594c1282192b4d409087f93 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 14:01:18 +0100
Subject: [PATCH 06/22] [IMP] Add doc to Menu#reflow()

bzr revid: fme@openerp.com-20121213130118-mg3nrl7twqa24plc
---
 addons/web/static/src/js/chrome.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2510d136cfd..7c94268bb34 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -867,6 +867,10 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
         });
     },
+    /**
+     * Reflow the menu items and dock overflowing items into a "More" menu item.
+     * Automatically called when 'menu_loaded' event is triggered and on window resizing.
+     */
     reflow: function() {
         var self = this;
         this.$el.show();

From a724c43257252e19a9bb37fca9a01aae0c8bf8f5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 13 Dec 2012 14:41:00 +0100
Subject: [PATCH 07/22] [REM] Removed unused code

bzr revid: fme@openerp.com-20121213134100-cw8igmyvxvabex8x
---
 addons/web/static/src/js/chrome.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 7c94268bb34..a6f75a5de6c 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -841,11 +841,6 @@ instance.web.Menu =  instance.web.Widget.extend({
         var self = this;
         this.data = {data: data};
         this.renderElement();
-        // Hide toplevel item if there is only one
-        var $toplevel = this.$("li");
-        if($toplevel.length == 1) {
-            $toplevel.hide();
-        }
         this.$secondary_menus.html(QWeb.render("Menu.secondary", { widget : this }));
         this.$el.on('click', 'a[data-menu]', this.on_menu_click);
         // Hide second level submenus

From 3a2a2823c71bc9e55962b336648611e213d91ae7 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Dec 2012 13:32:56 +0100
Subject: [PATCH 08/22] [FIX] global jquery selectors

bzr revid: fme@openerp.com-20121217123256-43dkvg2sl6mjilbb
---
 addons/web/static/src/js/chrome.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index e3d5c9452f4..1c5585478e4 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -869,8 +869,8 @@ instance.web.Menu =  instance.web.Widget.extend({
     reflow: function() {
         var self = this;
         this.$el.show();
-        var $more_container = $('.oe_menu_more_container').hide();
-        var $more = $('.oe_menu_more');
+        var $more_container = this.$('.oe_menu_more_container').hide();
+        var $more = this.$('.oe_menu_more');
         $more.find('> li').insertBefore($more_container);
         var $li = this.$('> li').not($more_container).hide();
         $li.each(function() {

From 318418a4021a3d9932b267fa42923217c2d8c009 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Dec 2012 13:36:58 +0100
Subject: [PATCH 09/22] [IMP] Consistend jquery api usage

bzr revid: fme@openerp.com-20121217123658-wq046m8j5q9qw7xy
---
 addons/web/static/src/js/chrome.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 1c5585478e4..4bfc1946b14 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -871,8 +871,8 @@ instance.web.Menu =  instance.web.Widget.extend({
         this.$el.show();
         var $more_container = this.$('.oe_menu_more_container').hide();
         var $more = this.$('.oe_menu_more');
-        $more.find('> li').insertBefore($more_container);
-        var $li = this.$('> li').not($more_container).hide();
+        $more.children('li').insertBefore($more_container);
+        var $li = this.$el.children('li').not($more_container).hide();
         $li.each(function() {
             var remaining_space = self.$el.parent().width() - $more_container.outerWidth();
             self.$el.parent().children(':visible').each(function() {
@@ -886,7 +886,7 @@ instance.web.Menu =  instance.web.Widget.extend({
         $more.append($li.filter(':hidden').show());
         $more_container.toggle(!!$more.children().length);
         // Hide toplevel item if there is only one
-        var $toplevel = this.$("> li:visible");
+        var $toplevel = this.$el.children("li:visible");
         if ($toplevel.length === 1) {
             $toplevel.hide();
         }

From c3e74781ca3976d2ec919cd2a4085ca97e2fba17 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 17 Dec 2012 14:21:08 +0100
Subject: [PATCH 10/22] [IMP] Renamed variable $li to $topmenu_items

bzr revid: fme@openerp.com-20121217132108-o1q31cvovpoeou91
---
 addons/web/static/src/js/chrome.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 4bfc1946b14..b06dda90eca 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -872,8 +872,8 @@ instance.web.Menu =  instance.web.Widget.extend({
         var $more_container = this.$('.oe_menu_more_container').hide();
         var $more = this.$('.oe_menu_more');
         $more.children('li').insertBefore($more_container);
-        var $li = this.$el.children('li').not($more_container).hide();
-        $li.each(function() {
+        var $toplevel_items = this.$el.children('li').not($more_container).hide();
+        $toplevel_items.each(function() {
             var remaining_space = self.$el.parent().width() - $more_container.outerWidth();
             self.$el.parent().children(':visible').each(function() {
                 remaining_space -= $(this).outerWidth();
@@ -883,7 +883,7 @@ instance.web.Menu =  instance.web.Widget.extend({
             }
             $(this).show();
         });
-        $more.append($li.filter(':hidden').show());
+        $more.append($toplevel_items.filter(':hidden').show());
         $more_container.toggle(!!$more.children().length);
         // Hide toplevel item if there is only one
         var $toplevel = this.$el.children("li:visible");

From ffae4652de6631e132da73f11e6cf1769ef89a96 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Tue, 18 Dec 2012 17:20:43 +0530
Subject: [PATCH 11/22] [FIX] All OpenERP RML Reports are enabled with
 transparent Image support.

bzr revid: tta@openerp.com-20121218115043-1yx5b2q7eqcf8xbx
---
 openerp/report/render/rml2pdf/trml2pdf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py
index 81faef88a93..57699f4c807 100644
--- a/openerp/report/render/rml2pdf/trml2pdf.py
+++ b/openerp/report/render/rml2pdf/trml2pdf.py
@@ -493,7 +493,7 @@ class _rml_canvas(object):
             img = ImageReader(s)
             (sx,sy) = img.getSize()
             _logger.debug("Image is %dx%d", sx, sy)
-            args = { 'x': 0.0, 'y': 0.0 }
+            args = { 'x': 0.0, 'y': 0.0, 'mask': 'auto'}
             for tag in ('width','height','x','y'):
                 if node.get(tag):
                     args[tag] = utils.unit_get(node.get(tag))

From 56248183fc87b8eba9af50acddc81087a84bc34b Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Wed, 19 Dec 2012 05:22:38 +0000
Subject: [PATCH 12/22] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20121219051749-jfkdv3ohgd61z9pq
bzr revid: launchpad_translations_on_behalf_of_openerp-20121219052238-gjyvmd0dp8pahk2c
---
 addons/account/i18n/de.po                     |   55 +-
 addons/account/i18n/es.po                     |  278 +++-
 addons/account/i18n/fr.po                     |   17 +-
 addons/account/i18n/pt.po                     |  103 +-
 addons/account/i18n/sl.po                     |  111 +-
 addons/account_analytic_analysis/i18n/de.po   |   27 +-
 addons/account_analytic_default/i18n/fr.po    |   25 +-
 addons/account_asset/i18n/sl.po               |   28 +-
 addons/account_followup/i18n/pt_BR.po         |  233 +++-
 addons/account_payment/i18n/it.po             |   45 +-
 .../analytic_contract_hr_expense/i18n/de.po   |   10 +-
 .../analytic_contract_hr_expense/i18n/fr.po   |   72 +
 addons/anonymization/i18n/de.po               |   24 +-
 addons/audittrail/i18n/de.po                  |   18 +-
 addons/audittrail/i18n/fr.po                  |   20 +-
 addons/auth_ldap/i18n/de.po                   |   14 +-
 addons/auth_openid/i18n/ro.po                 |   10 +-
 addons/base_import/i18n/de.po                 | 1164 +++++++++++++++++
 addons/base_import/i18n/fr.po                 |   16 +-
 addons/base_report_designer/i18n/de.po        |   10 +-
 addons/board/i18n/fr.po                       |   33 +-
 addons/claim_from_delivery/i18n/fr.po         |   15 +-
 addons/contacts/i18n/fr.po                    |   18 +-
 addons/crm/i18n/fr.po                         |   29 +-
 addons/crm_claim/i18n/it.po                   |   12 +-
 addons/delivery/i18n/fr.po                    |   61 +-
 addons/delivery/i18n/it.po                    |   17 +-
 addons/document/i18n/fr.po                    |   29 +-
 addons/document/i18n/it.po                    |   23 +-
 addons/document_ftp/i18n/de.po                |   19 +-
 addons/document_page/i18n/de.po               |   54 +-
 addons/document_page/i18n/fr.po               |   46 +-
 addons/document_webdav/i18n/de.po             |   10 +-
 addons/edi/i18n/fr.po                         |   14 +-
 addons/email_template/i18n/fr.po              |   32 +-
 addons/email_template/i18n/pt_BR.po           |   44 +-
 addons/event/i18n/de.po                       |   10 +-
 addons/fetchmail/i18n/de.po                   |   16 +-
 addons/fetchmail/i18n/fr.po                   |   16 +-
 addons/fleet/i18n/fr.po                       |  637 +++++----
 addons/fleet/i18n/it.po                       |   12 +-
 addons/google_base_account/i18n/de.po         |   18 +-
 addons/google_docs/i18n/it.po                 |   56 +-
 addons/hr_recruitment/i18n/it.po              |   28 +-
 addons/knowledge/i18n/it.po                   |   12 +-
 addons/l10n_multilang/i18n/pt.po              |   10 +-
 addons/marketing/i18n/de.po                   |   34 +-
 addons/marketing/i18n/nl.po                   |   11 +-
 addons/marketing/i18n/pt.po                   |   12 +-
 addons/marketing/i18n/pt_BR.po                |   13 +-
 addons/marketing_campaign/i18n/de.po          |   30 +-
 addons/mrp/i18n/sl.po                         |   28 +-
 addons/mrp_byproduct/i18n/pt.po               |   14 +-
 addons/multi_company/i18n/es.po               |    8 +-
 addons/note/i18n/pt.po                        |   14 +-
 addons/note/i18n/ro.po                        |   78 +-
 addons/pad/i18n/pt.po                         |   12 +-
 addons/pad_project/i18n/de.po                 |    8 +-
 addons/plugin_thunderbird/i18n/de.po          |   27 +-
 addons/point_of_sale/i18n/es.po               |   16 +-
 addons/portal/i18n/it.po                      |    8 +-
 addons/portal_claim/i18n/pt.po                |   36 +
 addons/project/i18n/it.po                     |   10 +-
 addons/project/i18n/nl.po                     |   10 +-
 addons/project_gtd/i18n/de.po                 |   14 +-
 addons/project_long_term/i18n/de.po           |   34 +-
 addons/project_long_term/i18n/it.po           |   63 +-
 addons/project_mrp/i18n/de.po                 |   21 +-
 addons/project_mrp/i18n/it.po                 |   30 +-
 addons/project_timesheet/i18n/de.po           |   45 +-
 addons/project_timesheet/i18n/it.po           |   41 +-
 addons/purchase/i18n/de.po                    |   18 +-
 addons/purchase/i18n/es.po                    |   20 +-
 addons/purchase/i18n/it.po                    |   10 +-
 addons/report_webkit/i18n/de.po               |   34 +-
 addons/sale/i18n/es.po                        |  354 ++++-
 addons/sale/i18n/hr.po                        |  218 ++-
 addons/sale/i18n/pt_BR.po                     |    4 +-
 addons/sale_crm/i18n/it.po                    |   32 +-
 addons/sale_crm/i18n/pt_BR.po                 |    4 +-
 addons/sale_margin/i18n/de.po                 |    8 +-
 addons/sale_margin/i18n/pt_BR.po              |    4 +-
 addons/sale_mrp/i18n/de.po                    |   10 +-
 addons/sale_mrp/i18n/pt_BR.po                 |    4 +-
 addons/sale_order_dates/i18n/de.po            |   12 +-
 addons/sale_order_dates/i18n/pt_BR.po         |    4 +-
 addons/sale_stock/i18n/it.po                  |   12 +-
 addons/sale_stock/i18n/pt_BR.po               |    4 +-
 addons/stock/i18n/es.po                       |  634 ++++++---
 addons/stock/i18n/sl.po                       |   83 +-
 addons/stock_location/i18n/de.po              |   10 +-
 addons/subscription/i18n/de.po                |    8 +-
 addons/subscription/i18n/pt_BR.po             |   13 +-
 addons/warning/i18n/de.po                     |   10 +-
 addons/web/i18n/et.po                         |   66 +-
 addons/web_linkedin/i18n/ro.po                |    4 +-
 addons/web_shortcuts/i18n/sl.po               |   25 +
 97 files changed, 4275 insertions(+), 1498 deletions(-)
 create mode 100644 addons/analytic_contract_hr_expense/i18n/fr.po
 create mode 100644 addons/base_import/i18n/de.po
 create mode 100644 addons/portal_claim/i18n/pt.po
 create mode 100644 addons/web_shortcuts/i18n/sl.po

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 8f1de2744b4..ea6e3db775a 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 21:28+0000\n"
+"PO-Revision-Date: 2012-12-18 15:25+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \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-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -39,8 +39,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
-"Legen Sie die Reihenfolge der Anzeige im Report 'Finanz \\ Berichte \\ "
-"Allgemeine Berichte \\ Steuern \\ Steuererklärung' fest"
+"Legen Sie die Reihenfolge der Anzeige im Bericht  'Finanzen \\ Berichte \\ "
+"Standard Auswertungen \\ Steuern \\ Umsatzsteuer Anmeldung' fest"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1749,7 +1749,7 @@ msgstr "eRechnung & Zahlungen"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr "Auszug Analysekonto für Periode"
+msgstr "Kostenstellen Umsatz der Periode"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4410,7 +4410,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4544,8 +4544,8 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
-"Wenn nicht aktiviert (Berechnung durch Python Code) scheint die Steuer nicht "
-"auf der Rechnung auf."
+"Soweit nicht Berechnung durch Python Code ausgewählt wird, wird die Steuer "
+"nicht auf der Rechnung erscheinen."
 
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
@@ -4837,7 +4837,7 @@ msgstr "Anzeige Partner"
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr "Validieren"
+msgstr "Genehmigen & Buchen"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -5030,9 +5030,9 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"Analytische Kosten (Zeiterfassung, eingekaufte Produkte, ...) durch "
-"Buchungen auf Analytischen Konten. Diese Buchungen erzeugen "
-"Eingangsrechnungen im Entwurf."
+"Zu analysierende Kosten (Stundenzettel, eingekaufte Produkte, ...) werden "
+"verursacht durch Kostenstellen.  Diese erzeugen Lieferantenrechnungen im "
+"Entwurf."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6208,7 +6208,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr "Koeff. f. übergeordnete Steuer"
+msgstr "Koeffizient für Konsolidierung"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -6312,7 +6312,7 @@ msgstr "Standardauswertung Finanzen"
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr "Kommunikation"
+msgstr "Verwendungszweck"
 
 #. module: account
 #: view:account.config.settings:0
@@ -7095,7 +7095,7 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
-"Diese Auswähl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren "
+"Diese Auswahl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren "
 "oder aus einer Liste auszuwählen. Letzteres setzt voraus, dass die Vorlage "
 "vollständig ist."
 
@@ -7292,7 +7292,7 @@ msgstr "Journal & Partner"
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr "Stärke"
+msgstr "Maximum Ausgleichspositionen"
 
 #. module: account
 #: code:addons/account/account.py:3392
@@ -7334,12 +7334,12 @@ msgstr "Ausgleich Offener Posten: Gehe zu nächstem Partner"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Umgekehrter Saldo (Anal.)"
+msgstr "Kostenstellen - Kostenarten Analyse"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr "Anwendbare Art"
+msgstr "Anwendbarer Typ"
 
 #. module: account
 #: field:account.invoice.line,invoice_id:0
@@ -7405,7 +7405,7 @@ msgstr "Kostenstellen Buchungen"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Hat Unternehmensvorgabe"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7454,6 +7454,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Sie dürfen die Unternehmenszuordnung eines Kontos nicht ändern, wenn es "
+"bereits Buchungen gibt."
 
 #. module: account
 #: report:account.invoice:0
@@ -7940,7 +7942,8 @@ msgid ""
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
 "Konfigurationsfehler !\n"
-"Die Währung  sollte auch durch die Standard Konten freigegeben werden."
+"Die ausgewählte Währung sollte auch bei den verwendeten Standard Konten "
+"zugelassen werden."
 
 #. module: account
 #: code:addons/account/account.py:2251
@@ -8311,7 +8314,7 @@ msgstr "Buchungen anlegen"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
@@ -8778,7 +8781,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8788,7 +8791,7 @@ msgstr "Verweis auf automatisch generierte Buchungen"
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -10200,7 +10203,7 @@ msgstr "Start Periode"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr ""
+msgstr "Zentrales Journal"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
@@ -10210,7 +10213,7 @@ msgstr "Analysezeitraum"
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Unternehmen mit Bezug zu diesem Partner"
 
 #. module: account
 #: view:account.invoice:0
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index fd713b9b3df..eb59204e819 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-14 11:26+0000\n"
+"PO-Revision-Date: 2012-12-18 18:34+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \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-15 05:05+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -339,6 +339,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una factura rectificativa. \n"
+"</p><p>\n"
+"Una factura rectificativa es un documento que abona una factura total o "
+"parcialmente.\n"
+"</p><p>\n"
+"En lugar de crear una factura rectificativa  manualmente, puede generarla "
+"directamente desde la misma factura origen.\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: help:account.installer,charts:0
@@ -472,6 +482,12 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Le permite gestionar los activos de una compañía o persona.\n"
+"Realiza un seguimiento de la depreciación de estos activos, y crea asientos "
+"para las líneas de depreciación.\n"
+"Esto instala el módulo 'account_asset'. \n"
+"Si no marca esta casilla, podrá realizar facturas y pagos, pero no "
+"contabilidad (asientos contables, plan de cuentas, ...)"
 
 #. module: account
 #. openerp-web
@@ -1203,6 +1219,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir una cuenta.\n"
+"</p><p>\n"
+"Cuando se realizan transacciones con múltiples monedas, puede perder o ganar "
+"algún importe debido a las variaciones en el tipo de cambio. Este menú le da "
+"una previsión de las pérdidas y ganancias que se efectuaría si estas "
+"transacciones se finalizaran hoy. Sólo para cuentas que tengan una moneda "
+"secundaria configurada.\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1297,6 +1323,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un nuevo registro de caja.\n"
+"</p><p>\n"
+"Los registros de caja le permiten gestionar entradas de efectivo en sus "
+"diarios de caja. Esta función le proporciona una forma fácil de revisar los "
+"pagos en efectivo diariamente. Puede introducir las monedas que hay en su "
+"caja registradora, y después realizar registros cuando el dinero entra o "
+"sale de la caja.\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1836,6 +1872,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir un nuevo tipo de cuenta.\n"
+"</p><p>\n"
+"Se usa los tipos de cuenta para determinar cómo es usada una cuenta en cada "
+"diario. El método de cierre de un tipo de cuenta determina el proceso para "
+"el cierre anual. Informes como el balance y la cuenta de Resultados usan la "
+"categoría (Ganancia/Pérdida o balance).\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: report:account.invoice:0
@@ -2031,6 +2076,105 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>Tiene una nueva factura disponible: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Nº factura: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Total factura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha factura: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referencia pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>También es posibe pagar directamente mediante Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Para cualquier aclaración, no dude en contactar con nosotros.</p>\n"
+"    <p>Gracias por confiar en ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Teléfono:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -2247,6 +2391,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para registrar una nueva factura de proveedor.\n"
+"</p><p>\n"
+"Puede controlar la factura de su proveedor según lo que compró o recibió. "
+"OpenERP también puede generar borradores de facturas automáticamente a "
+"partir de pedidos o recibos de compra.\n"
+"</p>\n"
+"            "
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -5093,6 +5245,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Journals\\Journals."
 msgstr ""
+"No se puede encontrar ningún diario del tipo %s para esta compañía.\n"
+"\n"
+"Puede crear uno en el menú: Configuración\\Diarios\\Diarios."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -5179,6 +5334,8 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Añade la columna de moneda en el informe si la moneda difiere de la moneda "
+"de la compañía."
 
 #. module: account
 #: code:addons/account/account.py:3336
@@ -5228,7 +5385,7 @@ msgstr "Nuevo"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Impuesto de venta"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5253,6 +5410,9 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Cuando se crea el periodo, el estado es 'Borrador'. Si se imprime un "
+"informe, cambia al estado 'Imprimido'. Cuando todas las transacciones se han "
+"hecho, cambia a 'Realizado'."
 
 #. module: account
 #: code:addons/account/account.py:3147
@@ -5286,7 +5446,7 @@ msgstr "Facturas"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Marque esta casilla si la compañía es una entidad legal."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5332,7 +5492,7 @@ msgstr "Comprobar"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5402,6 +5562,8 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Configure la cuenta por defecto para las líneas de impuestos de las "
+"facturas. Dejar vacío para usar la cuenta de gastos."
 
 #. module: account
 #: code:addons/account/account.py:889
@@ -5417,7 +5579,7 @@ msgstr "Asientos a revisar"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Redondear globalmente"
 
 #. module: account
 #: field:account.bank.statement,message_comment_ids:0
@@ -5425,7 +5587,7 @@ msgstr ""
 #: field:account.invoice,message_comment_ids:0
 #: help:account.invoice,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentarios y correos electrónicos"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5445,6 +5607,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"¡Verifique por favor el importe de la factura!\n"
+"El importe total no coincide con el total calculado."
 
 #. module: account
 #: field:account.account,active:0
@@ -5460,7 +5624,7 @@ msgstr "Activo"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Control de efectivo"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -5490,7 +5654,7 @@ msgstr "Saldo por tipo de cuenta"
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
-msgstr ""
+msgstr "No hay ninguna cuenta %s en el diario %s."
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -5510,7 +5674,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Gestor financiero"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5531,7 +5695,7 @@ msgstr "Movimientos"
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Asientos de caja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5544,6 +5708,8 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Si no marca esta casilla, podrá realizar facturas y pagos, pero no "
+"contabilidad (asientos contables, plan de cuentas, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5577,6 +5743,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"No hay periodo definido para esta fecha: %s.\n"
+"Por favor, cree uno."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5629,6 +5797,8 @@ msgstr "Movimientos destino"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"El movimiento no puede ser eliminado si está enlazado a una factura. "
+"(Factura: %s - Id. mov.: %s)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5681,7 +5851,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1335
 #, python-format
 msgid "%s <b>paid</b>."
-msgstr ""
+msgstr "%s <b>pagado</b>."
 
 #. module: account
 #: view:account.financial.report:0
@@ -5706,7 +5876,7 @@ msgstr "Año"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Indica que la factura ha sido enviada."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5726,11 +5896,14 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"No se puede crear una secuencia automatica para este elemento.\n"
+"Ponga una secuencia en la definición del diario para numeración automática o "
+"cree una secuencia manual para este elemento."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Factura pro-forma "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5796,6 +5969,8 @@ msgstr "Código para calcular (si tipo=código)"
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"No se ha encontrado ningún plan de cuentas para esta compañía. Debería crear "
+"uno."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5855,6 +6030,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
+"directamente en formato HTML para poder ser insertado en las vistas kanban."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5872,6 +6049,12 @@ msgid ""
 "entry was reconciled, either the user pressed the button \"Fully "
 "Reconciled\" in the manual reconciliation process"
 msgstr ""
+"Fecha en la cual las entradas contables de la empresa fueron completamente "
+"conciliadas por última vez. Difiere de la fecha de la última conciliación "
+"realizada para esta empresa, ya que aquí se describe el hecho de que nada "
+"más fue conciliado en esta fecha. Se puede llegar a esto de 2 formas: o bien "
+"la última entrada de deber/haber fue conciliada, o el usuario pulsó el botón "
+"\"Completamente conciliado\" en el proceso manual de conciliación."
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5918,13 +6101,14 @@ msgstr "account.instalador"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Recalcular total e impuestos"
 
 #. module: account
 #: code:addons/account/account.py:1097
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"No puede modificar/eliminar un diario con asientos para este periodo."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5934,7 +6118,7 @@ msgstr "Incluir en importe base"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Nº de factura del proveedor"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5955,6 +6139,7 @@ msgstr "Calculo importe"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"No puede añadir/modificar asientos en un periodo cerrado %s del diario %s."
 
 #. module: account
 #: view:account.journal:0
@@ -5979,7 +6164,7 @@ msgstr "Inicio del período"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Vista de activo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6005,6 +6190,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Seleccione aquí el tipo de valoración relacionado con esta línea de plazo de "
+"pago. Tenga en cuenta que debería tener su última línea con el tipo 'Saldo' "
+"para asegurarse que todo el importe será tratado."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -6052,12 +6240,12 @@ msgstr "Diario asientos cierre del ejercicio"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Borrador de factura rectificativa "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Rellene este formulario si pone dinero en la caja registradora:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6116,7 +6304,7 @@ msgstr "Fecha de pago"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Líneas de apertura de caja"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6141,7 +6329,7 @@ msgstr "Importe divisa"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Redondear por línea"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6197,7 +6385,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Debe poner una longitud de periodo mayor a 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6208,7 +6396,7 @@ msgstr "Plantilla de posición fiscal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Borrador de factura rectificativa"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6245,7 +6433,7 @@ msgstr "Conciliación con desfase"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "No puede crear asientos en una cuenta de tipo vista."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6258,7 +6446,7 @@ msgstr "Importe fijo"
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
-msgstr ""
+msgstr "No puede cambiar el impuesto. Debería eliminar y recrear las líneas."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6383,7 +6571,7 @@ msgstr "Mapeo fiscal"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Seleccione compañía"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6457,7 +6645,7 @@ msgstr "Nº de líneas"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(actualizar)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6667,7 +6855,7 @@ msgstr "Línea analítica"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modelos"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1090
@@ -6760,7 +6948,7 @@ msgstr "Mostrar descendientes  en plano"
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banco y efectivo"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6847,7 +7035,7 @@ msgstr "A cobrar"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "No puede crear asiento en una cuenta cerrada."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
@@ -6874,7 +7062,7 @@ msgstr "La moneda contable relacionada si no es igual a la de la compañía."
 #: code:addons/account/installer.py:48
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6901,7 +7089,7 @@ msgstr "Patrimonio"
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Cuentas de transferencias internas"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:33
@@ -6918,7 +7106,7 @@ msgstr "Porcentaje"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Redondear globalmente"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6950,7 +7138,7 @@ msgstr "Número factura"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Diferencia"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6989,6 +7177,8 @@ msgid ""
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"No hay periodo de apertura/cierra definido. Cree por uno para establecer el "
+"saldo inicial."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -7016,12 +7206,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "¡Error de usuario!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Descartar"
 
 #. module: account
 #: selection:account.account,type:0
@@ -7039,7 +7229,7 @@ msgstr "Apuntes analíticos"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Tiene compañía por defecto"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7253,7 +7443,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "Customer invoice"
-msgstr ""
+msgstr "Factura de proveedor"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -7337,13 +7527,13 @@ msgstr "Pérdidas y ganancias (cuenta de gastos)"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Transacciones totales"
 
 #. module: account
 #: code:addons/account/account.py:635
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "No puede eliminar una cuenta que contiene asientos."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1095
@@ -7387,7 +7577,7 @@ msgstr "Manual"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Debe establecer una fecha de inicio."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7435,7 +7625,7 @@ msgstr "Asientos contables"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "No se ha encontrado periodo en la factura."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7480,7 +7670,7 @@ msgstr "Todos los asientos"
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "Sólo puede conciliar apuntes con la misma empresa."
 
 #. module: account
 #: view:account.journal.select:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ab240056600..828bcaeaa92 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-07 15:21+0000\n"
-"Last-Translator: Frederic Clementi - Camptocamp.com "
-"<frederic.clementi@camptocamp.com>\n"
+"PO-Revision-Date: 2012-12-18 18:03+0000\n"
+"Last-Translator: Pierre Lamarche (www.savoirfairelinux.com) "
+"<pierre.lamarche@savoirfairelinux.com>\n"
 "Language-Team: \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-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -91,6 +91,8 @@ msgstr "Règlement enregistré dans le système"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"La position fiscale d'un compte peut être définie seulement une seule fois "
+"pour ce compte"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -132,7 +134,7 @@ msgstr "Solde dû"
 #: code:addons/account/account_bank_statement.py:368
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "L'élément \"%s\" du journal n'est pas valide"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -297,6 +299,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Définissez le compte analytique qui sera utilisé par défaut sur les lignes "
+"de taxes des factures. Laissez vide si, par défaut, vous ne voulez pas "
+"utiliser un compte analytique sur les lignes de taxes des factures."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 4a5438d948c..d8e8d89743a 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-13 16:07+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
+"PO-Revision-Date: 2012-12-18 15:21+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \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-14 05:37+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -108,6 +108,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Erro!\n"
+"Não pode criar modelos de conta de forma recursiva."
 
 #. module: account
 #. openerp-web
@@ -357,7 +359,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Permitir várias divisas"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -962,6 +964,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                     Não foram encontradas entradas em diário.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1632
@@ -1007,7 +1013,7 @@ msgstr "Limite"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Diário de compras"
 
 #. module: account
 #: code:addons/account/account.py:1316
@@ -1342,7 +1348,7 @@ msgstr "Taxa de câmbios nas vendas"
 #. module: account
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Modelo"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1434,7 +1440,7 @@ msgstr "Nível"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Só se pode mudar a divisa num rascunho de fatura."
 
 #. module: account
 #: report:account.invoice:0
@@ -1505,7 +1511,7 @@ msgstr "Opções de relatório"
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Ano fiscal a ser fechado"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
@@ -1634,7 +1640,7 @@ msgstr "Nota de crédito"
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "Faturação eletrónica e pagamentos"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1711,7 +1717,7 @@ msgstr "Sem imposto"
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Configurações avançadas"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2025,7 +2031,7 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2089,7 +2095,7 @@ msgstr "Montante do crédito"
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2188,7 +2194,7 @@ msgstr "Análise de faturas"
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de criação de mensagem eletrónica"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -2234,7 +2240,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Divisa padrão da empresa"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2282,7 +2288,7 @@ msgstr "Válido"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
@@ -2311,14 +2317,14 @@ msgstr "Relatório de Balancete de Antiguidade de Contas  Experimental"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Fechar ano fiscal"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Diáro:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2356,7 +2362,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Bom trabalho!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
@@ -2737,7 +2743,7 @@ msgstr "Posições Fiscais"
 #: code:addons/account/account_move_line.py:578
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Não se pode criar entradas em diário numa conta já fechada %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2770,7 +2776,7 @@ msgstr "Estado de rascunho de uma fatura"
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Propriedades da conta"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2857,7 +2863,7 @@ msgstr "EXJ"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Credit Note"
-msgstr ""
+msgstr "Criar nota de crédito"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -3167,7 +3173,7 @@ msgstr "Fechar montante"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens por ler"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3204,7 +3210,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Diário de vendas"
 
 #. module: account
 #: code:addons/account/account.py:2293
@@ -3308,7 +3314,7 @@ msgstr "Conta de Despesas"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3431,7 +3437,7 @@ msgstr "Escolha o Ano Fiscal"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Intervalo de datas"
 
 #. module: account
 #: view:account.period:0
@@ -3615,7 +3621,7 @@ msgstr "Templates de Plano de Contas"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transações"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -4031,7 +4037,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4314,7 +4320,7 @@ msgstr "ID Parceiro"
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
@@ -4355,7 +4361,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1131
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Não se pode usar uma conta inativa."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4386,7 +4392,7 @@ msgstr "Dependentes consolidados"
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4423,7 +4429,7 @@ msgstr "título"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft credit note"
-msgstr ""
+msgstr "Criar um rascunho de nota de crédito"
 
 #. module: account
 #: view:account.invoice:0
@@ -4455,7 +4461,7 @@ msgstr "Ativos"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Contabilidade e finanças"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4632,6 +4638,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Erro!\n"
+"Não se pode criar códigos de imposto de forma recursiva."
 
 #. module: account
 #: constraint:account.period:0
@@ -4639,6 +4647,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Erro!\n"
+"As durações dos períodos são inválidas."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4676,7 +4686,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de medida do produto"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -4936,6 +4946,9 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Erro!\n"
+"Não se pode criar uma conta que esteja dependente de uma conta pertencente a "
+"outra empresa."
 
 #. module: account
 #: code:addons/account/account_invoice.py:615
@@ -5071,7 +5084,7 @@ msgstr "Fatura cancelada"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "As minhas faturas"
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5185,7 +5198,7 @@ msgstr "Cheque"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5278,7 +5291,7 @@ msgstr ""
 #: field:account.invoice,message_comment_ids:0
 #: help:account.invoice,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6235,7 +6248,7 @@ msgstr "Mapeamento Fiscal"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Selecione a empresa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6310,7 +6323,7 @@ msgstr "Número de linhas"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(atualizar)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6519,7 +6532,7 @@ msgstr "Linha analítica"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modelos"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1090
@@ -6699,7 +6712,7 @@ msgstr "A receber"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Não se pode criar entradas em diário numa conta já fechada."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
@@ -7238,7 +7251,7 @@ msgstr "Manual"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Tem de definir uma data de início"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7466,6 +7479,8 @@ msgid ""
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Erro!\n"
+"O início do ano fiscal deve ser anterior ao seu fim."
 
 #. module: account
 #: view:account.tax.template:0
@@ -7774,7 +7789,7 @@ msgstr "Criar movimentos"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
@@ -8205,6 +8220,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Erro!\n"
+"Não se pode criar contas de forma recursiva."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index e35ca349aa1..ea074478e7e 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 16:09+0000\n"
+"PO-Revision-Date: 2012-12-18 22:31+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \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-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -291,7 +291,7 @@ msgid ""
 "This includes all the basic requirements of voucher entries for bank, cash, "
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
-msgstr ""
+msgstr "Poslovanje z vavčerji"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -923,7 +923,7 @@ msgstr "Pošlji po e-pošti"
 msgid ""
 "Print Report with the currency column if the currency differs from the "
 "company currency."
-msgstr ""
+msgstr "Poročilo z valuto različno od privzete valute podjetja."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -1166,6 +1166,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite , če želite dodati konto\n"
+"              </p><p>\n"
+"                Prikaz predvidene valutne razlike\n"
+"                \n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1581,6 +1588,8 @@ msgid ""
 "There is no default debit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Ni privzetega debetnega konta \n"
+"v dnevniku \"%s\"."
 
 #. module: account
 #: view:account.tax:0
@@ -1614,7 +1623,7 @@ msgstr "Največji znesek odpisa"
 msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
-msgstr ""
+msgstr "Ni neusklajenih postavk"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -2586,7 +2595,7 @@ msgstr "Konto prihodkov"
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
-msgstr ""
+msgstr "Ta davek bo privzet na novih izdelkih"
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2675,7 +2684,7 @@ msgstr "Obdrži prazno za odprto poslovno leto"
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
-msgstr ""
+msgstr "Ne morete spremeniti vrste konta, ker vsebuje vknjižbe!"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2860,7 +2869,7 @@ msgstr "EXJ"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Credit Note"
-msgstr ""
+msgstr "Nov dobropis"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -3170,7 +3179,7 @@ msgstr "Neprebrana sporočila"
 msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
-msgstr ""
+msgstr "Izbrani računi nimajo statusa \"Osnutek\" ali \"Predračun\""
 
 #. module: account
 #: code:addons/account/account.py:1056
@@ -3300,7 +3309,7 @@ msgstr "Konto stroškov"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Povzetek"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3570,7 +3579,7 @@ msgstr "Saldakonti"
 #: code:addons/account/account_invoice.py:1330
 #, python-format
 msgid "%s <b>created</b>."
-msgstr ""
+msgstr "%s <b>ustvarjeno</b>."
 
 #. module: account
 #: view:account.period:0
@@ -3866,7 +3875,7 @@ msgstr "Kontni načrti"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Dvig gotovine"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4331,7 +4340,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1131
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Ne morete uporabiti de aktiviranega konta."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4625,12 +4634,12 @@ msgstr "Mesec"
 #: code:addons/account/account.py:667
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Ne morete spremeniti kode konta , ki vsebuje vknjižbe"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Številčno zaporedje dobaviteljevih računov"
 
 #. module: account
 #: code:addons/account/account_invoice.py:571
@@ -4755,7 +4764,7 @@ msgstr "Periodična obdelava"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Uklajeno"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4854,7 +4863,7 @@ msgstr "Dobropis"
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 #: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Odprte postavke"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -4869,7 +4878,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Izračun davka"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4965,7 +4974,7 @@ msgstr "Privzeti kreditni konto"
 #. module: account
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Razlog za dvig gotovine"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5050,7 +5059,7 @@ msgstr "Nov"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Prodajni davek"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5236,7 +5245,7 @@ msgstr "Postavke za pregled"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Skupno zaokroževanje"
 
 #. module: account
 #: field:account.bank.statement,message_comment_ids:0
@@ -5279,7 +5288,7 @@ msgstr "Aktivno"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Gotovina"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -5392,7 +5401,7 @@ msgstr "Podrejeni konti davkov"
 msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
-msgstr ""
+msgstr "Obračunsko obdobje za : %s ni določeno."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5518,7 +5527,7 @@ msgstr "Leto"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Oznaka , da je bil račun poslan."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5729,7 +5738,7 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Ponovni izračun davkov in salda"
 
 #. module: account
 #: code:addons/account/account.py:1097
@@ -5869,7 +5878,7 @@ msgstr ""
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Izpolnite ta obrazec za polog gotovine:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6055,7 +6064,7 @@ msgstr "Zapri z odpisom"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "No možno knjižiti na konto vrste \"Pogled\"."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6388,7 +6397,7 @@ msgstr "Podjetje"
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Več valutno poslovanje"
 
 #. module: account
 #: view:account.subscription:0
@@ -6647,7 +6656,7 @@ msgstr "Terjatev"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Ni možno knjižiti na konto,ki je zaprt."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
@@ -6718,7 +6727,7 @@ msgstr "Odstotek"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Skupno zaokroževanje"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6998,7 +7007,7 @@ msgstr "Konto vrste stroškov"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Ime davka mora biti enolično"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7218,7 +7227,7 @@ msgstr "Dnevniki"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Ni obračunskega obdobja"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7263,7 +7272,7 @@ msgstr "Vse postavke"
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "Postavke se lahko usklajujejo samo na istem partnerju."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7492,7 +7501,7 @@ msgstr "Davki:"
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
-msgstr ""
+msgstr "Preklicanega računa ni možno brisati."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7603,7 +7612,7 @@ msgstr "Združeno po letu raćuna"
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Nabavni davek (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7702,7 +7711,7 @@ msgstr "cash.box.out"
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Glavna valuta"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8211,7 +8220,7 @@ msgstr "Postavka blagajne"
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Računovodski paket"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8922,7 +8931,7 @@ msgstr "Koda konta že obstaja!"
 #: help:product.category,property_account_expense_categ:0
 #: help:product.template,property_account_expense:0
 msgid "This account will be used to value outgoing stock using cost price."
-msgstr ""
+msgstr "Konto porabe po nabavni ceni."
 
 #. module: account
 #: view:account.invoice:0
@@ -8960,7 +8969,7 @@ msgstr "Dovoljeni konti (prazno - ni kontrole)"
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Prodajni davek (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9226,7 +9235,7 @@ msgstr ""
 #: code:addons/account/account.py:633
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Ni možno de aktivirati konta , ki ima vknjižbe"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9340,7 +9349,7 @@ msgstr "Ustvari račun"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Nastavitve računovodstva"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9619,7 +9628,7 @@ msgstr "Filter"
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Število enot"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9644,12 +9653,12 @@ msgstr "Prenos"
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Napačno dejanje!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Datum/Obdobje"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9672,7 +9681,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Ni zapadlih postavk za tega kupca."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -9731,7 +9740,7 @@ msgstr "Skupno poročilo"
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Privzeti prodajni davek"
 
 #. module: account
 #: report:account.overdue:0
@@ -9818,7 +9827,7 @@ msgstr "Konec obdobja"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Stroški"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -9905,7 +9914,7 @@ msgstr "Osnutki računov"
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Polog gotovine"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -9957,7 +9966,7 @@ msgstr "Iz analitičnih kontov"
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Nastavitve poslovnega leta"
 
 #. module: account
 #: field:account.period,name:0
@@ -10497,7 +10506,7 @@ msgstr "Konti brez vknjižb ? "
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Ni možno spremeniti davka!"
 
 #. module: account
 #: constraint:account.bank.statement:0
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index ae72c11225f..e84ac71db13 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 21:42+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2012-12-18 15:30+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: \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-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -194,7 +193,7 @@ msgstr "Berechnungsformel: Geplanter Umsatz - Gesamte Kosten"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr "Verrechnete Zeit"
+msgstr "Abgerechnete Zeit"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_to_invoice:0
@@ -210,6 +209,8 @@ msgid ""
 "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
 "'normal','template'])]}"
 msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -227,13 +228,13 @@ msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
 msgstr ""
-"Anzahl der Zeiten, die auf dieses Analyse Konto gebucht wurden. Es werden "
-"alle Summen der Journale 'general' gebildet"
+"Arbeitszeiten, die auf diese Kostenstelle gebucht wurden. Es werden nur "
+"Journale vom Typ 'sonstige' zur Berechnung herangezogen."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Nichts abzurechnen, erstelle"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
@@ -274,7 +275,7 @@ msgstr "oder Ansicht"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr "Elternteil"
+msgstr "Hauptprojekt"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,month_ids:0
@@ -332,7 +333,7 @@ msgstr "Auftragszeilen von %s"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "Unerledigt"
+msgstr "Wiedervorlage"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
@@ -358,7 +359,7 @@ msgstr "Zu Erneuern"
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
-msgstr "Ein Vertrag ist ein Analyse Konto mit Partner"
+msgstr "Ein Vertrag ist ein Kundenprojekt mit Kostenstelle"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
@@ -601,7 +602,7 @@ msgstr "Datum der letzten Erfassung auf diesem Konto."
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index 7c32a36f71e..f26f1f25387 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-29 15:09+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 18:07+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \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-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "Regrouper par..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Date de fin par défaut pour ce compte analytique"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +50,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Choisissez un partenaire qui utilisera le compte analytique par défaut "
+"définit dans \"Analytique par défaut\" (par exemple : en créant nouvelle une "
+"facture client ou une commande de vente, lorsqu'on choisira ce partenaire, "
+"cela sélectionnera automatiquement ce compte analytique)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -86,6 +90,10 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Choisissez un article qui utilisera le compte analytique par défaut définit "
+"dans \"Analytique par défaut\" (par exemple : en créant nouvelle une facture "
+"client ou une commande de vente, lorsqu'on choisira cet article, cela "
+"sélectionnera automatiquement ce compte analytique)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -111,12 +119,17 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Choisissez une société qui utilisera le compte analytique par défaut définit "
+"dans \"Analytique par défaut\" (par exemple : en créant nouvelle une facture "
+"client ou une commande de vente, lorsqu'on choisira cette société, cela "
+"sélectionnera automatiquement ce compte analytique)"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Choisissez un utilisateur qui utilisera le compte analytique par défaut"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -132,7 +145,7 @@ msgstr "Compte Analytique"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Date de début par défaut pour ce compte analytique"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
index e194c3d8628..522cb01e184 100644
--- a/addons/account_asset/i18n/sl.po
+++ b/addons/account_asset/i18n/sl.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-06-09 10:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-18 20:57+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: Slovenian <sl@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-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr ""
+msgstr "Osnovna sredstva v stanju \"Osnutek\" ali  \"Odprto\""
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -32,12 +32,12 @@ msgstr "Datum zaključka"
 #. module: account_asset
 #: field:account.asset.asset,value_residual:0
 msgid "Residual Value"
-msgstr ""
+msgstr "Ostanek vrednosti"
 
 #. module: account_asset
 #: field:account.asset.category,account_expense_depreciation_id:0
 msgid "Depr. Expense Account"
-msgstr ""
+msgstr "Konto stroška amortizacije"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -47,7 +47,7 @@ msgstr "Združeno po..."
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
 msgid "Gross Amount"
-msgstr ""
+msgstr "Bruto vrednost"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -66,7 +66,7 @@ msgstr "Premoženje"
 msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
-msgstr ""
+msgstr "Indikator,da se bo amortizacija računala od datuma nabave"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -97,7 +97,7 @@ msgstr "Se izvaja"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Depreciation Amount"
-msgstr ""
+msgstr "Znesek amortizacije"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -105,7 +105,7 @@ msgstr ""
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr ""
+msgstr "Analiza osnovnega sredstva"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -116,13 +116,13 @@ msgstr "Vzrok"
 #: field:account.asset.asset,method_progress_factor:0
 #: field:account.asset.category,method_progress_factor:0
 msgid "Degressive Factor"
-msgstr ""
+msgstr "Degresivni način obračuna amortizacije"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr ""
+msgstr "Kategorije osnovnega sredstva"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -136,7 +136,7 @@ msgstr "Vnosi"
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr ""
+msgstr "Amortizacijske vrstice"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index 71e1d63976d..38876283593 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-11 13:13+0000\n"
+"PO-Revision-Date: 2012-12-18 17:41+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: \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-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -1008,6 +1008,80 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Prezado ${object.name},</p>\n"
+"    <p>\n"
+"    Nosso controle de pagamentos acusa, em sua conta, prestação vencida, "
+"motivo pelo qual pedimos a V. Sa. sua imediata regularização.\n"
+"Tendo em vista que a emissão deste aviso é automática, caso V. Sa. já tenha "
+"efetuado o pagamento, solicitamos desconsiderá-lo.\n"
+"    Caso tenha alguma dúvida não deixe de entrar em contato com nosso "
+"departamento financeiro.\n"
+"    </p>\n"
+"<br/>\n"
+"Atenciosamente,\n"
+"</br>\n"
+"</br>\n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"   \n"
+"\n"
+"<%\n"
+"    from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+"    final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+"    followup_table = ''\n"
+"    for currency_dict in final_res:\n"
+"        currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+"        followup_table += '''\n"
+"        <table border=\"2\" width=100%%>\n"
+"        <tr>\n"
+"            <td>Data da Fatura</td>\n"
+"            <td>Referencia</td>\n"
+"            <td>Data de Vencimento</td>\n"
+"            <td>Valor (%s)</td>\n"
+"            <td>Lit.</td>\n"
+"        </tr>\n"
+"        ''' % (currency_symbol)\n"
+"        total = 0\n"
+"        for aml in currency_dict['line']:\n"
+"            block = aml['blocked'] and 'X' or ' '\n"
+"            total += aml['balance']\n"
+"            strbegin = \"<TD> \"\n"
+"            strend = \"</TD> \"\n"
+"            date = aml['date_maturity'] or aml['date']\n"
+"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+"                strbegin = \"<TD><B>\"\n"
+"                strend = \"</B></TD>\"\n"
+"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
+"        total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+"        followup_table += '''<tr> </tr>\n"
+"                        </table>\n"
+"                        <center>Valor devido: %s </center>''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: help:res.partner,latest_followup_level_id_without_lit:0
@@ -1106,6 +1180,85 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Prezado ${object.name},</p>\n"
+"   <p>\n"
+"   Apesar das mensagens enviadas referenes ao seu pagamento, sua conta está "
+"ccom um atraso sério.\n"
+"É essencial que o pagamento imediato das faturas em aberto seja feito, caso "
+"contrário seremos obrigados\n"
+"a colocar uma restrição em sua conta e enviar sua fatura para o departamento "
+"jurídico\n"
+"o que significa que não iremos mais fornecer sua empresa com produtos ou "
+"serviços.\n"
+"Por favor tome as medidas necessárias para a regularização do pagamento o "
+"mais breve possível.\n"
+"Se houver algum problema referente a este pagamento, não deixe de entrar em "
+"contato com nosso departamento financeiro.\n"
+"Os detalhes do pagamento em atraso estão abaixo.\n"
+" </p>\n"
+"<br/>\n"
+"Atenciosamente,\n"
+"    \n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"   \n"
+"<%\n"
+"    from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+"    final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+"    followup_table = ''\n"
+"    for currency_dict in final_res:\n"
+"        currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+"        followup_table += '''\n"
+"        <table border=\"2\" width=100%%>\n"
+"        <tr>\n"
+"            <td>Data da Fatura</td>\n"
+"            <td>Referencia</td>\n"
+"            <td>Data de Vencimento</td>\n"
+"            <td>Valor (%s)</td>\n"
+"            <td>Lit.</td>\n"
+"        </tr>\n"
+"        ''' % (currency_symbol)\n"
+"        total = 0\n"
+"        for aml in currency_dict['line']:\n"
+"            block = aml['blocked'] and 'X' or ' '\n"
+"            total += aml['balance']\n"
+"            strbegin = \"<TD> \"\n"
+"            strend = \"</TD> \"\n"
+"            date = aml['date_maturity'] or aml['date']\n"
+"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+"                strbegin = \"<TD><B>\"\n"
+"                strend = \"</B></TD>\"\n"
+"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
+"        total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+"        followup_table += '''<tr> </tr>\n"
+"                        </table>\n"
+"                        <center>Valor devido: %s </center>''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: field:account.move.line,result:0
@@ -1474,6 +1627,80 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"    \n"
+"    <p>Prezado ${object.name},</p>\n"
+"    <p>\n"
+"    Apesar de inúmeras mensagens, sua conta continua em atraso.\n"
+"O pagamento imediato das faturas em aberto devem ser feito, caso contrário a "
+"cobrança será encaminhada ao departamento jurídico\n"
+"sem outro aviso prévio.\n"
+"Acreditamos que isso não será necessário.\n"
+"Em caso de dúvidas sobre esta cobrança, entre em contato com nosso "
+"departamento financeiro.\n"
+"</p>\n"
+"<br/>\n"
+"Atenciosamente,\n"
+"    \n"
+"<br/>\n"
+"${user.name}\n"
+"    \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"    \n"
+"\n"
+"<%\n"
+"    from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+"    rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+"    final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+"    followup_table = ''\n"
+"    for currency_dict in final_res:\n"
+"        currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+"        followup_table += '''\n"
+"        <table border=\"2\" width=100%%>\n"
+"        <tr>\n"
+"            <td>Data da Fatura</td>\n"
+"            <td>Referencia</td>\n"
+"            <td>Data de Vencimento</td>\n"
+"            <td>Valor (%s)</td>\n"
+"            <td>Lit.</td>\n"
+"        </tr>\n"
+"        ''' % (currency_symbol)\n"
+"        total = 0\n"
+"        for aml in currency_dict['line']:\n"
+"            block = aml['blocked'] and 'X' or ' '\n"
+"            total += aml['balance']\n"
+"            strbegin = \"<TD> \"\n"
+"            strend = \"</TD> \"\n"
+"            date = aml['date_maturity'] or aml['date']\n"
+"            if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+"                strbegin = \"<TD><B>\"\n"
+"                strend = \"</B></TD>\"\n"
+"            followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
+"        total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+"        followup_table += '''<tr> </tr>\n"
+"                        </table>\n"
+"                        <center>Valor devido: %s </center>''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"    <br/>\n"
+"\n"
+"</div>\n"
+"            "
 
 #. module: account_followup
 #: help:res.partner,payment_next_action:0
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 22856dec976..79020ba945f 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 14:02+0000\n"
+"PO-Revision-Date: 2012-12-18 18:55+0000\n"
 "Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: \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-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -122,7 +122,7 @@ msgstr "_Aggiungi all'ordine di pagamento"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "Popolamento estratto pagamento"
 
 #. module: account_payment
 #: code:addons/account_payment/account_invoice.py:43
@@ -131,6 +131,8 @@ msgid ""
 "You cannot cancel an invoice which has already been imported in a payment "
 "order. Remove it from the following payment order : %s."
 msgstr ""
+"Impossibile annullare una fattura che è già stata importata in un ordine di "
+"pagamento. Rimuoverla dal seguente ordine di pagamento: %s."
 
 #. module: account_payment
 #: code:addons/account_payment/account_invoice.py:43
@@ -202,6 +204,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"Quando un ordine viene creato lo stato è impostato su 'Bozza'.\n"
+"Quando la banca è confermata lo stato passa a 'Confermato'.\n"
+"Quando l'ordine viene pagato lo stato passa a 'Completato'."
 
 #. module: account_payment
 #: view:payment.order:0
@@ -262,6 +267,9 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
+"Scegliere un'opzione per l'ordine di pagamento: 'Fisso' significa per una "
+"data prestabilita. 'Diretto' significa esucizione diretta. 'Data scadenza' "
+"significa alla data pianificata per l'esecuzione."
 
 #. module: account_payment
 #: field:payment.order,date_created:0
@@ -271,7 +279,7 @@ msgstr "Data creazione"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Sezionale di cassa o banca per il metodo di pagamento"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -368,13 +376,13 @@ msgstr ""
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Popolamento estratto contabile pagamento"
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "Il partner non è definito sulla registrazione."
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -384,7 +392,7 @@ msgstr "Modalità di pagamento"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Data Importo"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -406,12 +414,12 @@ msgstr "Bozza"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stato"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
-msgstr ""
+msgstr "Il successore di Comunicazioni"
 
 #. module: account_payment
 #: help:payment.line,info_partner:0
@@ -421,7 +429,7 @@ msgstr "Indirizzo del cliente ordinante"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Popolamento estratto:"
 
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
@@ -445,6 +453,7 @@ msgid ""
 "This Entry Line will be referred for the information of the ordering "
 "customer."
 msgstr ""
+"La registrazione farà riferimento alle informazioni del cliente ordinante."
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -479,7 +488,7 @@ msgstr "Aggiungi"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr ""
+msgstr "Popolamento pagamento"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
@@ -499,7 +508,7 @@ msgstr "Il cliente ordinante"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Emissione pagamento"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -592,7 +601,7 @@ msgstr "Data pianificata"
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Are you sure you want to make payment?"
-msgstr ""
+msgstr "Sicuri di voler emettere il pagamento?"
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -656,7 +665,7 @@ msgstr "Conto bancario"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Entry Information"
-msgstr ""
+msgstr "Informazioni registrazione"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_payment_order_create
@@ -682,19 +691,19 @@ msgstr "Emetti pagamento"
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "Data preferita"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "Conto bancario per il metodo di pagamento"
 
 #~ msgid "Preferred date"
 #~ msgstr "Data preferita"
diff --git a/addons/analytic_contract_hr_expense/i18n/de.po b/addons/analytic_contract_hr_expense/i18n/de.po
index 1b0e311413c..2bb1023a7f7 100644
--- a/addons/analytic_contract_hr_expense/i18n/de.po
+++ b/addons/analytic_contract_hr_expense/i18n/de.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 21:47+0000\n"
+"PO-Revision-Date: 2012-12-18 15:31+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@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-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: analytic_contract_hr_expense
 #: view:account.analytic.account:0
@@ -42,13 +42,13 @@ msgstr "Kostenstelle"
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
 #, python-format
 msgid "Expenses to Invoice of %s"
-msgstr ""
+msgstr "Spesen Abrechnung zu %s"
 
 #. module: analytic_contract_hr_expense
 #: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
 #, python-format
 msgid "Expenses of %s"
-msgstr ""
+msgstr "Spesen zu %s"
 
 #. module: analytic_contract_hr_expense
 #: field:account.analytic.account,expense_invoiced:0
diff --git a/addons/analytic_contract_hr_expense/i18n/fr.po b/addons/analytic_contract_hr_expense/i18n/fr.po
new file mode 100644
index 00000000000..6084c8b540a
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/fr.po
@@ -0,0 +1,72 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-18 23:00+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
+"Language-Team: French <fr@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-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Rien à facturer, créer"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "Dépenses"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Compte Analytique"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#, python-format
+msgid "Expenses of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "inconnu"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Estimation des Dépenses à facturer"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "Facture"
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index e92d168d74e..49559a7d716 100644
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-13 19:14+0000\n"
+"PO-Revision-Date: 2012-12-18 06:59+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,17 +25,17 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
-msgstr ""
+msgstr "ir.model.fields.anonymization.migration.fix"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,target_version:0
 msgid "Target Version"
-msgstr ""
+msgstr "Ziel Version"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "sql"
-msgstr ""
+msgstr "SQL"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
@@ -62,7 +62,7 @@ msgstr "ir.model.fields.anonymization"
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
@@ -135,7 +135,7 @@ msgstr "Anonymisiere Datenbank"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "python"
-msgstr ""
+msgstr "python"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
@@ -189,7 +189,7 @@ msgstr "Anonymisierungs Verlauf"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,model_name:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
@@ -202,6 +202,8 @@ msgid ""
 "This is the file created by the anonymization process. It should have the "
 "'.pickle' extention."
 msgstr ""
+"Diese Datei wurde durch den Anonymisierungsprozess erzeugt und sollte die "
+"Endung '.pickle' haben"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -217,7 +219,7 @@ msgstr "Dateiname"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenz"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
@@ -238,7 +240,7 @@ msgstr "Erledigt"
 #: field:ir.model.fields.anonymization.migration.fix,query:0
 #: field:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "Query"
-msgstr ""
+msgstr "Abfrage"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 4b9235d4846..7d3ad5fa12f 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.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:52+0000\n"
-"PO-Revision-Date: 2012-01-13 19:14+0000\n"
+"PO-Revision-Date: 2012-12-18 06:55+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -44,7 +44,7 @@ msgstr "Abonniert"
 #: code:addons/audittrail/audittrail.py:408
 #, python-format
 msgid "'%s' Model does not exist..."
-msgstr ""
+msgstr "'%s' Modell exisitiert nicht"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -61,7 +61,7 @@ msgstr "Regel Belegrückverfolgung"
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -221,7 +221,7 @@ msgstr "Wähle Objekt für Rückverfolgung"
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Audit"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -298,7 +298,7 @@ msgstr "Protokoll Löschvorgänge"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -339,7 +339,7 @@ msgstr "Neuer Wert"
 #: code:addons/audittrail/audittrail.py:223
 #, python-format
 msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "Feld '%s' exisitiert nicht in Model '%s'"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -392,7 +392,7 @@ msgstr "Protokoll Zeile"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index 99eb50f6059..346cf8a3e43 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.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:52+0000\n"
-"PO-Revision-Date: 2011-01-13 06:08+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:05+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: \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 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -44,7 +44,7 @@ msgstr "S'abonner"
 #: code:addons/audittrail/audittrail.py:408
 #, python-format
 msgid "'%s' Model does not exist..."
-msgstr ""
+msgstr "Le modèle '%s' n'existe pas…"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -61,7 +61,7 @@ msgstr "Règle d'audit"
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "État"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -223,7 +223,7 @@ msgstr "Sélectionnez l'objet pour lequel vous voulez générer un historique."
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "Audit"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -309,7 +309,7 @@ msgstr "Enregistrer les suppressions"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Model"
-msgstr ""
+msgstr "Modèle"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -350,7 +350,7 @@ msgstr "Nouvelle valeur"
 #: code:addons/audittrail/audittrail.py:223
 #, python-format
 msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "Le champ '%s' n'existe pas dans le modèle '%s'"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -404,7 +404,7 @@ msgstr "Ligne d'historique"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/auth_ldap/i18n/de.po b/addons/auth_ldap/i18n/de.po
index f5f0940a167..7d25fadf290 100644
--- a/addons/auth_ldap/i18n/de.po
+++ b/addons/auth_ldap/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-01-14 14:56+0000\n"
+"PO-Revision-Date: 2012-12-18 06:57+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "Benutzer Vorlage"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -65,6 +65,8 @@ msgid ""
 "Automatically create local user accounts for new users authenticating via "
 "LDAP"
 msgstr ""
+"Erstelle automatisch Benutzer Konten für neue Benutzer, die sich mit LDAP "
+"anmelden"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -99,7 +101,7 @@ msgstr "res.company.ldap"
 #. module: auth_ldap
 #: help:res.company.ldap,user:0
 msgid "User to copy when creating new users"
-msgstr ""
+msgstr "Standard Benutzerkonto, das für neue Benutzer verwendet wird"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_tls:0
@@ -151,7 +153,7 @@ msgstr ""
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Benutzer"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_filter:0
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
index fca3165a346..003d4697dd8 100644
--- a/addons/auth_openid/i18n/ro.po
+++ b/addons/auth_openid/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-21 17:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-18 07:05+0000\n"
+"Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@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-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: auth_openid
 #. openerp-web
@@ -94,7 +94,7 @@ msgstr "Google Apps"
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #~ msgid "res.users"
 #~ msgstr "res.utilizatori"
diff --git a/addons/base_import/i18n/de.po b/addons/base_import/i18n/de.po
new file mode 100644
index 00000000000..360cfcf353e
--- /dev/null
+++ b/addons/base_import/i18n/de.po
@@ -0,0 +1,1164 @@
+# German translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-18 15:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@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-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index c851c081b58..e3a5bcfd675 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/i18n/fr.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-07 10:31+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:27+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@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-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:420
 #, python-format
 msgid "Get all possible values"
-msgstr ""
+msgstr "Récupérer toutes les valeurs possible"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:71
 #, python-format
 msgid "Need to import data from an other application?"
-msgstr ""
+msgstr "Besoin d.importer des données d'une autre application ?"
 
 #. module: base_import
 #. openerp-web
@@ -159,7 +159,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:351
 #, python-format
 msgid "Don't Import"
-msgstr ""
+msgstr "Ne pas importer"
 
 #. module: base_import
 #. openerp-web
@@ -206,7 +206,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:15
 #, python-format
 msgid "Validate"
-msgstr ""
+msgstr "Valider"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index de54dd84551..601dddfd1ff 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.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:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 07:09+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -181,7 +181,7 @@ msgstr "Abbruch"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 7f3b4ae8e43..1742bd9827c 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-05 09:11+0000\n"
+"PO-Revision-Date: 2012-12-18 23:04+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \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-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_create
 #: model:ir.ui.menu,name:board.menu_board_create
 msgid "Create Board"
-msgstr ""
+msgstr "Créer un tableau de bord"
 
 #. module: board
 #: view:board.create:0
@@ -75,12 +75,12 @@ msgstr "Mon tableau de bord"
 #. module: board
 #: field:board.create,name:0
 msgid "Board Name"
-msgstr ""
+msgstr "Nom du tableau de bord"
 
 #. module: board
 #: model:ir.model,name:board.model_board_create
 msgid "Board Creation"
-msgstr ""
+msgstr "Création de tableau de bord"
 
 #. module: board
 #. openerp-web
@@ -114,13 +114,30 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Votre tableau de bord personnel est vide</b>\n"
+"                  </p><p>\n"
+"                    Pour ajouter un premier rapport à ce tableau de bord, "
+"allez dans un\n"
+"                    menu, passez en vue liste ou en vue graphique, et "
+"cliquez sur  <i>\"Ajouter\n"
+"                    au tableau de bord\"</i> dans les options de recherches "
+"étendues.\n"
+"                  </p><p>\n"
+"                    Vous pouvez filtrer et grouper les données avant "
+"d'insérer le rapport dans le\n"
+"                    tableau de bord en utilisant les options de recherche.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:6
 #, python-format
 msgid "Reset"
-msgstr ""
+msgstr "Réinitialiser"
 
 #. module: board
 #: field:board.create,menu_parent_id:0
@@ -163,7 +180,7 @@ msgstr "ou"
 #: code:addons/board/static/src/xml/board.xml:69
 #, python-format
 msgid "Title of new dashboard item"
-msgstr ""
+msgstr "Titre du nouvel élément du tableau de bord"
 
 #~ msgid "Author"
 #~ msgstr "Auteur"
diff --git a/addons/claim_from_delivery/i18n/fr.po b/addons/claim_from_delivery/i18n/fr.po
index e72868c9c26..057c74100e4 100644
--- a/addons/claim_from_delivery/i18n/fr.po
+++ b/addons/claim_from_delivery/i18n/fr.po
@@ -7,29 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 13:06+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:43+0000\n"
+"Last-Translator: Pierre Lamarche (www.savoirfairelinux.com) "
+"<pierre.lamarche@savoirfairelinux.com>\n"
 "Language-Team: \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 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Réclamations"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Bon de livraison"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Réclamation depuis la livraison"
 
 #~ msgid "Claim from delivery"
 #~ msgstr "Réclamation sur la livraison"
diff --git a/addons/contacts/i18n/fr.po b/addons/contacts/i18n/fr.po
index 65dd094a0d7..002d0f7f608 100644
--- a/addons/contacts/i18n/fr.po
+++ b/addons/contacts/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-10 16:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-18 23:42+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@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-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
@@ -29,9 +29,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Cliquez pour ajouter un contact dans votre carnet d'adresses.\n"
+"          </p><p>\n"
+"            OpenERP vous permet de suivre facilement toutes les actions "
+"liées à un client (discussions, historique des opportunités commerciales, "
+"documents, etc.).\n"
+"          </p>\n"
+"        "
 
 #. module: contacts
 #: model:ir.actions.act_window,name:contacts.action_contacts
 #: model:ir.ui.menu,name:contacts.menu_contacts
 msgid "Contacts"
-msgstr ""
+msgstr "Contacts"
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 01dd64d418b..847ca97051c 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-12 09:27+0000\n"
+"PO-Revision-Date: 2012-12-18 23:02+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \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-13 04:42+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -101,7 +101,7 @@ msgstr "Analyse des pistes CRM"
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
 msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
+msgstr "Rappel de la piste: [[object.id]]"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -136,7 +136,7 @@ msgstr "Clôture prévue"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si coché, de nouveaux messages nécessitent votre attention."
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -2172,7 +2172,7 @@ msgstr "Logiciel"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Ré-affecter l'escalade"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2205,7 +2205,7 @@ msgstr "Ville"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Les Deux"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2682,6 +2682,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour définir un nouveau tag de vente.\n"
+"              </p><p>\n"
+"                Créez des tags particuliers selon les besoins de l'activité "
+"de votre entreprise\n"
+"                pour classer au mieux vos pistes et opportunités.\n"
+"                Ces catégories pourraient par exemple refléter la structure\n"
+"                de votre offre ou les différents types de ventes que vous "
+"proposez.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
@@ -2740,7 +2751,7 @@ msgstr "Année de clôture attendue"
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Ouvrir le menu \"Vente\""
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2845,7 +2856,7 @@ msgstr "Rue 2"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Gérer l'assitance et le support"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index 219da7c4815..27a1ca170d6 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-17 07:04+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:17+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@@ -108,6 +108,8 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
+"Per avere una visione generale di tutti i reclami processati nel sistema "
+"ordinando gli stesso per specifici criteri"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -235,7 +237,7 @@ msgstr "Cause principali"
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "Responsabile Problematiche"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index c0a4d5a65d7..358985e046b 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-11-29 14:54+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 18:25+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \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-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue !"
@@ -35,7 +35,7 @@ msgstr "Livraison par la poste"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid " in Function of "
-msgstr ""
+msgstr " en fonction de "
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -70,7 +70,7 @@ msgstr "Volume"
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Zip"
-msgstr ""
+msgstr "Code Postal"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -106,12 +106,32 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer un nouveau mode de livraison.\n"
+"              </p><p>\n"
+"                Chaque transporteur (par exemple UPS) peut avoir plusieurs "
+"modes\n"
+"                de livraison (UPS Express, UPS Standard, etc.), chacun "
+"possédant ses\n"
+"                propres règles de tarification.\n"
+"              </p><p>\n"
+"                Les différents modes de livraison permettent de calculer "
+"automatiquement\n"
+"                les frais de port, selon les paramètres que vous définissez, "
+"dans les commandes\n"
+"                de vente (fondées sur les devis), ou sur les factures "
+"(créées à partir de bons de\n"
+"                livraison).\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
 msgid "No line matched this product or order in the chosen delivery grid."
 msgstr ""
+"Aucune ligne ne correspond à ce produit ou à cette commande dans la grille "
+"de livraison choisie."
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
@@ -153,6 +173,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une liste de prix de livraison pour une "
+"région particulière.\n"
+"              </p><p>\n"
+"                La liste de prix de livraison permet de calculer le coût et\n"
+"                le prix de vente de la livraison selon le poids de\n"
+"                 l'article et d'autres critères. Vous pouvez définir "
+"différentes listes de prix\n"
+"                pour chaque méthode de livraison : par pays ou, dans un "
+"pays\n"
+"                particulier,  dans une zone définie par une série de codes "
+"postaux.\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -172,7 +206,7 @@ msgstr "Montant"
 #. module: delivery
 #: view:sale.order:0
 msgid "Add in Quote"
-msgstr ""
+msgstr "Ajouter au devis"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -225,7 +259,7 @@ msgstr "Définition des tarifs"
 #: code:addons/delivery/stock.py:89
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attention !"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -245,7 +279,7 @@ msgstr "Commande de ventes"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Bons de livraison"
 
 #. module: delivery
 #: view:sale.order:0
@@ -253,6 +287,9 @@ msgid ""
 "If you don't 'Add in Quote', the exact price will be computed when invoicing "
 "based on delivery order(s)."
 msgstr ""
+"Si vous ne cochez pas « Ajouter au devis », les frais de livraison exacts "
+"seront calculés lors de la génération de la facture, à partir du bon de "
+"livraison."
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -300,7 +337,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+msgstr "Gratuit si le montant total de la commande est supérieur à"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -468,7 +505,7 @@ msgstr "Gratuit si plus de %.2f"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Livraisons à recevoir"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -582,7 +619,7 @@ msgstr "Prix de vente"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Imprimer le bordereau de livraison"
 
 #. module: delivery
 #: view:delivery.grid:0
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index 38edd17e1cd..cac982e87a6 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-05-17 16:39+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
+"PO-Revision-Date: 2012-12-18 23:16+0000\n"
+"Last-Translator: lollo_Ge <Unknown>\n"
 "Language-Team: \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-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -332,7 +332,7 @@ msgstr "Nome Griglia"
 #: field:stock.picking,number_of_packages:0
 #: field:stock.picking.out,number_of_packages:0
 msgid "Number of Packages"
-msgstr "Numero di Pacchetti"
+msgstr "Numero di Colli"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -416,6 +416,7 @@ msgstr "Variabile"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Questo metodo di consegna sarà utilizzato quando si fattura da picking."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -483,7 +484,7 @@ msgstr "Prezzo"
 #: code:addons/delivery/sale.py:55
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr ""
+msgstr "Non ci sono risultati nella ricerca per questo trasportatore !"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -500,7 +501,7 @@ msgstr "Peso * Volume"
 #: code:addons/delivery/stock.py:90
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr ""
+msgstr "Il trasportatore %s (id: %d) non ha una griglia di consegne !"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -538,6 +539,8 @@ msgstr "ID"
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
+"Lo stato dell'ordine deve essere in stato bozza per aggiungere linee di "
+"consegna."
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index d21db0e04a4..d051e4f3d0c 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.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:52+0000\n"
-"PO-Revision-Date: 2012-12-15 22:02+0000\n"
-"Last-Translator: Ludovic CHEVALIER <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 18:20+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \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-16 04:48+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -81,7 +81,7 @@ msgstr "Fichiers"
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr "Type mime"
+msgstr "Type MIME"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -228,6 +228,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Cliquez pour ajouter un nouveau document.\n"
+"          </p><p>\n"
+"            L'espace documentaire vous donne accès à toutes les pièces-"
+"jointes,\n"
+"            qu'il s'agisse de courriels, de documents de projet, de "
+"factures, etc.\n"
+"          </p>\n"
+"        "
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -296,7 +305,7 @@ msgstr "Type"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -318,7 +327,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr "Erreur! Vous ne pouvez pas créer des répertoires récursifs."
+msgstr "Erreur ! Vous ne pouvez pas créer de répertoires récursifs."
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -402,7 +411,7 @@ msgstr "Sécurité"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "Utilisateur de la Dernière Modification"
+msgstr "Utilisateur ayant réaliser la dernière modification"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
@@ -413,7 +422,7 @@ msgstr "Fichiers par Utilisateur"
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "à la date du"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -884,7 +893,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index df8b3006f7c..bf94b69b5d5 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.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:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 22:57+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -154,6 +154,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Se vero, tutti gli allegati che corrispondono a questa risorsa verranno "
+"collocati. Se falso, solo quelli che hanno questa come superiore."
 
 #. module: document
 #: view:document.directory:0
@@ -510,6 +512,9 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"Selezionare questo campo se si desidera che il nome del file contenga il "
+"nome del record.\n"
+"Se impostata, la cartella dovrà essere una risorsa."
 
 #. module: document
 #: model:ir.actions.act_window,name:document.open_board_document_manager
@@ -558,6 +563,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Insieme con il Modello Superiore, questo ID attribuisce questa cartella ad "
+"uno specifico record del Modello Superiore."
 
 #. module: document
 #. openerp-web
@@ -615,6 +622,10 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"Se si inserisce un oggetto qui, questo modello di cartella apparirà sotto  "
+"tutti questi oggetti. Tali cartelle saranno \"collegate\" ad uno specifico "
+"modello o record, semplicemente come allegati. Non inserire una cartella "
+"superiore se si seleziona un modello superiore."
 
 #. module: document
 #: view:document.directory:0
@@ -712,7 +723,7 @@ msgstr "Archivio file esterno"
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "Per l'archiviazione dei file, il percorso dell'archivio"
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -779,6 +790,8 @@ msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
 msgstr ""
+"Questi gruppi, comunque, NON si applicano alle cartelle di livello "
+"inferiore, per le quali bisogna definire i loro gruppi."
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index 34c72401871..b3e6a9d8dec 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 20:23+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2012-12-18 06:50+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -47,7 +46,7 @@ msgstr ""
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "Wissensdatenbank.Konfiguration.Einstellungen"
 
 #. module: document_ftp
 #: model:ir.actions.act_url,name:document_ftp.action_document_browse
@@ -57,7 +56,7 @@ msgstr "Dateien durchsuchen"
 #. module: document_ftp
 #: help:knowledge.config.settings,document_ftp_url:0
 msgid "Click the url to browse the documents"
-msgstr ""
+msgstr "Die URL klicken um die Dokumente anzuzeigen"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -72,7 +71,7 @@ msgstr "Konfiguration FTP Server"
 #. module: document_ftp
 #: field:knowledge.config.settings,document_ftp_url:0
 msgid "Browse Documents"
-msgstr ""
+msgstr "Dokumente anzeigen"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
@@ -99,7 +98,7 @@ msgstr "Adresse"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
@@ -119,7 +118,7 @@ msgstr "Suche Dokument"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: document_ftp
 #: view:document.ftp.browse:0
diff --git a/addons/document_page/i18n/de.po b/addons/document_page/i18n/de.po
index f65fb8d0c99..010935ef939 100644
--- a/addons/document_page/i18n/de.po
+++ b/addons/document_page/i18n/de.po
@@ -8,14 +8,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:52+0000\n"
-"PO-Revision-Date: 2012-08-13 12:14+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 06:54+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -23,7 +23,7 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #. module: document_page
 #: view:document.page:0
@@ -46,7 +46,7 @@ msgstr "Menü"
 #: view:document.page:0
 #: model:ir.model,name:document_page.model_document_page
 msgid "Document Page"
-msgstr ""
+msgstr "Dokumentenseite"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_related_page_history
@@ -69,13 +69,13 @@ msgstr "Gruppiert je..."
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Vorlage"
 
 #. module: document_page
 #: view:document.page:0
 msgid ""
 "that will be used as a content template for all new page of this category."
-msgstr ""
+msgstr "diese wird für alle neuen Dokumente dieser Kategorie verwendet"
 
 #. module: document_page
 #: field:document.page,name:0
@@ -90,27 +90,27 @@ msgstr "Assistent für Menüerzeugung"
 #. module: document_page
 #: field:document.page,type:0
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Geändert von"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Seitentyp"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -121,18 +121,18 @@ msgstr "Menü"
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Dokumenten Seite Historie"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
 msgid "Pages history"
-msgstr ""
+msgstr "Seiten Historie"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #, python-format
 msgid "There are no changes in revisions."
-msgstr ""
+msgstr "Es gibt keine Veränderungen in den Revisionen"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
@@ -156,7 +156,7 @@ msgstr "Seiten"
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Kategorien"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -172,12 +172,12 @@ msgstr "Erzeugt am"
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
+msgstr "Sie müssen zumindest 1 und maximal 2 Revisionen auswählen"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "Page history"
-msgstr ""
+msgstr "Seiten Historie"
 
 #. module: document_page
 #: field:document.page.history,summary:0
@@ -187,12 +187,12 @@ msgstr "Zusammenfassung"
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
 msgid "Create web pages"
-msgstr ""
+msgstr "Webseiten erstellen"
 
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Dokument Historie"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -202,12 +202,12 @@ msgstr "Menü Bezeichnung"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Seite"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: document_page
 #: field:document.page,write_date:0
@@ -224,14 +224,14 @@ msgstr "Erzeuge Menü"
 #. module: document_page
 #: field:document.page,display_content:0
 msgid "Displayed Content"
-msgstr ""
+msgstr "Zeige Inhalt"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Warnung!"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -247,9 +247,9 @@ msgstr "Differenz"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumententyp"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "abhängige Elemente"
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 01ca490ab1d..2529fab97c0 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.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:52+0000\n"
-"PO-Revision-Date: 2012-08-13 12:13+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-12-18 23:39+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \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 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_page
 #: view:document.page:0
@@ -22,7 +22,7 @@ msgstr ""
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: document_page
 #: view:document.page:0
@@ -68,13 +68,15 @@ msgstr "Grouper par ..."
 #. module: document_page
 #: view:document.page:0
 msgid "Template"
-msgstr ""
+msgstr "Modèle"
 
 #. module: document_page
 #: view:document.page:0
 msgid ""
 "that will be used as a content template for all new page of this category."
 msgstr ""
+"Ceci sera utilisé comment contenu initial de toutes les nouvelles pages de "
+"cette catégorie."
 
 #. module: document_page
 #: field:document.page,name:0
@@ -89,7 +91,7 @@ msgstr "Menu de création d'un wizard"
 #. module: document_page
 #: field:document.page,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
@@ -99,17 +101,17 @@ msgstr ""
 #. module: document_page
 #: field:document.page.history,create_uid:0
 msgid "Modified By"
-msgstr ""
+msgstr "Modifié par"
 
 #. module: document_page
 #: view:document.page.create.menu:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Page type"
-msgstr ""
+msgstr "Type de page"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -120,12 +122,12 @@ msgstr "Menu Information"
 #: view:document.page.history:0
 #: model:ir.model,name:document_page.model_document_page_history
 msgid "Document Page History"
-msgstr ""
+msgstr "Historique du document"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_page_history
 msgid "Pages history"
-msgstr ""
+msgstr "Historique des pages"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:129
@@ -155,7 +157,7 @@ msgstr "Pages"
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_category
 msgid "Categories"
-msgstr ""
+msgstr "Catégories"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -172,11 +174,13 @@ msgstr "Créé le"
 #, python-format
 msgid "You need to select minimum one or maximum two history revisions!"
 msgstr ""
+"Vous devez sélectionner au minimum une et au maximum deux versions "
+"d'historique"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "Page history"
-msgstr ""
+msgstr "Historique de la page"
 
 #. module: document_page
 #: field:document.page.history,summary:0
@@ -186,12 +190,12 @@ msgstr "Sommaire"
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
 msgid "Create web pages"
-msgstr ""
+msgstr "Créer des pages Web"
 
 #. module: document_page
 #: view:document.page.history:0
 msgid "Document History"
-msgstr ""
+msgstr "Historique du document"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
@@ -201,12 +205,12 @@ msgstr "Nom du menu"
 #. module: document_page
 #: field:document.page.history,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Page"
 
 #. module: document_page
 #: field:document.page,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historique"
 
 #. module: document_page
 #: field:document.page,write_date:0
@@ -230,7 +234,7 @@ msgstr ""
 #: code:addons/document_page/wizard/document_page_show_diff.py:50
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement!"
 
 #. module: document_page
 #: view:document.page.create.menu:0
@@ -246,9 +250,9 @@ msgstr "Comparer"
 #. module: document_page
 #: view:document.page:0
 msgid "Document Type"
-msgstr ""
+msgstr "Type de document"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Enfant"
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index f11ac8699d1..b05cf48283c 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-01-14 11:43+0000\n"
+"PO-Revision-Date: 2012-12-18 06:49+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -31,7 +31,7 @@ msgstr "Dokumente"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "Dokument Eigenschaft"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -168,7 +168,7 @@ msgstr "Herausgeber"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "Dokument Eigenschaft"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
diff --git a/addons/edi/i18n/fr.po b/addons/edi/i18n/fr.po
index 4203f7c4b77..a57a99c0cf8 100644
--- a/addons/edi/i18n/fr.po
+++ b/addons/edi/i18n/fr.po
@@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-09 10:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-18 23:20+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@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-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Motif:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Le document a été importé avec succès !"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Désolé, le document ne peut pas être importé."
 
 #. module: edi
 #: model:ir.model,name:edi.model_res_company
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index e0a4114095c..2685265d747 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:15+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: \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-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -36,7 +36,7 @@ msgstr "Bouton de la barre latérale pour ouvrir l'action"
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Retirer des campagnes marketing"
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -96,7 +96,7 @@ msgstr "Nom du fichier du rapport"
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Aperçu"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -107,7 +107,7 @@ msgstr "Répondre à"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use template"
-msgstr ""
+msgstr "Utiliser un modèle"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -119,7 +119,7 @@ msgstr "Corps"
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copie)"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -139,7 +139,7 @@ msgstr "SMTP Server"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as new template"
-msgstr ""
+msgstr "Sauvegarder en tant que nouveau modèle"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Value Builder"
-msgstr ""
+msgstr "Constructeur de variable"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -249,12 +249,12 @@ msgstr "Avancé"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Preview of"
-msgstr ""
+msgstr "Aperçu de"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Using sample document"
-msgstr ""
+msgstr "Utiliser un exemple de document"
 
 #. module: email_template
 #: view:email.template:0
@@ -342,7 +342,7 @@ msgstr "Modèle"
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistant de composition de courriel"
 
 #. module: email_template
 #: view:email.template:0
@@ -416,7 +416,7 @@ msgstr "Copie à (CC)"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Applies to"
-msgstr ""
+msgstr "S'applique à"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
@@ -487,7 +487,7 @@ msgstr "Partenaire"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Valeur par défaut"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -510,7 +510,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Contenus"
 
 #. module: email_template
 #: field:email.template,subject:0
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 0025be3d785..c55e378dab7 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-07-28 22:06+0000\n"
+"PO-Revision-Date: 2012-12-18 17:45+0000\n"
 "Last-Translator: Fábio Martinelli - http://zupy.com.br "
 "<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-04 05:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -44,7 +44,7 @@ msgstr "Opt-Out"
 #: field:email.template,email_to:0
 #: field:email_template.preview,email_to:0
 msgid "To (Emails)"
-msgstr ""
+msgstr "Para (Emails)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
@@ -77,7 +77,7 @@ msgstr "Email do remetente (pode ser usado placeholders)"
 #. module: email_template
 #: view:email.template:0
 msgid "Remove context action"
-msgstr ""
+msgstr "Remover Ações de Contexto"
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -98,7 +98,7 @@ msgstr "Nome do Arquivo de Relatório"
 #. module: email_template
 #: view:email.template:0
 msgid "Preview"
-msgstr ""
+msgstr "Visualização"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -109,7 +109,7 @@ msgstr "Responder-Para"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use template"
-msgstr ""
+msgstr "Usar modelo"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -121,7 +121,7 @@ msgstr "Corpo"
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (cópia)"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -141,7 +141,7 @@ msgstr "Servidor SMTP"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as new template"
-msgstr ""
+msgstr "Salvar como novo modelo"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -208,7 +208,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Value Builder"
-msgstr ""
+msgstr "Construtor de Valor Dinâmico"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -226,6 +226,8 @@ msgid ""
 "Display an option on related documents to open a composition wizard with "
 "this template"
 msgstr ""
+"Exibir uma opção em documentos relacionados para abrir um assistente de "
+"composição com este modelo"
 
 #. module: email_template
 #: help:email.template,email_cc:0
@@ -249,12 +251,12 @@ msgstr "Avançado"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Preview of"
-msgstr ""
+msgstr "Visualização de"
 
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Using sample document"
-msgstr ""
+msgstr "Usando documento de exemplo"
 
 #. module: email_template
 #: view:email.template:0
@@ -290,12 +292,13 @@ msgstr "Visualizar Email"
 msgid ""
 "Remove the contextual action to use this template on related documents"
 msgstr ""
+"Remover a ação contextual para usar este modelo nos documentos relacionados"
 
 #. module: email_template
 #: field:email.template,copyvalue:0
 #: field:email_template.preview,copyvalue:0
 msgid "Placeholder Expression"
-msgstr ""
+msgstr "Espaço da Expressão"
 
 #. module: email_template
 #: field:email.template,sub_object:0
@@ -346,19 +349,19 @@ msgstr "Assistente de composição de Email"
 #. module: email_template
 #: view:email.template:0
 msgid "Add context action"
-msgstr ""
+msgstr "Adicionar ação de contexto"
 
 #. module: email_template
 #: help:email.template,model_id:0
 #: help:email_template.preview,model_id:0
 msgid "The kind of document with with this template can be used"
-msgstr ""
+msgstr "O tipo de documento que este modelo pode ser usado"
 
 #. module: email_template
 #: field:email.template,email_recipients:0
 #: field:email_template.preview,email_recipients:0
 msgid "To (Partners)"
-msgstr ""
+msgstr "Para (Parceiros)"
 
 #. module: email_template
 #: field:email.template,auto_delete:0
@@ -385,7 +388,7 @@ msgstr "Modelo de Documento Relacionado"
 #. module: email_template
 #: view:email.template:0
 msgid "Addressing"
-msgstr ""
+msgstr "Abordando"
 
 #. module: email_template
 #: help:email.template,email_recipients:0
@@ -393,6 +396,7 @@ msgstr ""
 msgid ""
 "Comma-separated ids of recipient partners (placeholders may be used here)"
 msgstr ""
+"IDs separados por virgula dos parceiros (marcadores podem ser usados aqui)"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
@@ -416,7 +420,7 @@ msgstr "Cópia para"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Applies to"
-msgstr ""
+msgstr "Aplica-se a"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
@@ -488,7 +492,7 @@ msgstr "Parceiro"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Default Value"
-msgstr ""
+msgstr "Valor Padrão"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
@@ -510,7 +514,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Conteúdos"
 
 #. module: email_template
 #: field:email.template,subject:0
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index b17c38676cf..93c0bc961e6 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-10 08:27+0000\n"
+"PO-Revision-Date: 2012-12-18 07:09+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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-11 04:46+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: event
 #: view:event.event:0
@@ -126,7 +126,7 @@ msgstr "Standard maximale Anmeldungen"
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
 
 #. module: event
 #: field:event.event,register_avail:0
@@ -819,7 +819,7 @@ msgstr ""
 #: field:event.event,message_is_follower:0
 #: field:event.registration,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Ist ein Follower"
 
 #. module: event
 #: field:event.registration,user_id:0
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index c4d3b51700f..0277236f36d 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.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:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 07:10+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -101,7 +101,7 @@ msgstr "Lokaler Server"
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -121,7 +121,7 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
@@ -191,6 +191,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s."
 msgstr ""
+"Das haben wir an dieser Stelle bekommen:\n"
+" %s."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -235,7 +237,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Postausgang"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 304dd6804a6..0547f785f75 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.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:52+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-12-18 23:07+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: \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 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -122,7 +122,7 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
@@ -152,7 +152,7 @@ msgstr "Conserver l'original"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Options avancées"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -193,6 +193,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s."
 msgstr ""
+"Voici ce que nous avons à la place :\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -238,7 +240,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Courriels sortants"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
diff --git a/addons/fleet/i18n/fr.po b/addons/fleet/i18n/fr.po
index f4cc09f79ea..2e358b847f9 100644
--- a/addons/fleet/i18n/fr.po
+++ b/addons/fleet/i18n/fr.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-12 17:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-18 22:24+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@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-13 04:45+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Hybrid"
-msgstr ""
+msgstr "Hybride"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
 msgid "Compact"
-msgstr ""
+msgstr "Compacte"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_1
@@ -35,46 +35,46 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,vin_sn:0
 msgid "Unique number written on the vehicle motor (VIN/SN number)"
-msgstr ""
+msgstr "Numéro de série du moteur (VIN / SN)"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.services:0
 msgid "Service"
-msgstr ""
+msgstr "Intervention"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mensuel"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:62
 #, python-format
 msgid "Unknown"
-msgstr ""
+msgstr "Inconnu"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_20
 msgid "Engine/Drive Belt(s) Replacement"
-msgstr ""
+msgstr "Remplacement de la couroie de distribution"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Vehicle costs"
-msgstr ""
+msgstr "Coûts du véhicule"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Diesel"
-msgstr ""
+msgstr "Diesel"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:421
 #, python-format
 msgid "License Plate: from '%s' to '%s'"
-msgstr ""
+msgstr "Plaque d'immatriculation: du %s au %s"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_38
@@ -84,22 +84,22 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grouper par..."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_32
 msgid "Oil Pump Replacement"
-msgstr ""
+msgstr "Remplacement de la pompe à huile"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_18
 msgid "Engine Belt Inspection"
-msgstr ""
+msgstr "Inspéction de la couroie de distribution"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "No"
-msgstr ""
+msgstr "Non"
 
 #. module: fleet
 #: help:fleet.vehicle,power:0
@@ -116,7 +116,7 @@ msgstr ""
 #: field:fleet.vehicle.log.fuel,vendor_id:0
 #: field:fleet.vehicle.log.services,vendor_id:0
 msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_35
@@ -126,17 +126,17 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Odometer details"
-msgstr ""
+msgstr "Relevé kilométrique"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Has Alert(s)"
-msgstr ""
+msgstr "Alertes à traiter"
 
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,liter:0
 msgid "Liter"
-msgstr ""
+msgstr "Litre"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -147,22 +147,22 @@ msgstr ""
 #. module: fleet
 #: view:board.board:0
 msgid "Fuel Costs"
-msgstr ""
+msgstr "Coût du carburant"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_9
 msgid "Battery Inspection"
-msgstr ""
+msgstr "Inspection de la batterie"
 
 #. module: fleet
 #: field:fleet.vehicle,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Date de facture"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -173,12 +173,12 @@ msgstr ""
 #: code:addons/fleet/fleet.py:655
 #, python-format
 msgid "%s contract(s) need(s) to be renewed and/or closed!"
-msgstr ""
+msgstr "%s contrat(s) à renouveler et/ou à clôturer!"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Indicative Costs"
-msgstr ""
+msgstr "Coûts estimés"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_16
@@ -204,7 +204,7 @@ msgstr ""
 #: view:fleet.vehicle:0
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Services"
-msgstr ""
+msgstr "Interventions"
 
 #. module: fleet
 #: help:fleet.vehicle,odometer:0
@@ -217,50 +217,50 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Conditions et clauses"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
 msgid "Vehicles with alerts"
-msgstr ""
+msgstr "Véhicules ayant des alertes"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
 msgid "Vehicle Costs"
-msgstr ""
+msgstr "Coûts du vehicule"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Coût total"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
 msgid "Both"
-msgstr ""
+msgstr "Les deux"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_id:0
 #: field:fleet.vehicle.log.fuel,cost_id:0
 #: field:fleet.vehicle.log.services,cost_id:0
 msgid "Automatically created field to link to parent fleet.vehicle.cost"
-msgstr ""
+msgstr "Champ créer automatiquement et lié au \"fleet.vehicle.cost\" parent"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Terminate Contract"
-msgstr ""
+msgstr "Clôturer le contrat"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,parent_id:0
 msgid "Parent cost to this current cost"
-msgstr ""
+msgstr "Centre de coût parent à celui-ci"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Frequency of the recuring cost"
-msgstr ""
+msgstr "Fréquence de récurrence de ce coût"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_1
@@ -272,7 +272,7 @@ msgstr ""
 msgid ""
 "Date when the coverage of the contract expirates (by default, one year after "
 "begin date)"
-msgstr ""
+msgstr "Date de fin de contrat (par défaut, un an après la date de début)"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
@@ -280,106 +280,106 @@ msgstr ""
 #: view:fleet.vehicle.log.services:0
 #: field:fleet.vehicle.log.services,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Notes"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:47
 #, python-format
 msgid "Operation not allowed!"
-msgstr ""
+msgstr "Vous n'avez pas la permission d'effectuer cette opération !"
 
 #. module: fleet
 #: field:fleet.vehicle,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,vehicle_id:0
 msgid "Vehicle concerned by this log"
-msgstr ""
+msgstr "Véhicule concerné par cet enregistrement"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_amount:0
 #: field:fleet.vehicle.log.fuel,cost_amount:0
 #: field:fleet.vehicle.log.services,cost_amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: fleet
 #: field:fleet.vehicle,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Messages non lus"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_6
 msgid "Air Filter Replacement"
-msgstr ""
+msgstr "Remplacement du filtre à air"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_tag
 msgid "fleet.vehicle.tag"
-msgstr ""
+msgstr "Tags"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the services logs for this vehicle"
-msgstr ""
+msgstr "montrer l'historique des interventions pour ce véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_name:0
 msgid "Name of contract to renew soon"
-msgstr ""
+msgstr "Nom du contrat à renouveler prochainement"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
 msgid "Senior"
-msgstr ""
+msgstr "Senior"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,state:0
 msgid "Choose wheter the contract is still valid or not"
-msgstr ""
+msgstr "Choisissez la validiter du contrat"
 
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Automatic"
-msgstr ""
+msgstr "Automatique"
 
 #. module: fleet
 #: help:fleet.vehicle,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si cochée, de nouveau messages requierent votre attention"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:414
 #, python-format
 msgid "Driver: from '%s' to '%s'"
-msgstr ""
+msgstr "Conducteur= du '%s' au '%s'"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "and"
-msgstr ""
+msgstr "et"
 
 #. module: fleet
 #: field:fleet.vehicle.model.brand,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Photo (taille moyenne)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_34
 msgid "Oxygen Sensor Replacement"
-msgstr ""
+msgstr "Replacement des capteurs à Oxygène"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Service Type"
-msgstr ""
+msgstr "Type de service"
 
 #. module: fleet
 #: help:fleet.vehicle,transmission:0
 msgid "Transmission Used by the vehicle"
-msgstr ""
+msgstr "Transmission de ce véhicule"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:726
@@ -387,37 +387,37 @@ msgstr ""
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #, python-format
 msgid "Renew Contract"
-msgstr ""
+msgstr "Renouveler le contrat"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the odometer logs for this vehicle"
-msgstr ""
+msgstr "Voir les relevés kilométriques de ce vehicule"
 
 #. module: fleet
 #: help:fleet.vehicle,odometer_unit:0
 msgid "Unit of the odometer "
-msgstr ""
+msgstr "Unité de distance "
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Services Costs Per Month"
-msgstr ""
+msgstr "Coût des interventions par mois"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Effective Costs"
-msgstr ""
+msgstr "Coût réel"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_8
 msgid "Repair and maintenance"
-msgstr ""
+msgstr "Maintenance et réparation"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,purchaser_id:0
 msgid "Person to which the contract is signed for"
-msgstr ""
+msgstr "Personne mentionnée sur le contrat"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
@@ -435,34 +435,44 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquer pour ajouter un nouveau contrat. \n"
+"              </p><p>\n"
+"                Gerer tous vos contrats (location, assurances, etc.) "
+"incluant\n"
+"                les services et les coûts associés. OpenERP vous préviendra "
+"automatiquement\n"
+"                lorsqu'un contrat devra être renouvelé.\n"
+"              </p><p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_service_type
 msgid "Type of services available on a vehicle"
-msgstr ""
+msgstr "Type de services disponible sur le véhicule"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
 msgid "Service Types"
-msgstr ""
+msgstr "Types d'intervention"
 
 #. module: fleet
 #: view:board.board:0
 msgid "Contracts Costs"
-msgstr ""
+msgstr "Coût des contrats"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
 msgid "Vehicles Services Logs"
-msgstr ""
+msgstr "Suivi des interventions sur les véhicules"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
 msgid "Vehicles Fuel Logs"
-msgstr ""
+msgstr "Suivi du niveau d'essence"
 
 #. module: fleet
 #: view:fleet.vehicle.model.brand:0
@@ -470,11 +480,13 @@ msgid ""
 "$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
 "$(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: fleet
 #: view:board.board:0
 msgid "Vehicles With Alerts"
-msgstr ""
+msgstr "Véhicules avec des alertes"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
@@ -488,32 +500,42 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Cliquez pour ajouter un nouveau coût.\n"
+"              </p><p>\n"
+"                OpenERP vous aide à gérer les coûts associés à vos différent "
+"véhicules.\n"
+"                Les coût sont automatiquement créer en fonction de services, "
+"des contrats \n"
+"                fixes, récurrents) et de la consommation d'essence.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the fuel logs for this vehicle"
-msgstr ""
+msgstr "Voir la consommation d'essence"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,purchaser_id:0
 msgid "Contractor"
-msgstr ""
+msgstr "Contractant"
 
 #. module: fleet
 #: field:fleet.vehicle,license_plate:0
 msgid "License Plate"
-msgstr ""
+msgstr "Plaque d'immatriculatin"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Recurring Cost Frequency"
-msgstr ""
+msgstr "Fréquence de récurrence du coût"
 
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,inv_ref:0
 #: field:fleet.vehicle.log.services,inv_ref:0
 msgid "Invoice Reference"
-msgstr ""
+msgstr "Référence de la facture"
 
 #. module: fleet
 #: field:fleet.vehicle,message_follower_ids:0
@@ -528,12 +550,12 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Costs Per Month"
-msgstr ""
+msgstr "Coûts par mois"
 
 #. module: fleet
 #: field:fleet.contract.state,name:0
 msgid "Contract Status"
-msgstr ""
+msgstr "Status du contrat"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_total:0
@@ -543,7 +565,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_subtype:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_overdue:0
@@ -553,7 +575,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.cost,amount:0
 msgid "Total Price"
-msgstr ""
+msgstr "Prix total"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_27
@@ -563,22 +585,22 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_14
 msgid "Car Wash"
-msgstr ""
+msgstr "Lavage de voiture"
 
 #. module: fleet
 #: help:fleet.vehicle,driver:0
 msgid "Driver of the vehicle"
-msgstr ""
+msgstr "Conducteur du véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "other(s)"
-msgstr ""
+msgstr "Autre(s)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_refueling
 msgid "Refueling"
-msgstr ""
+msgstr "Refaire le plein d'essence"
 
 #. module: fleet
 #: help:fleet.vehicle,message_summary:0
@@ -595,17 +617,17 @@ msgstr ""
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
 msgid "Fuel log for vehicles"
-msgstr ""
+msgstr "Suivi de la consommation pour les véhicules"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Engine Options"
-msgstr ""
+msgstr "Options du moteur"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 msgid "Fuel Costs Per Month"
-msgstr ""
+msgstr "Coût du carburant par mois"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
@@ -615,33 +637,33 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,seats:0
 msgid "Seats Number"
-msgstr ""
+msgstr "Nombre de places"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
 msgid "Convertible"
-msgstr ""
+msgstr "Convertible"
 
 #. module: fleet
 #: model:ir.ui.menu,name:fleet.fleet_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,sum_cost:0
 msgid "Indicative Costs Total"
-msgstr ""
+msgstr "Coût total estimé"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
 msgid "Junior"
-msgstr ""
+msgstr "Junior"
 
 #. module: fleet
 #: help:fleet.vehicle,model_id:0
 msgid "Model of the vehicle"
-msgstr ""
+msgstr "Modele de véhicule"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
@@ -655,13 +677,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez ici pour ajouter un status pour les véhicules.\n"
+"              </p><p>\n"
+"               Vous pouvez modifier les status disponibles pour suivre les "
+"évolutions\n"
+"                de chaque véhicule. Exemple: Actif, en réparation, vendu\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:fleet.vehicle:0
 #: field:fleet.vehicle,log_fuel:0
 #: view:fleet.vehicle.log.fuel:0
 msgid "Fuel Logs"
-msgstr ""
+msgstr "Consommation de carburant"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:409
@@ -670,28 +700,28 @@ msgstr ""
 #: code:addons/fleet/fleet.py:420
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
 msgid "Indicative Costs Analysis"
-msgstr ""
+msgstr "Analyse des coût estimés"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_12
 msgid "Brake Inspection"
-msgstr ""
+msgstr "Inspection des freins"
 
 #. module: fleet
 #: help:fleet.vehicle,state:0
 msgid "Current state of the vehicle"
-msgstr ""
+msgstr "Status actuel du véhicule"
 
 #. module: fleet
 #: selection:fleet.vehicle,transmission:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuel"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_52
@@ -701,12 +731,12 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle.cost,cost_subtype:0
 msgid "Cost type purchased with this cost"
-msgstr ""
+msgstr "Type de dépense"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Gasoline"
-msgstr ""
+msgstr "Essence"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
@@ -716,16 +746,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Cliquer pour ajouter une marque\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,start_date:0
 msgid "Contract Start Date"
-msgstr ""
+msgstr "Date de début du contrat"
 
 #. module: fleet
 #: field:fleet.vehicle,odometer_unit:0
 msgid "Odometer Unit"
-msgstr ""
+msgstr "Unité de distance"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_30
@@ -735,37 +769,37 @@ msgstr ""
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Daily"
-msgstr ""
+msgstr "Quotidien"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_6
 msgid "Snow tires"
-msgstr ""
+msgstr "Pneu hivers/contacte"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,date:0
 msgid "Date when the cost has been executed"
-msgstr ""
+msgstr "Date de réalisation de la dépense"
 
 #. module: fleet
 #: field:fleet.vehicle.state,sequence:0
 msgid "Order"
-msgstr ""
+msgstr "Commande"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Vehicles costs"
-msgstr ""
+msgstr "Coûts des véhicules"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_services
 msgid "Services for vehicles"
-msgstr ""
+msgstr "Services associés aux véhicules"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Indicative Cost"
-msgstr ""
+msgstr "Coût estimé"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_26
@@ -778,48 +812,51 @@ msgid ""
 "Create a new contract automatically with all the same informations except "
 "for the date that will start at the end of current contract"
 msgstr ""
+"Créer automatiquement un nouveau contrat reprenant les même informations à "
+"l'exception de la date de début qui aura pour valeur la date de fin du "
+"contrat actuel"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
 msgid "Terminated"
-msgstr ""
+msgstr "Terminé"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_cost
 msgid "Cost related to a vehicle"
-msgstr ""
+msgstr "Coût associé à un véhicule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_33
 msgid "Other Maintenance"
-msgstr ""
+msgstr "Autre maintenance"
 
 #. module: fleet
 #: field:fleet.vehicle.model,brand:0
 #: view:fleet.vehicle.model.brand:0
 msgid "Model Brand"
-msgstr ""
+msgstr "Modèle de voiture"
 
 #. module: fleet
 #: field:fleet.vehicle.model.brand,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Photo (petite taille)"
 
 #. module: fleet
 #: field:fleet.vehicle,state:0
 #: view:fleet.vehicle.state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,cost_generated:0
 msgid "Recurring Cost Amount"
-msgstr ""
+msgstr "Montant récurrent"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_49
 msgid "Transmission Replacement"
-msgstr ""
+msgstr "Replacement de la transmission"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
@@ -834,6 +871,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquer pour ajouter un état du niveau de carburant. \n"
+"              </p><p>\n"
+"                Vous pouvez suivre la consommation et le niveau de carburant "
+"de chaque véhicule.\n"
+"                Vous pouvez aussi rechercher les opération d'un véhicule en "
+"particulier en utilisant\n"
+"                le champ de recherche.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_11
@@ -843,49 +890,49 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,odometer:0
 msgid "Last Odometer"
-msgstr ""
+msgstr "Dernier relevé kilomètrique"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
 msgid "Vehicle Model"
-msgstr ""
+msgstr "Modèle de véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle,doors:0
 msgid "Doors Number"
-msgstr ""
+msgstr "Nombre de portes"
 
 #. module: fleet
 #: help:fleet.vehicle,acquisition_date:0
 msgid "Date when the vehicle has been bought"
-msgstr ""
+msgstr "Date d'achat du véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle.model:0
 msgid "Models"
-msgstr ""
+msgstr "Modèles"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "amount"
-msgstr ""
+msgstr "montant"
 
 #. module: fleet
 #: help:fleet.vehicle,fuel_type:0
 msgid "Fuel Used by the vehicle"
-msgstr ""
+msgstr "Carburant utilisé par le véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Set Contract In Progress"
-msgstr ""
+msgstr "Passer le contrat à l'état 'en cours'"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,odometer_unit:0
 #: field:fleet.vehicle.odometer,unit:0
 msgid "Unit"
-msgstr ""
+msgstr "Unité"
 
 #. module: fleet
 #: field:fleet.vehicle,message_is_follower:0
@@ -895,7 +942,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,horsepower:0
 msgid "Horsepower"
-msgstr ""
+msgstr "Nombre de chevaux"
 
 #. module: fleet
 #: field:fleet.vehicle,image:0
@@ -906,7 +953,7 @@ msgstr ""
 #: field:fleet.vehicle.model,image_small:0
 #: field:fleet.vehicle.model.brand,image:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: fleet
 #: field:fleet.vehicle,horsepower_tax:0
@@ -923,7 +970,7 @@ msgstr ""
 #: code:addons/fleet/fleet.py:47
 #, python-format
 msgid "Emptying the odometer value of a vehicle is not allowed."
-msgstr ""
+msgstr "La remise à zéro du kilométrage du véhicule est interdite."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
@@ -933,12 +980,12 @@ msgstr ""
 #. module: fleet
 #: field:fleet.service.type,category:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
 msgid "Fuel Costs by Month"
-msgstr ""
+msgstr "Coût du carburant par mois"
 
 #. module: fleet
 #: help:fleet.vehicle.model.brand,image:0
@@ -946,6 +993,8 @@ msgid ""
 "This field holds the image used as logo for the brand, limited to "
 "1024x1024px."
 msgstr ""
+"Ce champ contient l'image utilisé comme logo de la marque, limitée à "
+"1024x1024px."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_11
@@ -955,28 +1004,28 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "All vehicles"
-msgstr ""
+msgstr "Tous les véhicules"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 #: view:fleet.vehicle.log.services:0
 msgid "Additional Details"
-msgstr ""
+msgstr "Informations supplémentaires"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
 msgid "Services Costs by Month"
-msgstr ""
+msgstr "Coût des services par mois"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_9
 msgid "Assistance"
-msgstr ""
+msgstr "Assistance"
 
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,price_per_liter:0
 msgid "Price Per Liter"
-msgstr ""
+msgstr "Prix au litre"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_17
@@ -996,7 +1045,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,fuel_type:0
 msgid "Fuel Type"
-msgstr ""
+msgstr "Type de carburant"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_22
@@ -1006,12 +1055,12 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
-msgstr ""
+msgstr "Remplacement de la pompe à eau"
 
 #. module: fleet
 #: help:fleet.vehicle,location:0
 msgid "Location of the vehicle (garage, ...)"
-msgstr ""
+msgstr "Lieu du véhicule (garage, ...)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_28
@@ -1021,7 +1070,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.contract,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_40
@@ -1031,44 +1080,44 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle.model,brand:0
 msgid "Brand of the vehicle"
-msgstr ""
+msgstr "Marque du véhicule"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,start_date:0
 msgid "Date when the coverage of the contract begins"
-msgstr ""
+msgstr "Date de début du contrat"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
 msgid "Electric"
-msgstr ""
+msgstr "Electrique"
 
 #. module: fleet
 #: field:fleet.vehicle,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 #: field:fleet.vehicle,log_contracts:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contrats"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_13
 msgid "Brake Pad(s) Replacement"
-msgstr ""
+msgstr "Remplacement de(s) pedale(s) de frein"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 #: view:fleet.vehicle.log.services:0
 msgid "Odometer Details"
-msgstr ""
+msgstr "Détail kilométrique"
 
 #. module: fleet
 #: field:fleet.vehicle,driver:0
 msgid "Driver"
-msgstr ""
+msgstr "Conducteur"
 
 #. module: fleet
 #: help:fleet.vehicle.model.brand,image_small:0
@@ -1077,16 +1126,19 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Vignette de la marque. Elle est automatiquement redimensionnée en 64X64px, "
+"en préservant le ratio. Ce change est utilisé à tous les endroits ou la "
+"vignette est requise."
 
 #. module: fleet
 #: view:board.board:0
 msgid "Fleet Dashboard"
-msgstr ""
+msgstr "Tableau de bord du parc automobile"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
 msgid "Break"
-msgstr ""
+msgstr "Frein"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_contract_omnium
@@ -1096,17 +1148,17 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Services Details"
-msgstr ""
+msgstr "Détails des interventions"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_15
 msgid "Residual value (Excluding VAT)"
-msgstr ""
+msgstr "Valeur résiduelle (hors TVA)"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_7
 msgid "Alternator Replacement"
-msgstr ""
+msgstr "Remplacement de l'alternateur"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_3
@@ -1116,7 +1168,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_23
 msgid "Fuel Pump Replacement"
-msgstr ""
+msgstr "Remplacement de la pompe à carburant"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
@@ -1126,7 +1178,7 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Cost Type"
-msgstr ""
+msgstr "Type de dépense"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_4
@@ -1136,18 +1188,18 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show all the costs for this vehicle"
-msgstr ""
+msgstr "Voir toutes les dépenses du véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle.odometer:0
 msgid "Odometer Values Per Month"
-msgstr ""
+msgstr "Kilomètrage par mois"
 
 #. module: fleet
 #: field:fleet.vehicle,message_comment_ids:0
 #: help:fleet.vehicle,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Commentaires et emails"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
@@ -1166,6 +1218,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Cliquer pour ajouter un véhicule. \n"
+"              </p><p>\n"
+"               Vous pouvez gérer votre parc de véhicule et suivant les "
+"contrats, les services, les coût fixes ou récurrents.\n"
+"                Le kilométrage, la consomation, associé à chaque véhicule\n"
+"            </p><p>\n"
+"            "
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_13
@@ -1175,7 +1235,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.log.contract,expiration_date:0
 msgid "Contract Expiration Date"
-msgstr ""
+msgstr "Date d'expiration du contrat"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
@@ -1200,58 +1260,76 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Le tableau de bord du parc de véhicule est vide.</b>\n"
+"                  </p><p>\n"
+"                    Pour ajouter votre premier indicateur, cliquez sur "
+"n'importe quel menu\n"
+"                    change de vue (liste ou graphique) et cliquez sur "
+"<i>'Ajouter au\n"
+"                    tableau de bord'</i> dans les option avancé du champ de "
+"recherche.\n"
+"                  </p><p>\n"
+"                    Vous pouvez filtrer ou regrouper les données avant "
+"d'ajouter\n"
+"                    l'indicateur à votre tableau de bord en utilisant le "
+"même champ de recherche.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_12
 msgid "Rent (Excluding VAT)"
-msgstr ""
+msgstr "Location (hors TVA)"
 
 #. module: fleet
 #: selection:fleet.vehicle,odometer_unit:0
 msgid "Kilometers"
-msgstr ""
+msgstr "kilomètres"
 
 #. module: fleet
 #: view:fleet.vehicle.log.fuel:0
 msgid "Vehicle Details"
-msgstr ""
+msgstr "Détail du véhicule"
 
 #. module: fleet
 #: selection:fleet.service.type,category:0
 #: field:fleet.vehicle.cost,contract_id:0
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Contract"
-msgstr ""
+msgstr "Contrat"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
 msgid "Model brand of Vehicle"
-msgstr ""
+msgstr "Type de véhicule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_10
 msgid "Battery Replacement"
-msgstr ""
+msgstr "Replacement de la batterie"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 #: field:fleet.vehicle.cost,date:0
 #: field:fleet.vehicle.odometer,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
 #: model:ir.ui.menu,name:fleet.fleet_vehicles
 msgid "Vehicles"
-msgstr ""
+msgstr "Véhicules"
 
 #. module: fleet
 #: selection:fleet.vehicle,odometer_unit:0
 msgid "Miles"
-msgstr ""
+msgstr "Miles"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,cost_generated:0
@@ -1259,6 +1337,9 @@ msgid ""
 "Costs paid at regular intervals, depending on the cost frequency. If the "
 "cost frequency is set to unique, the cost will be logged at the start date"
 msgstr ""
+"Montants payés régulièrement, en fonction de la fréquence de la dépense. Si "
+"la fréquence de la dépense est unique, le coût sera imputé à la date de "
+"début du contrat."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_17
@@ -1281,11 +1362,22 @@ msgid ""
 "        </p>\n"
 "      "
 msgstr ""
+"p>\n"
+"          OpenERP vous aide à gérer les coûts pour différents véhicules\n"
+"          Les coût sont généralement créer depus les services et les "
+"contrats et apparaissent ici.\n"
+"        </p>\n"
+"        <p>\n"
+"          Grâce à différents filtres, OpenERP peut afficher uniquement les "
+"coûts réels, \n"
+"          triés par type et par véhicule.\n"
+"        </p>\n"
+"      "
 
 #. module: fleet
 #: field:fleet.vehicle,car_value:0
 msgid "Car Value"
-msgstr ""
+msgstr "Valeur de la voiture"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.open_board_fleet
@@ -1293,33 +1385,33 @@ msgstr ""
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting
 #: model:ir.ui.menu,name:fleet.menu_root
 msgid "Fleet"
-msgstr ""
+msgstr "Parc automobile"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_14
 msgid "Total expenses (Excluding VAT)"
-msgstr ""
+msgstr "Total des dépenses (hors TVA)"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,odometer_id:0
 msgid "Odometer"
-msgstr ""
+msgstr "kilomètrage"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_45
 msgid "Tire Replacement"
-msgstr ""
+msgstr "Remplacement des Pneus"
 
 #. module: fleet
 #: view:fleet.service.type:0
 msgid "Service types"
-msgstr ""
+msgstr "Types d'intervention"
 
 #. module: fleet
 #: field:fleet.vehicle.log.fuel,purchaser_id:0
 #: field:fleet.vehicle.log.services,purchaser_id:0
 msgid "Purchaser"
-msgstr ""
+msgstr "Acheteur"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_3
@@ -1330,12 +1422,12 @@ msgstr ""
 #: view:fleet.vehicle.model:0
 #: field:fleet.vehicle.model,vendors:0
 msgid "Vendors"
-msgstr ""
+msgstr "Vendeur"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_contract_leasing
 msgid "Leasing"
-msgstr ""
+msgstr "Location"
 
 #. module: fleet
 #: help:fleet.vehicle.model.brand,image_medium:0
@@ -1344,68 +1436,71 @@ msgid ""
 "image, with aspect ratio preserved. Use this field in form views or some "
 "kanban views."
 msgstr ""
+"Logo (taille moyenne) de la marque. Il est automatiquement redimensionné à "
+"128x128px, en concervant le ratio. Ce logo est utilisé dans la vue "
+"formulaire et kanban"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Weekly"
-msgstr ""
+msgstr "Hebdomadaire"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 #: view:fleet.vehicle.odometer:0
 msgid "Odometer Logs"
-msgstr ""
+msgstr "Suivi du kilomètrage"
 
 #. module: fleet
 #: field:fleet.vehicle,acquisition_date:0
 msgid "Acquisition Date"
-msgstr ""
+msgstr "Date d'acquisition"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_odometer
 msgid "Odometer log for a vehicle"
-msgstr ""
+msgstr "Suivi du kilomètrage pour le véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_type:0
 msgid "Category of the cost"
-msgstr ""
+msgstr "Catégorie de la dépense"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_5
 #: model:fleet.service.type,name:fleet.type_service_service_7
 msgid "Summer tires"
-msgstr ""
+msgstr "Pneu d'été"
 
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_due_soon:0
 msgid "Has Contracts to renew"
-msgstr ""
+msgstr "Contrats à renouvelé"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_31
 msgid "Oil Change"
-msgstr ""
+msgstr "Vidange"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
 msgid "To Close"
-msgstr ""
+msgstr "à clôturer"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
 msgid "Brand model of the vehicle"
-msgstr ""
+msgstr "Modèle du véhicule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_51
 msgid "Wheel Alignment"
-msgstr ""
+msgstr "Parallèlisme"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
 msgid "Purchased"
-msgstr ""
+msgstr "Acheté"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
@@ -1418,6 +1513,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Ici vous pouvez ajouter les relevés kilométrique de tous les "
+"véhicules.\n"
+"                Vous pouvez aussi voir les relevés pour un véhicules en "
+"particulier\n"
+"                en utilisant le champ de recherche.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
@@ -1430,11 +1533,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               Cliquer ici pour ajouter un nouveau modèle.\n"
+"              </p><p>\n"
+"               Vous pouvez ajouter différentes modèles (e.g. A3, A4) pour "
+"chaque marque (Audi).\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "General Properties"
-msgstr ""
+msgstr "Propriétés"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_21
@@ -1449,34 +1559,34 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_10
 msgid "Replacement Vehicle"
-msgstr ""
+msgstr "Replacement du véhicule"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En cours"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
 msgid "Yearly"
-msgstr ""
+msgstr "Annuel"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
 msgid "States of Vehicle"
-msgstr ""
+msgstr "Etats du véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle.model,modelname:0
 msgid "Model name"
-msgstr ""
+msgstr "Nom du modèle"
 
 #. module: fleet
 #: view:board.board:0
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
 msgid "Costs by Month"
-msgstr ""
+msgstr "Coût par mois"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_18
@@ -1492,7 +1602,7 @@ msgstr ""
 #: code:addons/fleet/fleet.py:418
 #, python-format
 msgid "State: from '%s' to '%s'"
-msgstr ""
+msgstr "Etat: du '%s' au '%s'"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_2
@@ -1507,84 +1617,84 @@ msgstr ""
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 msgid "Cost Details"
-msgstr ""
+msgstr "Détail des dépenses"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:410
 #, python-format
 msgid "Model: from '%s' to '%s'"
-msgstr ""
+msgstr "Modèle: du '%s' au '%s'"
 
 #. module: fleet
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Other"
-msgstr ""
+msgstr "Autre"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Contract details"
-msgstr ""
+msgstr "Détails du contrat"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
 msgid "Employee Car"
-msgstr ""
+msgstr "Voiture de société"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,auto_generated:0
 msgid "Automatically Generated"
-msgstr ""
+msgstr "Créer automatiquement"
 
 #. module: fleet
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Fuel"
-msgstr ""
+msgstr "Carburant"
 
 #. module: fleet
 #: sql_constraint:fleet.vehicle.state:0
 msgid "State name already exists"
-msgstr ""
+msgstr "Cet état existe déjà"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_37
 msgid "Radiator Repair"
-msgstr ""
+msgstr "Reparation du radiateur"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
 msgid "Contract information on a vehicle"
-msgstr ""
+msgstr "Information du contrat pour un véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,days_left:0
 msgid "Warning Date"
-msgstr ""
+msgstr "Date d'alerte"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_19
 msgid "Residual value in %"
-msgstr ""
+msgstr "Valeur résiduelle en %"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Additional Properties"
-msgstr ""
+msgstr "Options"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_state
 msgid "fleet.vehicle.state"
-msgstr ""
+msgstr "Etat du véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Contract Costs Per Month"
-msgstr ""
+msgstr "Coût du contrat par mois"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
 msgid "Vehicles Contracts"
-msgstr ""
+msgstr "Contrats des véhicules"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_48
@@ -1594,7 +1704,7 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle.model.brand,name:0
 msgid "Brand Name"
-msgstr ""
+msgstr "Nom de la marque"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_36
@@ -1604,20 +1714,20 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle.cost,contract_id:0
 msgid "Contract attached to this cost"
-msgstr ""
+msgstr "Contrat attaché à cette dépense"
 
 #. module: fleet
 #: code:addons/fleet/fleet.py:397
 #, python-format
 msgid "Vehicle %s has been added to the fleet!"
-msgstr ""
+msgstr "Le véhicule %s à été ajouter à la flotte"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.fuel:0
 #: view:fleet.vehicle.log.services:0
 msgid "Price"
-msgstr ""
+msgstr "Prix"
 
 #. module: fleet
 #: view:fleet.vehicle:0
@@ -1625,14 +1735,14 @@ msgstr ""
 #: field:fleet.vehicle.cost,vehicle_id:0
 #: field:fleet.vehicle.odometer,vehicle_id:0
 msgid "Vehicle"
-msgstr ""
+msgstr "Véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_ids:0
 #: view:fleet.vehicle.log.contract:0
 #: view:fleet.vehicle.log.services:0
 msgid "Included Services"
-msgstr ""
+msgstr "Services inclus"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
@@ -1644,11 +1754,17 @@ msgid ""
 "        </p>\n"
 "      "
 msgstr ""
+"<p>\n"
+"          Liste des véhicules nécessitant le renouvelement d'un ou de "
+"plusieurs contrats. Si vous lisez ce messge, c'est qu'il n'y a pas de "
+"contrat à renouveler.\n"
+"        </p>\n"
+"      "
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_15
 msgid "Catalytic Converter Replacement"
-msgstr ""
+msgstr "Remplacement du pot catalytique"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_25
@@ -1659,12 +1775,13 @@ msgstr ""
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
 #: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
 msgid "Vehicles Odometer"
-msgstr ""
+msgstr "Relevés kilomètrique des véhicules"
 
 #. module: fleet
 #: help:fleet.vehicle.log.contract,notes:0
 msgid "Write here all supplementary informations relative to this contract"
 msgstr ""
+"Ecrivez ici toutes les informations supplémentaires concernant ce contrat"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_29
@@ -1674,18 +1791,18 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_16
 msgid "Options"
-msgstr ""
+msgstr "Options"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_contract_repairing
 msgid "Repairing"
-msgstr ""
+msgstr "En reparation"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
 #: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
 msgid "Costs Analysis"
-msgstr ""
+msgstr "Analyse des dépenses"
 
 #. module: fleet
 #: field:fleet.vehicle.log.contract,ins_ref:0
@@ -1702,12 +1819,12 @@ msgstr ""
 #: field:fleet.vehicle.state,name:0
 #: field:fleet.vehicle.tag,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: fleet
 #: help:fleet.vehicle,doors:0
 msgid "Number of doors of the vehicle"
-msgstr ""
+msgstr "Nombre de portes du véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle,transmission:0
@@ -1717,12 +1834,12 @@ msgstr ""
 #. module: fleet
 #: field:fleet.vehicle,vin_sn:0
 msgid "Chassis Number"
-msgstr ""
+msgstr "Numéro de chassis"
 
 #. module: fleet
 #: help:fleet.vehicle,color:0
 msgid "Color of the vehicle"
-msgstr ""
+msgstr "Couleur du véhicule"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
@@ -1736,37 +1853,46 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour ajouter une nouvelle intervention. \n"
+"              </p><p>\n"
+"                OpenERP vous aide à suivre toutes les interventions faites \n"
+"               sur votre véhicule. Les interventions peuvent être de "
+"plusieur types: occasionnel\n"
+"                reparation, révision, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: field:fleet.vehicle,co2:0
 msgid "CO2 Emissions"
-msgstr ""
+msgstr "Emission de CO2"
 
 #. module: fleet
 #: view:fleet.vehicle.log.contract:0
 msgid "Contract logs"
-msgstr ""
+msgstr "Suivi des contrats"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "Costs"
-msgstr ""
+msgstr "Coûts"
 
 #. module: fleet
 #: field:fleet.vehicle,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
 msgid "Contracts Costs by Month"
-msgstr ""
+msgstr "Coût des contrats par mois"
 
 #. module: fleet
 #: field:fleet.vehicle,model_id:0
 #: view:fleet.vehicle.model:0
 msgid "Model"
-msgstr ""
+msgstr "Modèle"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_41
@@ -1776,17 +1902,17 @@ msgstr ""
 #. module: fleet
 #: help:fleet.vehicle,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Messages et historique des communications"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle
 msgid "Information on a vehicle"
-msgstr ""
+msgstr "Information sur un véhicule"
 
 #. module: fleet
 #: help:fleet.vehicle,co2:0
 msgid "CO2 emissions of the vehicle"
-msgstr ""
+msgstr "Taux d'emissions de CO2 du véhicule"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_53
@@ -1797,12 +1923,12 @@ msgstr ""
 #: view:fleet.vehicle.log.contract:0
 #: field:fleet.vehicle.log.contract,generated_cost_ids:0
 msgid "Generated Costs"
-msgstr ""
+msgstr "Coût"
 
 #. module: fleet
 #: field:fleet.vehicle,color:0
 msgid "Color"
-msgstr ""
+msgstr "Couleur"
 
 #. module: fleet
 #: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
@@ -1815,32 +1941,39 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez ici pour ajouter un type d'intervention.\n"
+"              </p><p>\n"
+"                Les intervention peuvent être utilisées dans les contrats, "
+"comme intervention unique, ou les deux.\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: view:board.board:0
 msgid "Services Costs"
-msgstr ""
+msgstr "Coût des interventions"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model
 msgid "Model of a vehicle"
-msgstr ""
+msgstr "Modèle d'un véhicule"
 
 #. module: fleet
 #: help:fleet.vehicle,seats:0
 msgid "Number of seats of the vehicle"
-msgstr ""
+msgstr "Numbre de places dans le véhicule"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,odometer:0
 #: field:fleet.vehicle.odometer,value:0
 msgid "Odometer Value"
-msgstr ""
+msgstr "Kilomètrage"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Cost"
-msgstr ""
+msgstr "Coût"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_39
@@ -1850,39 +1983,41 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_42
 msgid "Starter Replacement"
-msgstr ""
+msgstr "Replacement du démarreur"
 
 #. module: fleet
 #: view:fleet.vehicle.cost:0
 #: field:fleet.vehicle.cost,year:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: fleet
 #: help:fleet.vehicle,license_plate:0
 msgid "License plate number of the vehicle (ie: plate number for a car)"
 msgstr ""
+"Immatriculation du véhicule  (ex: plaque d'immatriculation pour un voiture)"
 
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_contract_state
 msgid "Contains the different possible status of a leasing contract"
-msgstr ""
+msgstr "Contient les différents status possible pour un contrat"
 
 #. module: fleet
 #: view:fleet.vehicle:0
 msgid "show the contract for this vehicle"
-msgstr ""
+msgstr "Afficher le contrat pour ce véhicule"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: fleet
 #: help:fleet.service.type,category:0
 msgid ""
 "Choose wheter the service refer to contracts, vehicle services or both"
 msgstr ""
+"Choisissez si l'intervention est liée au contrat, au véhicule ou les deux"
 
 #. module: fleet
 #: help:fleet.vehicle.cost,cost_type:0
diff --git a/addons/fleet/i18n/it.po b/addons/fleet/i18n/it.po
index d095e69b7b5..feafa5d1e39 100644
--- a/addons/fleet/i18n/it.po
+++ b/addons/fleet/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-11 12:30+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:13+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -369,7 +369,7 @@ msgstr "Foto grandezza media"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_34
 msgid "Oxygen Sensor Replacement"
-msgstr ""
+msgstr "Ricambio sensore ossigeno"
 
 #. module: fleet
 #: view:fleet.vehicle.log.services:0
@@ -747,7 +747,7 @@ msgstr "Gomme da neve"
 #. module: fleet
 #: help:fleet.vehicle.cost,date:0
 msgid "Date when the cost has been executed"
-msgstr ""
+msgstr "Data del sostenimento del costo"
 
 #. module: fleet
 #: field:fleet.vehicle.state,sequence:0
diff --git a/addons/google_base_account/i18n/de.po b/addons/google_base_account/i18n/de.po
index 8a6a5182d90..617e7a3b03b 100644
--- a/addons/google_base_account/i18n/de.po
+++ b/addons/google_base_account/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-09 15:18+0000\n"
+"PO-Revision-Date: 2012-12-18 07:02+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -36,12 +36,12 @@ msgstr "Google Kontakt Import Fehler!"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Benutzer"
 
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -57,7 +57,7 @@ msgstr "Google Passwort"
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -67,13 +67,13 @@ msgstr "Google-Konto"
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synchronisation"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Authentication failed. Check the user and password."
-msgstr ""
+msgstr "Authentifizierung fehlgeschlgen. Prüfen Sie Benutzer-ID und Passwort"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -93,7 +93,7 @@ msgstr "Google Kontakt"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/google_docs/i18n/it.po b/addons/google_docs/i18n/it.po
index 934e3590385..a545f2673ee 100644
--- a/addons/google_docs/i18n/it.po
+++ b/addons/google_docs/i18n/it.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-11 08:34+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 22:11+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: google_docs
 #: code:addons/google_docs/google_docs.py:136
 #, python-format
 msgid "Key Error!"
-msgstr ""
+msgstr "Errore Chiave!"
 
 #. module: google_docs
 #: view:google.docs.config:0
@@ -30,6 +30,9 @@ msgid ""
 "`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
 ".p`, the ID is `presentation:123456789`"
 msgstr ""
+"per un documento di presentazione (proiezione diapositive) con un url come "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, l'ID è `presentation:123456789`"
 
 #. module: google_docs
 #: view:google.docs.config:0
@@ -38,6 +41,9 @@ msgid ""
 "`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is "
 "`document:123456789`"
 msgstr ""
+"per un documento di testo con un url come "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID è "
+"`document:123456789`"
 
 #. module: google_docs
 #: field:google.docs.config,gdocs_resource_id:0
@@ -51,6 +57,9 @@ msgid ""
 "`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is "
 "`drawings:123456789`"
 msgstr ""
+"per un documento di disegno con url come "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID è "
+"`drawings:123456789`"
 
 #. module: google_docs
 #. openerp-web
@@ -65,6 +74,8 @@ msgid ""
 "This is the id of the template document, on google side. You can find it "
 "thanks to its URL:"
 msgstr ""
+"Questo è l'id del modello di documento, sul lato google. E' possibile "
+"trovarlo tramite il suo URL:"
 
 #. module: google_docs
 #: model:ir.model,name:google_docs.model_google_docs_config
@@ -79,6 +90,8 @@ msgid ""
 "The user google credentials are not set yet. Contact your administrator for "
 "help."
 msgstr ""
+"Le credeziali dell'utente google non sono ancora impostate. Contattare "
+"l'amministratore per aiuto."
 
 #. module: google_docs
 #: view:google.docs.config:0
@@ -87,6 +100,9 @@ msgid ""
 "`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
 "the ID is `spreadsheet:123456789`"
 msgstr ""
+"per un foglio di calcolo con url come "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"l'ID è `spreadsheet:123456789`"
 
 #. module: google_docs
 #: code:addons/google_docs/google_docs.py:98
@@ -101,6 +117,7 @@ msgstr ""
 #, python-format
 msgid "Creating google docs may only be done by one at a time."
 msgstr ""
+"La creazione di documenti google può essere fatto solo uno alla volta."
 
 #. module: google_docs
 #: code:addons/google_docs/google_docs.py:53
@@ -115,11 +132,13 @@ msgstr "Errore Google Docs!"
 #, python-format
 msgid "Check your google configuration in Users/Users/Synchronization tab."
 msgstr ""
+"Controllare la configurazione google nella scheda "
+"Utenti/Utenti/Sincronizzazione"
 
 #. module: google_docs
 #: model:ir.ui.menu,name:google_docs.menu_gdocs_config
 msgid "Google Docs configuration"
-msgstr ""
+msgstr "Configurazione Google Docs"
 
 #. module: google_docs
 #: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config
@@ -144,6 +163,7 @@ msgstr "Credenziali utente google non ancora impostate."
 #, python-format
 msgid "Your Google Doc Name Pattern's key does not found in object."
 msgstr ""
+"La chiave dello Schema Nome di Google Doc non è stata trovata nell'oggetto."
 
 #. module: google_docs
 #: help:google.docs.config,name_template:0
@@ -151,11 +171,13 @@ msgid ""
 "Choose how the new google docs will be named, on google side. Eg. "
 "gdoc_%(field_name)s"
 msgstr ""
+"Scegliere come il nuovo google docs sarà nominato, sul lato google. Es.: "
+"gdoc_%(field_name)s"
 
 #. module: google_docs
 #: view:google.docs.config:0
 msgid "Google Docs Configuration"
-msgstr ""
+msgstr "Configurazione Google Docs"
 
 #. module: google_docs
 #: help:google.docs.config,gdocs_resource_id:0
@@ -177,13 +199,29 @@ msgid ""
 "`drawings:123456789`\n"
 "...\n"
 msgstr ""
+"\n"
+"Questo è l'id del modello di documento, sul lato google. E' possibile "
+"trovarlo grazie al suo URL:\n"
+"*per un documento di testo con url come "
+"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, l'ID è "
+"`document:123456789`\n"
+"*per un foglio di calcolo con url come "
+"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, "
+"l'ID è `spreadsheet:123456789`\n"
+"*per un documento di presentazione (proiezione diapositive) con url come "
+"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id"
+".p`, l'ID è `presentation:123456789`\n"
+"*per un documento di disegno con url come "
+"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, l'ID è "
+"`drawings:123456789`\n"
+"...\n"
 
 #. module: google_docs
 #: model:ir.model,name:google_docs.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: google_docs
 #: field:google.docs.config,name_template:0
 msgid "Google Doc Name Pattern"
-msgstr ""
+msgstr "Schema Nome Google Doc"
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
index 9fdcca09e4b..20cd2c9a1bc 100644
--- a/addons/hr_recruitment/i18n/it.po
+++ b/addons/hr_recruitment/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2011-01-15 19:29+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:11+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-04 05:48+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -131,7 +131,7 @@ msgstr "Lavoro"
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Chiudi richiesta lavoro"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
@@ -229,7 +229,7 @@ msgstr ""
 #: field:hr.applicant,job_id:0
 #: field:hr.recruitment.report,job_id:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Lavoro Richiesto"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,department_id:0
@@ -371,7 +371,7 @@ msgstr ""
 #: selection:hr.recruitment.report,state:0
 #: selection:hr.recruitment.stage,state:0
 msgid "New"
-msgstr ""
+msgstr "Nuovo"
 
 #. module: hr_recruitment
 #: field:hr.applicant,email_from:0
@@ -395,7 +395,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Available"
-msgstr ""
+msgstr "Disponibile"
 
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
@@ -438,7 +438,7 @@ msgstr "Telefono"
 #: field:hr.applicant,priority:0
 #: field:hr.recruitment.report,priority:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Valutazione"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
@@ -562,7 +562,7 @@ msgstr ""
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Modulo di Assunzione"
 
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
@@ -614,12 +614,12 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
 msgid "Degree of Recruitment"
-msgstr ""
+msgstr "Gradi del Processo di assunzione"
 
 #. module: hr_recruitment
 #: field:hr.applicant,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Aggiorna data"
 
 #. module: hr_recruitment
 #: view:hired.employee:0
@@ -703,7 +703,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_degree
 msgid "Degrees"
-msgstr ""
+msgstr "Gradi"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_closed:0
@@ -996,7 +996,7 @@ msgstr ""
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
 msgid "Gives the sequence order when displaying a list of degrees."
-msgstr ""
+msgstr "Fornisce l'ordinamento quando viene visualizzata una lista di gradi."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index a7b731b4af6..338bad8860b 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-11 08:30+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 23:11+0000\n"
+"Last-Translator: Salanti Michele <Unknown>\n"
 "Language-Team: Italian <it@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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -42,7 +42,7 @@ msgstr ""
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Contenuto collaborativo"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
@@ -92,7 +92,7 @@ msgstr ""
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr "Configuarazione"
+msgstr "Configurazione"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_ftp:0
diff --git a/addons/l10n_multilang/i18n/pt.po b/addons/l10n_multilang/i18n/pt.po
index 2c931c9c90c..3aa8fc01319 100644
--- a/addons/l10n_multilang/i18n/pt.po
+++ b/addons/l10n_multilang/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:06+0000\n"
-"PO-Revision-Date: 2012-12-11 15:34+0000\n"
+"PO-Revision-Date: 2012-12-18 14:58+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
@@ -110,6 +110,10 @@ msgid ""
 "the final object when generating them from templates. You must provide the "
 "language codes separated by ';'"
 msgstr ""
+"Indique aqui os idiomas para os quais as traduções dos modelos podem ser "
+"carregadas aquando da instalação deste módulo de localização e copiadas no "
+"objeto final gerado a partir daqueles. Deve indicar os códigos de idioma "
+"separados por ';'"
 
 #. module: l10n_multilang
 #: constraint:account.account:0
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index a8e7d52f8c3..1f84a989743 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-13 18:51+0000\n"
+"PO-Revision-Date: 2012-12-18 07:08+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
 msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -28,12 +28,15 @@ msgid ""
 "Campaigns.\n"
 "                This installs the module marketing_campaign_crm_demo."
 msgstr ""
+"Installiert Demo Daten Leads, Kapagnen und Segmente für  Marketing "
+"Kampagnen.\n"
+"                Dies installiert das Modul marketing_campaign_crm_demo."
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_configuration
 #: view:marketing.config.settings:0
 msgid "Configure Marketing"
-msgstr ""
+msgstr "Konfiguriere Mrketing"
 
 #. module: marketing
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
@@ -43,17 +46,17 @@ msgstr "Marketing"
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign:0
 msgid "Marketing campaigns"
-msgstr ""
+msgstr "Marketing Kampagnen"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampagnen"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
@@ -68,22 +71,22 @@ msgstr "Benutzer"
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Campaigns Settings"
-msgstr ""
+msgstr "Kampagnen Konfiguration"
 
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
 msgid "Track customer profile to focus your campaigns"
-msgstr ""
+msgstr "Verfolge ds Kundenprofil um die Kampagnen zu spezifizieren"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #. module: marketing
 #: view:marketing.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
 
 #. module: marketing
 #: help:marketing.config.settings,module_marketing_campaign:0
@@ -93,6 +96,9 @@ msgid ""
 "CRM leads.\n"
 "                This installs the module marketing_campaign."
 msgstr ""
+"Ermöglicht die Generation von Leads aus marketing Kmpagnen .\n"
+"                Kampagnen können auf Bass jeder Resource erstellt werden..\n"
+"                Die installiert das Modul marketing_campaign."
 
 #. module: marketing
 #: help:marketing.config.settings,module_crm_profiling:0
@@ -100,11 +106,13 @@ msgid ""
 "Allows users to perform segmentation within partners.\n"
 "                This installs the module crm_profiling."
 msgstr ""
+"Erlaubt Segmentation von Partnern.\n"
+"                Das installiert das Modul crm_profiling."
 
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
 msgid "Demo data for marketing campaigns"
-msgstr ""
+msgstr "Demo Daten für Marketing Kampagnen"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index e01db5a562b..959d48579d8 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-12 20:23+0000\n"
-"Last-Translator: Leen Sonneveld <leen.sonneveld@opensol.nl>\n"
+"PO-Revision-Date: 2012-12-18 18:15+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -104,6 +104,9 @@ msgid ""
 "Allows users to perform segmentation within partners.\n"
 "                This installs the module crm_profiling."
 msgstr ""
+"Sta gebruikers toe om relaties te segementeren.\n"
+"                                                Hiermee wordt module "
+"crm_profile geïnstalleerd."
 
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index f98fac1b678..a89aa507984 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-17 11:58+0000\n"
+"PO-Revision-Date: 2012-12-18 14:56+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@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-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -34,7 +34,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:marketing.action_marketing_configuration
 #: view:marketing.config.settings:0
 msgid "Configure Marketing"
-msgstr ""
+msgstr "Configuração"
 
 #. module: marketing
 #: model:ir.ui.menu,name:marketing.menu_marketing_configuration
@@ -74,7 +74,7 @@ msgstr "Definições de campanhas"
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
 msgid "Track customer profile to focus your campaigns"
-msgstr ""
+msgstr "Mantém registo do perfil de utilizador para utilização em campanhas"
 
 #. module: marketing
 #: view:marketing.config.settings:0
@@ -105,7 +105,7 @@ msgstr ""
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
 msgid "Demo data for marketing campaigns"
-msgstr ""
+msgstr "Dados de demonstração para campanhas de marketing"
 
 #~ msgid "title"
 #~ msgstr "título"
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index d8732ad349b..1f674ddca56 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-07 17:00+0000\n"
-"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"PO-Revision-Date: 2012-12-18 17:48+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing
 #: model:ir.model,name:marketing.model_marketing_config_settings
@@ -47,7 +48,7 @@ msgstr "Marketing"
 #. module: marketing
 #: field:marketing.config.settings,module_marketing_campaign:0
 msgid "Marketing campaigns"
-msgstr "Campanhas de marketing"
+msgstr "Campanhas de Marketing"
 
 #. module: marketing
 #: view:marketing.config.settings:0
@@ -77,7 +78,7 @@ msgstr "Configurações das Campanhas"
 #. module: marketing
 #: field:marketing.config.settings,module_crm_profiling:0
 msgid "Track customer profile to focus your campaigns"
-msgstr ""
+msgstr "Acompanhar o perfil de cliente para focar suas campanhas"
 
 #. module: marketing
 #: view:marketing.config.settings:0
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index b9913e0a6ae..eb3dd4dfb74 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-08 09:32+0000\n"
+"PO-Revision-Date: 2012-12-18 08:09+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -75,7 +75,7 @@ msgstr "Auslöser"
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Follow-Up"
-msgstr ""
+msgstr "Mahnung"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -158,11 +158,12 @@ msgid ""
 "The campaign cannot be started. It does not have any starting activity. "
 "Modify campaign's activities to mark one as the starting point."
 msgstr ""
+"Die Kampagne kann nicht gestartet werden, weil sie keine Start Aktivität hat."
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
 msgid "The email to send when this activity is activated"
-msgstr ""
+msgstr "Diese E-Mail wird bei Aktivierung der Aktivität beversandt."
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -194,7 +195,7 @@ msgstr "Wählen Sie die Ressource auf die sich die Kampagne beziehen soll."
 #. module: marketing_campaign
 #: model:ir.actions.client,name:marketing_campaign.action_client_marketing_menu
 msgid "Open Marketing Menu"
-msgstr ""
+msgstr "Öffne Marketing Menü"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -260,7 +261,7 @@ msgstr "Erstmalige Definition des Segments"
 #. module: marketing_campaign
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Ungültig"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -277,7 +278,7 @@ msgstr "Kampagne"
 #. module: marketing_campaign
 #: model:email.template,body_html:marketing_campaign.email_template_1
 msgid "Hello, you will receive your welcome pack via email shortly."
-msgstr ""
+msgstr "Hallo, Sie werden das Willkommenspaket in Kürze per EMail erhalten"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -292,7 +293,7 @@ msgstr "Kundensegment"
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "You cannot duplicate a campaign, Not supported yet."
-msgstr ""
+msgstr "Duplizieren einer Kampagne ist derzeit nicht möglich"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -357,7 +358,7 @@ msgstr "Das Intervall sollte positiv oder mindestens Null sein."
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "Email"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
@@ -649,7 +650,7 @@ msgstr "Entwurf"
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activity"
-msgstr ""
+msgstr "Marketing Kampagne Aktivität"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -666,7 +667,7 @@ msgstr "Vorschau"
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -894,7 +895,7 @@ msgstr "Kampagne Überleitung"
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Marketing Campaign Segment"
-msgstr ""
+msgstr "Marketing Kampagne Segment"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
@@ -1085,6 +1086,7 @@ msgstr ""
 #, python-format
 msgid "The campaign cannot be started. There are no activities in it."
 msgstr ""
+"Die Kampagne kann nicht gestartet werden, da es keine Aktivitäten gibt"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
@@ -1120,7 +1122,7 @@ msgstr "Variable Kosten"
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_1
 msgid "Welcome to the OpenERP Partner Channel!"
-msgstr ""
+msgstr "Willkommen beim OpenERP Partner Channel!"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 28255597cc8..08121a9cfe2 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 00:01+0000\n"
+"PO-Revision-Date: 2012-12-18 21:34+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \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-16 04:46+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -27,7 +27,7 @@ msgid ""
 "                    * Repair quotation report\n"
 "                    * Notes for the technician and for the final customer.\n"
 "                This installs the module mrp_repair."
-msgstr ""
+msgstr "Upravljanje popravil izdelkov(garancija)."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -42,12 +42,12 @@ msgstr "Lokacija za iskanje komponent"
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "Zasedenost delovnih enot"
+msgstr "Zasedenost delovnih faz"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
-msgstr ""
+msgstr "Zaporedje delovnih faz"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -79,7 +79,7 @@ msgstr "Odpis izdelkov"
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Mrp Workcenter"
-msgstr ""
+msgstr "Delovna faza"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -95,7 +95,7 @@ msgstr "Išči po kosovnici"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Za"
 
 #. module: mrp
 #: help:mrp.bom,message_unread:0
@@ -233,7 +233,7 @@ msgstr "Informacije o kapacitetah"
 #. module: mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr "Delovne enote"
+msgstr "Delovne faze"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_routing_action
@@ -371,7 +371,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr "Izdelek Delovne enote"
+msgstr "Izdelek Delovne faze"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -998,7 +998,7 @@ msgstr "Možno dati v zalogo"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Work Center name"
-msgstr "Ime delovne eote"
+msgstr "Ime delovne faze"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1132,7 +1132,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr "Cena delovne enote na uro"
+msgstr "Cena delovne faze na uro"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1269,7 +1269,7 @@ msgstr ""
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr "Zasedenost delovnega centra"
+msgstr "Zasedenost delovne faze"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1594,7 +1594,7 @@ msgstr ""
 #: view:mrp.workcenter:0
 #: field:report.workcenter.load,workcenter_id:0
 msgid "Work Center"
-msgstr ""
+msgstr "Delovna faza"
 
 #. module: mrp
 #: field:mrp.workcenter,capacity_per_cycle:0
diff --git a/addons/mrp_byproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po
index 5e2e8d7c341..2ed98377c81 100644
--- a/addons/mrp_byproduct/i18n/pt.po
+++ b/addons/mrp_byproduct/i18n/pt.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-11 15:56+0000\n"
+"PO-Revision-Date: 2012-12-18 14:59+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -36,7 +36,7 @@ msgstr "Artigo"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidade de medida do produto"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -46,13 +46,13 @@ msgstr "Ordem de produção"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Mudar a quantidade de produtos"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
 #: field:mrp.bom,sub_products:0
 msgid "Byproducts"
-msgstr ""
+msgstr "Subprodutos"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -101,4 +101,4 @@ msgstr ""
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
 msgid "Byproduct"
-msgstr ""
+msgstr "Subproduto"
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index d717197582d..1fd6a9932c2 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-12-12 14:29+0000\n"
+"PO-Revision-Date: 2012-12-18 14:37+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-13 04:44+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -45,7 +45,7 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
-"Estimado señor/señora,\n"
+"Estimado/a señor/señora,\n"
 "\n"
 "Nuestros registros indican que algunos pagos en nuestra cuenta están aún "
 "pendientes. Puede encontrar los detalles a continuación.\n"
diff --git a/addons/note/i18n/pt.po b/addons/note/i18n/pt.po
index ea2ed3bb930..0e255e8c555 100644
--- a/addons/note/i18n/pt.po
+++ b/addons/note/i18n/pt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-11 17:25+0000\n"
+"PO-Revision-Date: 2012-12-18 15:02+0000\n"
 "Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -98,7 +98,7 @@ msgstr "Utilizadores"
 #. module: note
 #: view:note.note:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: note
 #: view:note.stage:0
@@ -160,7 +160,7 @@ msgstr "Categorias"
 #: field:note.note,message_comment_ids:0
 #: help:note.note,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
 
 #. module: note
 #: field:note.tag,name:0
@@ -231,7 +231,7 @@ msgstr "Apagar"
 #. module: note
 #: field:note.note,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de cores"
 
 #. module: note
 #: field:note.note,sequence:0
@@ -280,7 +280,7 @@ msgstr ""
 #. module: note
 #: field:note.note,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Data de realização"
 
 #. module: note
 #: field:note.stage,fold:0
diff --git a/addons/note/i18n/ro.po b/addons/note/i18n/ro.po
index 2f6b6061a01..cf3e7a81884 100644
--- a/addons/note/i18n/ro.po
+++ b/addons/note/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-10 07:38+0000\n"
+"PO-Revision-Date: 2012-12-18 14:27+0000\n"
 "Last-Translator: Fekete Mihai <mihai@erpsystems.ro>\n"
 "Language-Team: Romanian <ro@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-11 04:49+0000\n"
-"X-Generator: Launchpad (build 16356)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -88,12 +88,12 @@ msgstr ""
 #: model:note.stage,name:note.demo_note_stage_01
 #: model:note.stage,name:note.note_stage_01
 msgid "Today"
-msgstr ""
+msgstr "Astazi"
 
 #. module: note
 #: model:ir.model,name:note.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #. module: note
 #: view:note.note:0
@@ -103,17 +103,17 @@ msgstr ""
 #. module: note
 #: view:note.stage:0
 msgid "Stage of Notes"
-msgstr ""
+msgstr "Etapa Note"
 
 #. module: note
 #: field:note.note,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mesaje necitite"
 
 #. module: note
 #: field:note.note,current_partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "necunoscut"
 
 #. module: note
 #: view:note.note:0
@@ -123,54 +123,54 @@ msgstr ""
 #. module: note
 #: help:note.note,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Dacă este bifat, mesajele noi necesita atentia dumneavoastra."
 
 #. module: note
 #: field:note.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Numele Etapei"
 
 #. module: note
 #: field:note.note,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Este un adept"
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_02
 msgid "Tomorrow"
-msgstr ""
+msgstr "Maine"
 
 #. module: note
 #: view:note.note:0
 #: field:note.note,open:0
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #. module: note
 #: help:note.stage,user_id:0
 msgid "Owner of the note stage."
-msgstr ""
+msgstr "Proprietarul etapei notei"
 
 #. module: note
 #: model:ir.ui.menu,name:note.menu_notes_stage
 msgid "Categories"
-msgstr ""
+msgstr "Categorii"
 
 #. module: note
 #: field:note.note,message_comment_ids:0
 #: help:note.note,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentarii si e-mailuri"
 
 #. module: note
 #: field:note.tag,name:0
 msgid "Tag Name"
-msgstr ""
+msgstr "Nume eticheta"
 
 #. module: note
 #: field:note.note,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mesaje"
 
 #. module: note
 #: view:base.config.settings:0
@@ -179,80 +179,80 @@ msgstr ""
 #: view:note.note:0
 #: model:note.stage,name:note.note_stage_04
 msgid "Notes"
-msgstr ""
+msgstr "Note"
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_03
 #: model:note.stage,name:note.note_stage_03
 msgid "Later"
-msgstr ""
+msgstr "Mai tarziu"
 
 #. module: note
 #: model:ir.model,name:note.model_note_stage
 msgid "Note Stage"
-msgstr ""
+msgstr "Nota Etapa"
 
 #. module: note
 #: field:note.note,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezumat"
 
 #. module: note
 #: help:note.stage,sequence:0
 msgid "Used to order the note stages"
-msgstr ""
+msgstr "Utilizată pentru a comanda etapele notei"
 
 #. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
-msgstr ""
+msgstr "Utilizatori pe Etape"
 
 #. module: note
 #: field:note.note,name:0
 msgid "Note Summary"
-msgstr ""
+msgstr "Rezumat Nota"
 
 #. module: note
 #: model:ir.actions.act_window,name:note.action_note_stage
 #: view:note.note:0
 msgid "Stages"
-msgstr ""
+msgstr "Etape"
 
 #. module: note
 #: help:note.note,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Mesaje și istoric comunicare"
 
 #. module: note
 #: view:note.note:0
 msgid "Delete"
-msgstr ""
+msgstr "Sterge"
 
 #. module: note
 #: field:note.note,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Index culori"
 
 #. module: note
 #: field:note.note,sequence:0
 #: field:note.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secventa"
 
 #. module: note
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Etichete"
 
 #. module: note
 #: view:note.note:0
 msgid "Archive"
-msgstr ""
+msgstr "Arhiva"
 
 #. module: note
 #: field:base.config.settings,module_note_pad:0
 msgid "Use collaborative pads (etherpad)"
-msgstr ""
+msgstr "Utilizati placute de colaborare (etherpad)"
 
 #. module: note
 #: help:note.note,message_summary:0
@@ -260,29 +260,31 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Sustine rezumat Chatter (numar de mesaje, ...). Acest rezumat este direct in "
+"format HTML, in scopul de a se introduce in vizualizari Kanban."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
 msgid "Use fancy layouts for notes"
-msgstr ""
+msgstr "Utilizati machete \"fancy\" pentru note"
 
 #. module: note
 #: field:note.stage,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Deținător"
 
 #. module: note
 #: view:note.note:0
 #: field:note.note,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapa"
 
 #. module: note
 #: field:note.note,date_done:0
 msgid "Date done"
-msgstr ""
+msgstr "Data executiei"
 
 #. module: note
 #: field:note.stage,fold:0
 msgid "Folded by Default"
-msgstr ""
+msgstr "Implicit Pliat"
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
index 9f357f59a5c..11f067a30ef 100644
--- a/addons/pad/i18n/pt.po
+++ b/addons/pad/i18n/pt.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2010-12-09 11:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 15:01+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: Portuguese <pt@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-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:27
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "&Ntilde;"
 
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: help:res.company,pad_key:0
diff --git a/addons/pad_project/i18n/de.po b/addons/pad_project/i18n/de.po
index 90ef9f0b24b..63413f29b94 100644
--- a/addons/pad_project/i18n/de.po
+++ b/addons/pad_project/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-09 15:37+0000\n"
+"PO-Revision-Date: 2012-12-18 08:02+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
@@ -25,7 +25,7 @@ msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "Beschreibung des PAD"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index 2181c74d3e2..3c962a9b11e 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.po
@@ -9,29 +9,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-09 15:38+0000\n"
+"PO-Revision-Date: 2012-12-18 08:04+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Thunderbird neu starten"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird Plug-In installation:"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Herunterladen und Installieren des Plug-Ins"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -45,6 +45,7 @@ msgstr "Installiere Thunderbird Plug-In"
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
 msgstr ""
+"Thunderbird Plug-In Datei. Bitte sichern und in Thunderbird installieren."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -64,7 +65,7 @@ msgstr "Dateiname"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Klick \"Jetzt Installieren\""
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -80,7 +81,7 @@ msgstr "Thunderbird Plug-in"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "Konfiguration Ihrese OpenERP Servers"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -94,17 +95,17 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Thunderbird Plug-In sichern"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Plug-In auswählen (Dateiname ist  openerp_plugin.xpi)"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -112,11 +113,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"Vom Thunderbird Menü: Werkzeuge ­> Add-Ons -> Bearbeiten Ikon -> Installiere "
+"Add-On von Datei"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Vom Thunderbird Menü: OpenERP -> Konfiguration"
 
 #~ msgid "Description"
 #~ msgstr "Beschreibung"
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 206a7145a4c..95b52228065 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2012-12-18 15:41+0000\n"
+"Last-Translator: Ana Juaristi Olalde <ajuaristio@gmail.com>\n"
 "Language-Team: \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-04 05:15+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -51,7 +51,7 @@ msgstr "Imprimir ticket de la venta"
 #. module: point_of_sale
 #: field:pos.session,cash_register_balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Balance calculado"
 
 #. module: point_of_sale
 #: view:pos.session:0
@@ -85,7 +85,7 @@ msgstr ""
 #: field:pos.config,journal_id:0
 #: field:pos.order,sale_journal:0
 msgid "Sale Journal"
-msgstr ""
+msgstr "Diario de ventas"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -102,7 +102,7 @@ msgstr "Detalles de ventas"
 #. module: point_of_sale
 #: constraint:pos.config:0
 msgid "You cannot have two cash controls in one Point Of Sale !"
-msgstr ""
+msgstr "No puede tener dos controles de caja en un Punto de Venta !"
 
 #. module: point_of_sale
 #: field:pos.payment.report.user,user_id:0
@@ -111,7 +111,7 @@ msgstr ""
 #: view:report.pos.order:0
 #: field:report.pos.order,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Comercial"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index 93b6c7d4445..a9c75f2880b 100644
--- a/addons/portal/i18n/it.po
+++ b/addons/portal/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-15 23:23+0000\n"
+"PO-Revision-Date: 2012-12-18 23:39+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-17 04:47+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -450,7 +450,7 @@ msgstr "Annulla"
 #. module: portal
 #: view:portal.wizard:0
 msgid "Apply"
-msgstr "Conferma"
+msgstr "Salva"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
diff --git a/addons/portal_claim/i18n/pt.po b/addons/portal_claim/i18n/pt.po
new file mode 100644
index 00000000000..2f4a4393911
--- /dev/null
+++ b/addons/portal_claim/i18n/pt.po
@@ -0,0 +1,36 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-18 15:00+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"Language-Team: Portuguese <pt@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-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Reclamações"
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 33c60ddaa7a..2b7ed6e09cb 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 10:30+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"PO-Revision-Date: 2012-12-18 22:53+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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-16 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -55,7 +55,7 @@ msgstr "Attività di Progetto"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr "Nome Stadio"
+msgstr "Nome Fase"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index a22da21dec1..4b2d46ccae2 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-09 18:51+0000\n"
+"PO-Revision-Date: 2012-12-18 18:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \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-10 04:36+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project
 #: view:project.project:0
@@ -386,7 +386,7 @@ msgid ""
 "If you use the timesheet linked to projects (project_timesheet module), "
 "don't forget to setup the right unit of measure in your employees."
 msgstr ""
-"Hiermee wordt de gebruikte meeteenheid ingesteld die wordt gebruikt in "
+"Hiermee wordt de gebruikte maateenheid ingesteld die wordt gebruikt in "
 "projecten en taken.\n"
 "Wanneer u gebruik maakt van urenstaten gekoppeld aan projecten "
 "(project_timesheet module), vergeet dan niet de juiste eenheid voor uw "
@@ -1690,7 +1690,7 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr "Genereer Tarn van verkooporders"
+msgstr "Genereer taken van verkooporders"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index d099c04387b..a9443a8b153 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-13 20:13+0000\n"
+"PO-Revision-Date: 2012-12-18 06:44+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -81,7 +81,7 @@ msgstr "Heute"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Timeframe"
-msgstr ""
+msgstr "Zeitfenster"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
@@ -194,7 +194,7 @@ msgstr "project.gtd.timebox"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler!"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -224,7 +224,7 @@ msgstr "Aufgabenauswahl"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Display"
-msgstr ""
+msgstr "Anzeige"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
@@ -298,7 +298,7 @@ msgstr "Um Aufgaben wieder zu öffnen"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #~ msgid "Visible Columns"
 #~ msgstr "Sichtbare Spalten"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index b5421cc65e3..b91bb5d871f 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:01+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 08:02+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -82,12 +82,12 @@ msgstr "geplante Phasen"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Aktion"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -119,7 +119,7 @@ msgstr "Neu"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Zeiteineit"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -146,7 +146,7 @@ msgstr "Fortschritts Phasen"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (Kopie)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
@@ -158,7 +158,7 @@ msgstr "Bitte wählen Si eine Projekt für die  Planung"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -180,13 +180,15 @@ msgstr "Frühestes Startdatum"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Masseinheit für die Dauer"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
 msgstr ""
+"Der Resourcenbedarf für dieses Projekt kann automatisch durch den Scheduler "
+"ermittelt werden."
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -197,6 +199,7 @@ msgstr "Reihenfolge"
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
+"Aktivieren Sie dieses Feld, um die Phasen basierte Planung zu verwenden"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -212,6 +215,11 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Phasen \n"
+" Nach Erzeugung:  'Entwurf'.\n"
+" Nach dem Start: 'Verarbeitung'.\n"
+" Überprüfung notwendig 'Schwebend'.                                  \n"
+" Fertig 'Erledigt'."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -318,7 +326,7 @@ msgstr "Aufgabendetails"
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "Offene Phasen"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -416,7 +424,7 @@ msgstr "Erzeugt die Reihenfolge bei Anzeige der Phasen."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Aufgaben"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -461,7 +469,7 @@ msgstr "Monat"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytisches Konto"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 34bff4f69e4..4df0a792155 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-05-10 18:25+0000\n"
-"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2012-12-18 22:27+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -50,7 +49,7 @@ msgstr "Prossime fasi"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Assegnazione Fase Utente"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -64,6 +63,9 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Per pianificare fasi di tutti o di un specifico progetto. Aprirà una vista "
+"gantt.\n"
+"               "
 
 #. module: project_long_term
 #: field:project.phase,task_ids:0
@@ -75,18 +77,18 @@ msgstr "Attività del Progetto"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Pianificazione Fasi"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stato"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Azione"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -118,7 +120,7 @@ msgstr "Nuovo"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Unità di Misura Durata"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -134,7 +136,7 @@ msgstr "In sospeso"
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calcolo basato sulle attività collegate"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -145,19 +147,19 @@ msgstr "Fasi di avanzamento"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (copia)"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Si prega di specificare un progetto da pianificare."
 
 #. module: project_long_term
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -179,13 +181,15 @@ msgstr "Data inizio minima"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "Unità di Misura (Unita di Misura) è l'unità di misura della Durata"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
 msgstr ""
+"Le risorse sul progetto possono essere calcolate automaticamente dal "
+"pianificatore."
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -196,6 +200,8 @@ msgstr "Sequenza"
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
 msgstr ""
+"Selezionare questo campo se si prevede di usare una pianificare basata sulle "
+"fasi"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -211,6 +217,11 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"Se la fase è creata lo stato è 'Bozza'.\n"
+" Se la fase è avviata, lo stato diventa 'In Corso'.\n"
+" Se è necessario revisionarla la fase è in stato 'Sospeso'.                  "
+"                \n"
+" Se la fase è conclusa, lo stato è impostato a 'Fatto'."
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -247,7 +258,7 @@ msgstr "Tempo di lavoro"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr ""
+msgstr "Fasi in Sospeso"
 
 #. module: project_long_term
 #: code:addons/project_long_term/project_long_term.py:126
@@ -286,6 +297,12 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Un progetto può essere suddiviso in diverse fasi. Per ogni fase, è possibile "
+"definire la collocazione degli utenti, descrivere diversi attività e "
+"collegare le fasi alle precedenti o a quelle successive, aggiungere vincoli "
+"di date per le pianificazioni automatiche. Usare la pianificazione a lunga "
+"durata per pianificare gli utenti disponibili, convertire le fasi in una "
+"serie di attività quando si inizia a lavorare sul progetto."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
@@ -311,7 +328,7 @@ msgstr "Dettagli Attività"
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "Fasi Aperte"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -409,7 +426,7 @@ msgstr "Fornisce l'ordinamento quando viene visualizzata la lista di fasi."
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Attività"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_end:0
@@ -454,7 +471,7 @@ msgstr "Mese"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conto analitico"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -464,7 +481,7 @@ msgstr "Scadenza"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Assegnazione Utenti al Progetto"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
@@ -482,12 +499,12 @@ msgstr "Completato"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calcola Tutti i Miei Progetti"
 
 #. module: project_long_term
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Forza gli Utenti Assegnati"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -511,7 +528,7 @@ msgstr "Nome"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Pianificazione degli Utenti"
 
 #~ msgid "Displaying settings"
 #~ msgstr "Visualizza impostazioni"
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index ebd02f917ac..2084fe15cb4 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-13 18:38+0000\n"
+"PO-Revision-Date: 2012-12-18 06:32+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -32,7 +32,7 @@ msgstr "Für die Produktart Dienstleistungen, wird eine Aufgabe generiert."
 #: code:addons/project_mrp/project_procurement.py:93
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "Aufgabe angelegt"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -77,7 +77,7 @@ msgstr "Aufgabe"
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "Wenn Sie diese Dienstleistung verkaufen,"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -98,7 +98,7 @@ msgstr "Verkaufsauftragsposition"
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "Ungültig"
 
 #. module: project_mrp
 #: view:product.product:0
@@ -109,12 +109,15 @@ msgid ""
 "                        in the project related to the contract of the sale "
 "order."
 msgstr ""
+"wird angelegt um Ihre Aufgaben zu verfolgen. Diese Aufgabe wird beim Projekt "
+"aufscheinen, \n"
+"das zu dem Kontrakt des Verkaufsauftrages gehört."
 
 #. module: project_mrp
 #: code:addons/project_mrp/project_procurement.py:87
 #, python-format
 msgid "Task created."
-msgstr ""
+msgstr "Aufgabe angelegt"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
@@ -141,7 +144,7 @@ msgstr "Verkaufsauftrag"
 #. module: project_mrp
 #: view:project.task:0
 msgid "Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
@@ -153,7 +156,7 @@ msgstr ""
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
-msgstr ""
+msgstr "eine Aufgabe"
 
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr ""
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index e55d7e9467b..1979a97129c 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-17 06:31+0000\n"
-"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2012-12-18 22:36+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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-04 05:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -31,7 +30,7 @@ msgstr "Il prodotto è di tipo servizio, quindi crea l'attività."
 #: code:addons/project_mrp/project_procurement.py:93
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "Attività creata"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -41,7 +40,7 @@ msgstr "Un'attività viene creata per fornire il servizio."
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Riga Ordine di vendita"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
@@ -74,7 +73,7 @@ msgstr "Attività"
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "Quando si vende questo servizio ad un cliente,"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -90,12 +89,12 @@ msgstr "Approvvigionamento"
 #. module: project_mrp
 #: field:procurement.order,sale_line_id:0
 msgid "Sale order line"
-msgstr ""
+msgstr "Riga ordine di vendita"
 
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: project_mrp
 #: view:product.product:0
@@ -106,12 +105,17 @@ msgid ""
 "                        in the project related to the contract of the sale "
 "order."
 msgstr ""
+"sarà \n"
+"                        creato per seguire il compito da svolgere. Questa "
+"attività apparirà\n"
+"                        nel progetto relativo al contratto dell'ordine di "
+"vendita."
 
 #. module: project_mrp
 #: code:addons/project_mrp/project_procurement.py:87
 #, python-format
 msgid "Task created."
-msgstr ""
+msgstr "Attività creata."
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
@@ -138,7 +142,7 @@ msgstr "Ordini di vendita"
 #. module: project_mrp
 #: view:project.task:0
 msgid "Order Line"
-msgstr ""
+msgstr "Riga Ordine"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
@@ -148,7 +152,7 @@ msgstr "Nel caso si vendano servizi tramite ordine di vendita"
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
-msgstr ""
+msgstr "un'attività"
 
 #~ msgid "Error ! You cannot create recursive tasks."
 #~ msgstr "Errore ! Non è possibile creare attività ricorsive."
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index d5afad04f21..f4ca0cd56a7 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-02-08 11:45+0000\n"
+"PO-Revision-Date: 2012-12-18 06:27+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -43,6 +43,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Sie können einen Partner der zu einem Projekt zugeordnet ist nicht löschen, "
+"sondern nur deaktivieren"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -55,6 +57,7 @@ msgstr "Projekt Arbeitszeit"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Sie können kein Analysekonto auswählen, das geschlossen und storniert ist."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -76,7 +79,7 @@ msgstr "Oktober"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Stundenzettel"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -94,11 +97,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klick um einen Kunden-Kontrakt anzulegen.\n"
+"              </p><p>\n"
+"                Sie finden hier die Kunden-Kontrakte\n"
+"                die zu verrechnen sind.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Analyse Konto / Projekt"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -118,6 +128,9 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"Bitte definieren Sie Produkt und Produkt Kategory beim entsprechenden "
+"Mitarbeiter.\n"
+"Füllen Sie den HR Reiter im Mitarbeiter Formular aus."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -151,6 +164,8 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Bitte definieren Sie das Journal beim entsprechenden Mitarbeiter\n"
+"Füllen Sie den Zeiterfassung Reiter im Mitarbeiter Formular aus."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -170,7 +185,7 @@ msgstr "Zu erneuernde Verträge"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Stunden"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -231,6 +246,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Sie finden hier Stundenaufzichnungen und Aufwände die n "
+"Kunden weiterzuverrechnen sind.\n"
+"                Wenn Sie neue Stundenaufzeichnungen erfassen wollen, "
+"benutzen Sie bitte die Stundenaufzeichnungsformulare.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -291,7 +313,7 @@ msgstr "Erfasse Zeit für Aufgabenerledigung"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "Bitte legen  Sie einen Mitarbeiter für den Benutzer \"%s\" an."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -331,6 +353,9 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Bitte definieren Sie Produkt und Produkt Kategorie beim entsprechenden "
+"Mitarbeiter.\n"
+"Füllen Sie den Zeiterfassungs Reiter im Mitarbeiter Formular aus."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:60
@@ -339,6 +364,8 @@ msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
 msgstr ""
+"<p>Stundenaufschreibungen für dieses Projekt werden ggf an  %s verrechnet, "
+"wie im Kontrkt definiert.</p>"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -371,7 +398,7 @@ msgstr "Nach Abschluss der Aufgabe, stellen Sie diese in Rechnung."
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ungültige Aktion!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -386,6 +413,8 @@ msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Erfassen Sie Ire Stundenaufzeichung "
+"für das Projekt '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index 180ff4fa013..171e86fcec4 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-13 15:09+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 22:48+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -24,7 +24,7 @@ msgstr "Attività per utente"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Raggrupa per anno delle date"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -43,6 +43,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Non è possibile eliminare un partner assegnato ad un progetto, ma è "
+"possibile deselezionare la casella attiva."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -55,6 +57,7 @@ msgstr "Lavoro attività progetto"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Non è possibile selezionare un Conto Analitico in stato Chiuso o Annullato."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -64,7 +67,7 @@ msgstr "Raggruppa per..."
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Attiva la fatturazione dalle linee dell'ordine di vendita"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -76,12 +79,12 @@ msgstr "Ottobre"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Orari di Lavoro"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Fatturabile"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -98,7 +101,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Conto Analitico/Progetto"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -108,7 +111,7 @@ msgstr "Conto analitico / Progetto"
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Progetti dei Clienti"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:89
@@ -118,11 +121,14 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"Si prega di definire il prodotto e il conto categoria prodotto nel "
+"dipendente collegato.\n"
+"Compilare nella scheda Impostazioni Risorse Umane nel form dipendene."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Riga contabilità analitica"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -151,6 +157,8 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Si prega di definire il sezionale del dipendente collegato.\n"
+"Compilarlo nella scheda orari di lavoro nel form del dipendente."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -160,22 +168,22 @@ msgstr "Entrate/Uscite per Progetto"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Progetto Fatturabile"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Contratti da Rinnovare"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Ore"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Raggruppa per mese"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -186,7 +194,7 @@ msgstr "Attività"
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Fattura Ore sulle Attività"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -246,6 +254,7 @@ msgstr "Codifica attività"
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
 msgstr ""
+"Il resoconto delle attività è inserito nella linea dell'orario di lavoro"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 709ffe86666..6a3359707e7 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-16 19:18+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 06:16+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \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-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -24,7 +24,7 @@ msgstr "Kostenrechnung für Einkäufe"
 #. module: purchase
 #: model:ir.model,name:purchase.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: purchase
 #: view:board.board:0
@@ -265,7 +265,7 @@ msgstr "Um eine Bestellung zu löschen, muss sie zunächst storniert werden."
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "Bei Verkauf dieses Produkts wird folgendes ausgelöst"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1385,7 +1385,7 @@ msgstr "Durch Buchhaltung zu prüfen"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
@@ -1981,7 +1981,7 @@ msgstr ""
 #. module: purchase
 #: model:email.template,report_name:purchase.email_template_edi_purchase
 msgid "RFQ_${(object.name or '').replace('/','_')}"
-msgstr ""
+msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:988
@@ -1998,7 +1998,7 @@ msgstr "Erzeuge Rechnung"
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Reservierung Auslieferungsziel"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 7b29ecf0fa0..eb860f07acb 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 15:16+0000\n"
+"PO-Revision-Date: 2012-12-18 17:43+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \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-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -554,7 +554,7 @@ msgstr "Puede ser comprado"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 msgid "Incoming  Products"
-msgstr "Productos entrantes"
+msgstr "Productos a recibir"
 
 #. module: purchase
 #: view:purchase.config.settings:0
@@ -3325,9 +3325,6 @@ msgstr "Pedidos"
 #~ "o puede importar sus empresas existentes usando una hoja de cálculo CSV "
 #~ "desde el asistente \"Importar datos\"."
 
-#~ msgid "Is a Back Order"
-#~ msgstr "Es un pedido pendiente"
-
 #, python-format
 #~ msgid "Selected UOM does not belong to the same category as the product UOM"
 #~ msgstr ""
@@ -3455,8 +3452,11 @@ msgstr "Pedidos"
 #~ "en recepciones\", puede seguir aquí todas las recepciones de productos y "
 #~ "crear facturas para esas recepciones."
 
-#~ msgid "Back Orders"
-#~ msgstr "Pedidos pendientes"
-
 #~ msgid "Error ! You cannot create recursive associated members."
 #~ msgstr "¡Error! No puede crear miembros asociados recursivamente."
+
+#~ msgid "Back Orders"
+#~ msgstr "Pedidos en espera"
+
+#~ msgid "Is a Back Order"
+#~ msgstr "Es un pedido en espera"
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 9f408f0dfd2..8ee00511eb2 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-16 12:50+0000\n"
-"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"PO-Revision-Date: 2012-12-18 22:37+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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-17 04:45+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -2454,7 +2454,7 @@ msgstr ""
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr "Quando si vendite questo servizio ad un cliente,"
+msgstr "Quando si vende questo servizio ad un cliente,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index d25828958ab..d50e5e1d2d7 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-02-08 11:49+0000\n"
+"PO-Revision-Date: 2012-12-18 06:28+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -77,6 +77,7 @@ msgstr "Unternehmen"
 #, python-format
 msgid "Please set a header in company settings."
 msgstr ""
+"Bitte definieren Sie den Report Kopf in der Unternehemens Konfiguration"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -128,7 +129,7 @@ msgstr "B6  20  125 x 176 mm"
 #: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "Webkit error"
-msgstr ""
+msgstr "WebKit Fehler"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -143,7 +144,7 @@ msgstr "B2  17  500 x 707 mm"
 #: code:addons/report_webkit/webkit_report.py:307
 #, python-format
 msgid "Webkit render!"
-msgstr ""
+msgstr "WebKit Anzeige!"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
@@ -164,6 +165,11 @@ msgid ""
 "http://code.google.com/p/wkhtmltopdf/downloads/list and set the path in the "
 "ir.config_parameter with the webkit_path key.Minimal version is 0.9.9"
 msgstr ""
+"Bitte installieren Sie die ausführbare Datei (sudo apt-get install "
+"wkhtmltopdf) oder laden Sie diese hier herunter: "
+"http://code.google.com/p/wkhtmltopdf/downloads/list \r\n"
+"und setzten Sie den Pfad in  ir.config_parameter mid dem  webkit_path "
+"Schlssel.Minimal Version ist 0.9.9"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -215,7 +221,7 @@ msgstr "Der Kopftext für diesen Report"
 #: code:addons/report_webkit/webkit_report.py:95
 #, python-format
 msgid "Wkhtmltopdf library path is not set"
-msgstr ""
+msgstr "Wkhtmltopdf library Pfad ist nicht definiert"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -296,7 +302,7 @@ msgstr "Bild"
 #. module: report_webkit
 #: view:ir.header_img:0
 msgid "Header Image"
-msgstr ""
+msgstr "Report Kopf Bild"
 
 #. module: report_webkit
 #: field:res.company,header_webkit:0
@@ -325,7 +331,7 @@ msgstr "Hochformat"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,orientation:0
@@ -341,7 +347,7 @@ msgstr "B8  22  62 x 88 mm"
 #: code:addons/report_webkit/webkit_report.py:178
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
-msgstr ""
+msgstr "Der Befehl 'wkhtmltopdf' scheiterte mit dem Code = %s. Meldung: %s"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -387,7 +393,7 @@ msgstr "Rechter Rand (mm)"
 #: code:addons/report_webkit/webkit_report.py:229
 #, python-format
 msgid "Webkit report template not found!"
-msgstr ""
+msgstr "Webkit Report Vorlage nicht gefunden!"
 
 #. module: report_webkit
 #: field:ir.header_webkit,orientation:0
@@ -423,7 +429,7 @@ msgstr "B10    16  31 x 44 mm"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "Cancel"
-msgstr ""
+msgstr "Abrechen"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
@@ -445,7 +451,7 @@ msgstr "Webkit Logos"
 #: code:addons/report_webkit/webkit_report.py:173
 #, python-format
 msgid "No diagnosis message was provided"
-msgstr ""
+msgstr "Es gibt keine Diagnose Meldung."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -534,12 +540,12 @@ msgstr "ir.actions.report.xml"
 #: code:addons/report_webkit/webkit_report.py:175
 #, python-format
 msgid "The following diagnosis message was provided:\n"
-msgstr ""
+msgstr "Die folgende Diagnose Meldung wurde erzeugt.\n"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "HTML Header"
-msgstr ""
+msgstr "HTML Kopf"
 
 #~ msgid "WebKit Header"
 #~ msgstr "Webkit Vorlage"
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index a1947fba5ee..6e0122a670a 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 18:38+0000\n"
+"PO-Revision-Date: 2012-12-18 18:24+0000\n"
 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: \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-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -100,6 +100,13 @@ msgid ""
 "The 'Waiting Schedule' status is set when the invoice is confirmed           "
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
+"Indica el estado del presupuesto o del pedido de venta.\n"
+"El estado de excepción se establece automáticamente cuando ocurre una "
+"operación de cancelación en la validación de la factura (excepción de "
+"factura) o en el proceso de albaranado (excepción de envío).\n"
+"El estado 'Esperando fecha planificada' se establece cuando la factura está "
+"confirmada, pero se espera a que el planificador se ejecute en la fecha de "
+"pedido establecida."
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -197,6 +204,11 @@ msgid ""
 "user-wise as well as month wise.\n"
 "                This installs the module account_analytic_analysis."
 msgstr ""
+"Para modificar la vista de contabilidad analítica para mostrar datos "
+"importantes para el gestor de proyecto de compañías de servicios.\n"
+"Puede también ver el informe de resumen de contabilidad analítica por "
+"usuario y por mes.\n"
+"Esto instala el módulo 'account_analytica_analysis'."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -296,6 +308,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"Ésta es una lista de cada línea de pedido de venta a ser facturada. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido de venta. No "
+"necesita esta lista si factura desde las órdenes de entrega o si factura las "
+"ventas totalmente.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order:0
@@ -481,6 +500,8 @@ msgid ""
 "There is no Fiscal Position defined or Income category account defined for "
 "default properties of Product categories."
 msgstr ""
+"No hay posición fiscal definida o categoría de cuenta de ingresos definida "
+"para las propiedades por defecto de las categorías de producto."
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
@@ -711,12 +732,22 @@ msgid ""
 "             \n"
 "* The 'Cancelled' status is set when a user cancel the sales order related."
 msgstr ""
+"* El estado 'Borrador' se establece cuando el pedido de venta relacionado "
+"está como borrador.\n"
+"* El estado 'Confirmado' se establece cuando el pedido de venta relacionado "
+"se confirma.\n"
+"* El estado de excepción se establece cuando el pedido de venta relacionado "
+"está en uno de los estados de excepción.\n"
+"* El estado 'Realizado' cuando todas las líneas de pedido de venta han sido "
+"albaranadas.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta asociado."
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "No hay cuenta de ingresos definida como propiedad global."
 
 #. module: sale
 #: code:addons/sale/sale.py:984
@@ -729,7 +760,7 @@ msgstr "¡Error de configuración!"
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Enviar por correo electrónico"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -754,6 +785,8 @@ msgid ""
 "To allow your salesman to make invoices for sale order lines using the menu "
 "'Lines to Invoice'."
 msgstr ""
+"Permitir a su comercial realizar facturas para las líneas de pedido venta "
+"usando el menú 'Líneas a facturar'."
 
 #. module: sale
 #: view:sale.report:0
@@ -764,7 +797,7 @@ msgstr "Empresa"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "Crear y ver factura"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -779,6 +812,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir una nueva tienda.\n"
+"</p><p>\n"
+"Cada presupuesto o pedido de venta debe estar enlazado con una tienda. La "
+"tienda define el almacén desde el que el producto serás entregado para cada "
+"venta en particular.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: report:sale.order:0
@@ -811,7 +852,7 @@ msgstr "Categoría de producto"
 #: code:addons/sale/sale.py:555
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "¡No se puede cancelar este pedido de venta!"
 
 #. module: sale
 #: view:sale.order:0
@@ -824,6 +865,7 @@ msgstr "Volver a Crear factura"
 msgid ""
 "In order to delete a confirmed sale order, you must cancel it before !"
 msgstr ""
+"¡Para eliminar un pedido de venta confirmado, debe cancelarlo primero!"
 
 #. module: sale
 #: report:sale.order:0
@@ -833,7 +875,7 @@ msgstr "Impuestos :"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "Bajo demanda"
 
 #. module: sale
 #: field:sale.order,currency_id:0
@@ -867,6 +909,10 @@ msgid ""
 "                You may have to create it and set it as a default value on "
 "this field."
 msgstr ""
+"Seleccione un producto de tipo servicio que es llamado 'Avance de "
+"producto'.\n"
+"Tal vez tenga que crearlo y establecerlo como valor por defecto en este "
+"campo."
 
 #. module: sale
 #: help:sale.config.settings,module_warning:0
@@ -876,6 +922,11 @@ msgid ""
 "Example: Product: this product is deprecated, do not purchase more than 5.\n"
 "                Supplier: don't forget to ask for an express delivery."
 msgstr ""
+"Permite configurar notificaciones en los productos y lanzarlas cuando un "
+"usuario quiere vender un producto dado o a un cliente determinado.\n"
+"Ejemplo: \n"
+"Producto: Este producto está obsoleto. No vender más de 5.\n"
+"Cliente: No olvidar preguntar por envío urgente."
 
 #. module: sale
 #: code:addons/sale/sale.py:979
@@ -938,6 +989,9 @@ msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"No se puede encontrar una línea de tarifa coincidente con este producto y "
+"cantidad.\n"
+"Tiene que cambiar o bien el producto, la cantidad, o la tarifa."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -960,6 +1014,9 @@ msgid ""
 "Manage Related Stock.\n"
 "                    This installs the module sale_stock."
 msgstr ""
+"Permite realizar un presupuesto o un pedido de venta usando diferentes "
+"políticas de pedido y gestionar el stock relacionado.\n"
+"Esto instala el módulo 'sale_stock'."
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -984,7 +1041,7 @@ msgstr "Número de presupuesto"
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "bajo pedido"
+msgstr "Bajo pedido"
 
 #. module: sale
 #: report:sale.order:0
@@ -1005,28 +1062,29 @@ msgstr "Estado borrador del pedido de venta"
 #: code:addons/sale/sale.py:647
 #, python-format
 msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgstr "Presupuesto para <em>%s</em> <b>crado</b>."
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Mensajes e historial de comunicación"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Nueva copia de presupuesto"
 
 #. module: sale
 #: code:addons/sale/sale.py:1007
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
+"No se puede eliminar una línea de pedido de venta que está en estado '%s'."
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
 msgid "Properties on lines"
-msgstr ""
+msgstr "Propiedades en las líneas"
 
 #. module: sale
 #: code:addons/sale/sale.py:888
@@ -1035,6 +1093,8 @@ msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
 msgstr ""
+"Antes de escoger un producto, seleccione un cliente en el formulario de "
+"ventas."
 
 #. module: sale
 #: view:sale.order:0
@@ -1055,7 +1115,7 @@ msgstr "Confirmar presupuesto"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Pedidos de venta a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -1067,7 +1127,7 @@ msgstr "Agrupar por..."
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "Características de los productos"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1079,7 +1139,7 @@ msgstr "Esperando fecha planificada"
 #: view:sale.order.line:0
 #: field:sale.report,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1089,18 +1149,18 @@ msgstr "Método abastecimiento"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Invoice the whole sale order"
-msgstr ""
+msgstr "Facturar el pedido de venta completo"
 
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensajes sin leer"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr ""
+msgstr "Presupuesto borrador"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1130,6 +1190,12 @@ msgid ""
 "available.\n"
 "                This installs the module analytic_user_function."
 msgstr ""
+"Permite definir cuál es la función por defecto de un usuario específico en "
+"una cuenta dad.\n"
+"Se usa en su mayoría cuando un usuario introduce su parte de horas, para que "
+"los campos sean rellenados automáticamente. Pero la posibilidad de cambiar "
+"estos valores está aún disponible.\n"
+"Esto instala el módulo 'analytic_user_function'."
 
 #. module: sale
 #: help:sale.order,create_date:0
@@ -1148,7 +1214,7 @@ msgstr "Crear facturas"
 #: code:addons/sale/sale.py:1007
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "¡Acción no válida!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1185,7 +1251,7 @@ msgstr "Realizar facturas"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "Nº de pedido de venta"
 
 #. module: sale
 #: view:sale.order:0
@@ -1209,11 +1275,13 @@ msgid ""
 "After clicking 'Show Lines to Invoice', select lines to invoice and create "
 "the invoice from the 'More' dropdown menu."
 msgstr ""
+"Después de hacer clic en 'Mostrar líneas a facturar', seleccione las líneas "
+"a facturar y cree la factura desde el menú desplegable 'Más'."
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sale order has at least one invoice."
-msgstr ""
+msgstr "Indica que el pedido de venta tiene al menos una factura."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1231,16 +1299,17 @@ msgstr "Agrupar las facturas"
 #, python-format
 msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
 msgstr ""
+"Presupuesto para <em>%s</em> <b>convertido</b> a pedido de venta de %s %s."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sale Order"
-msgstr ""
+msgstr "Facturar pedido de venta"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "Gestión de contratos"
 
 #. module: sale
 #: view:sale.report:0
@@ -1406,11 +1475,114 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Aquí tiene su ${object.state in ('draft', 'sent') and 'presupuesto' "
+"or 'confirmación de pedido'} de ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número de pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Total del pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Fecha del pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referencia del pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Su referencia: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Su contacto: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Pedido%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>También es posible pagar directamente con Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Si tiene alguna pregunta, no dude en contactar con nosotros.</p>\n"
+"    <p>Gracias por elegir a ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Teléfono:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Usar tarifas para adaptar los precios a cada cliente"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1424,6 +1596,9 @@ msgid ""
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
 msgstr ""
+"El pedido de venta creará automáticamente una propuesta de factura (factura "
+"borrador). Tiene que escoger si quiere su factura basada en lo pedido o en "
+"lo enviado. "
 
 #. module: sale
 #: code:addons/sale/sale.py:435
@@ -1447,6 +1622,10 @@ msgid ""
 "between the Unit Price and Cost Price.\n"
 "                This installs the module sale_margin."
 msgstr ""
+"Añade el campo 'Margen' en los pedidos de venta, que informa de la "
+"rentabilidad calculando la diferencia entre el precio unitario y el precio "
+"de coste.\n"
+"Esto instala el módulo 'sale_margin'."
 
 #. module: sale
 #: report:sale.order:0
@@ -1499,7 +1678,7 @@ msgstr "Producto"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Generar facturas basadas en las líneas del pedido de venta"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1511,6 +1690,12 @@ msgid ""
 "Before delivery: A draft invoice is created from the sales order and must be "
 "paid before the products can be delivered."
 msgstr ""
+"Bajo demanda: Se puede crear una factura borrador desde el pedido de venta "
+"cuando sea necesario.\n"
+"Sobre la orden de entrega: Se puede crear una factura borrador desde la "
+"orden de entrega cuando los productos hayan sido entregados.\n"
+"Antes de la entrega: Se crea una factura borrador del pedido de venta, y "
+"debe ser pagada antes de que los productos puedan ser entregados."
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1527,7 +1712,7 @@ msgstr "Facturar las"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "Precio fijo (depósito)"
 
 #. module: sale
 #: report:sale.order:0
@@ -1548,7 +1733,7 @@ msgstr "Manual en proceso"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_unread
 msgid "Sale: Mark unread"
-msgstr ""
+msgstr "Ventas: Marcar como no leídos"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1558,7 +1743,7 @@ msgstr "Pedido"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "Confirmar venta"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1586,17 +1771,17 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Some order lines"
-msgstr ""
+msgstr "Algunas líneas de pedido"
 
 #. module: sale
 #: view:res.partner:0
 msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "Grupo de dirección de entrega de venta"
 
 #. module: sale
 #: model:res.groups,name:sale.group_discount_per_so_line
 msgid "Discount on lines"
-msgstr ""
+msgstr "Descuentos en líneas"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1616,6 +1801,8 @@ msgid ""
 "                        will create a draft invoice that can be modified\n"
 "                        before validation."
 msgstr ""
+"Seleccione cómo quiere facturar este pedido. Esto creará una factura "
+"borrador que puede ser modificada antes de la validación."
 
 #. module: sale
 #: view:board.board:0
@@ -1631,6 +1818,11 @@ msgid ""
 "                Use Some Order Lines to invoice a selection of the sale "
 "order lines."
 msgstr ""
+"Use 'Todo' para crear la factura final.\n"
+"Use 'Porcentaje' para facturar un porcentaje del importe total.\n"
+"Use 'Precio fijo' para facturar una cantidad específica como avance.\n"
+"Use 'Algunas líneas de pedido' para facturar una selección de las líneas de "
+"pedido de venta."
 
 #. module: sale
 #: help:sale.config.settings,module_account_analytic_analysis:0
@@ -1644,6 +1836,11 @@ msgid ""
 "invoice automatically.\n"
 "            It installs the account_analytic_analysis module."
 msgstr ""
+"Permite definir las condiciones del contrato de cliente: método de "
+"facturación (precio fijo, con parte de horas, factura avanzada), el precio "
+"exacto (650 €/día de un desarrollador), la duración (contrato de soporte de "
+"un año). Podrá seguir el progreso del contrato y facturar automáticamente.\n"
+"Esto instalará el módulo 'account_analytic_analysis'."
 
 #. module: sale
 #: model:email.template,report_name:sale.email_template_edi_sale
@@ -1651,6 +1848,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'borrador' or ''}"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1661,7 +1860,7 @@ msgstr "Fecha en la que se confirma el pedido de venta."
 #: code:addons/sale/sale.py:556
 #, python-format
 msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Primero cancele todas las facturas relativas a este pedido de venta."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1697,27 +1896,27 @@ msgstr "¡No se ha definido un cliente!"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "Dirección de entrega"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Sale to Invoice"
-msgstr ""
+msgstr "Venta a facturar"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
-msgstr ""
+msgstr "Características del almacén"
 
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr ""
+msgstr "Proyecto"
 
 #. module: sale
 #: code:addons/sale/sale.py:354
@@ -1727,7 +1926,7 @@ msgstr ""
 #: code:addons/sale/sale.py:803
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1741,6 +1940,9 @@ msgid ""
 "replenishment.\n"
 "On order: When needed, the product is purchased or produced."
 msgstr ""
+"Desde stock: Cuando se necesite, el producto se cogerá del stock o se "
+"esperará a su reposición.\n"
+"Bajo pedido: Cuando se necesite, el producto se compra o se fabrica."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1757,12 +1959,12 @@ msgstr "Buscar líneas no facturadas"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr ""
+msgstr "Presupuesto enviado"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Asistente de redacción de correo electrónico."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1783,11 +1985,12 @@ msgstr "Fecha confirmación"
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
+"Defina por favor un diario de ventas para esta compañía: \"%s\" (id: %d)."
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contract Features"
-msgstr ""
+msgstr "Características del contrato"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1817,7 +2020,7 @@ msgstr "Confirmado"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "Términos y condiciones"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1827,7 +2030,7 @@ msgstr "Confirmar"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: sale
 #: view:sale.order:0
@@ -1850,12 +2053,12 @@ msgstr "Líneas pedido de ventas"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "Opciones por defecto"
 
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "Contabilidad analítica para ventas"
 
 #. module: sale
 #: code:addons/sale/edi/sale_order.py:139
@@ -1883,16 +2086,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un presupuesto o un pedido de venta para este cliente.\n"
+"</p><p>\n"
+"OpenERP le ayudará a gestionar de manera eficiente el flujo completo de "
+"ventas: presupuesto, pedido de venta, entrega, factura y pago.\n"
+"</p><p>\n"
+"Las características sociales le permite organizar discusiones en cada pedido "
+"de venta, y permite a los clientes seguir la evolución del pedido de venta.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "Sobre la orden de entrega"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida de referencia"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1913,6 +2126,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un presupuesto, el primer paso de una nueva venta.\n"
+"</p><p>\n"
+"OpenERP le ayuda a gestionar eficientemente el flujo completo de ventas: "
+"desde el presupuesto al pedido de venta, la entrega, la facturación y su "
+"pago.\n"
+"</p><p>\n"
+"Las características sociales le permiten organizar discusiones en cada "
+"pedido de venta, y permiten que sus clientes puedan seguir la evolución del "
+"pedido de venta.\n"
+"</p>\n"
+"            "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1956,6 +2181,7 @@ msgstr "Diciembre"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"No hay cuenta de ingresos definida para este producto: \"%s\" (id: %d)."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1984,7 +2210,7 @@ msgstr "Avanzar factura"
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Abrir menú de ventas"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1994,7 +2220,7 @@ msgstr "Borrador"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "Lanzar órdenes de entrega automáticamente desde los pedidos de venta"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -2004,7 +2230,7 @@ msgstr "El importe de los impuestos."
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order "
-msgstr ""
+msgstr "Pedido de venta "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2038,7 +2264,7 @@ msgstr "Noviembre"
 #: field:sale.order,message_comment_ids:0
 #: help:sale.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentarios y correos electrónicos"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -2049,6 +2275,8 @@ msgstr "Producto avanzado"
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de "
+"pedidos de venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2063,13 +2291,13 @@ msgstr "Pedidos de ventas en proceso"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "Preparar facturas basadas en los partes de horas"
 
 #. module: sale
 #: code:addons/sale/sale.py:655
 #, python-format
 msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "Pedido de venta para <em>%s</em> <b>cancelado</b>."
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2086,12 +2314,12 @@ msgstr "Retraso realización"
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order Status"
-msgstr ""
+msgstr "Estado del pedido"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "Mostrar líneas a facturar"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2123,12 +2351,12 @@ msgstr "¡No hay tarifa! "
 #: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sale Orders"
-msgstr ""
+msgstr "Pedidos de venta"
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
 msgid "Use contracts management"
-msgstr ""
+msgstr "Usar gestión de contratos"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2154,7 +2382,7 @@ msgstr "¿Desea crear la(s) factura(s)?"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
-msgstr ""
+msgstr "Número de pedido"
 
 #. module: sale
 #: view:sale.order:0
@@ -2186,6 +2414,8 @@ msgid ""
 "with\n"
 "                        your customer."
 msgstr ""
+"Usar contratos para gestionar sus servicios con facturación múltiple como "
+"parte del mismo contrato con su cliente."
 
 #. module: sale
 #: view:sale.order:0
@@ -2196,7 +2426,7 @@ msgstr "Buscar pedido de venta"
 #. module: sale
 #: field:sale.advance.payment.inv,advance_payment_method:0
 msgid "What do you want to invoice?"
-msgstr ""
+msgstr "¿Qué quiere facturar?"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -2212,7 +2442,7 @@ msgstr "Plazo de pago"
 #. module: sale
 #: help:account.config.settings,module_sale_analytic_plans:0
 msgid "This allows install module sale_analytic_plans."
-msgstr ""
+msgstr "Permite instalar el módulo 'sale_analytic_plans'."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2250,7 +2480,7 @@ msgstr "Año"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Do you want to invoice the selected sale order lines?"
-msgstr ""
+msgstr "¿Desea facturar las líneas de pedido de venta seleccionadas?"
 
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 1bc9fffe042..22a3972ae1f 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 13:18+0000\n"
-"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
+"PO-Revision-Date: 2012-12-18 18:46+0000\n"
+"Last-Translator: Lovro Lazarin <lovro.lazarin@slobodni-programi.hr>\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-12-07 04:35+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:16+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -45,7 +45,7 @@ msgstr "JM"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Prodavač"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -68,28 +68,28 @@ msgstr "Otkaži narudžbu"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Netočni podaci"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "Iznos avansa mora biti pozitivna."
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju."
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Netočno"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Porez"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -101,6 +101,13 @@ msgid ""
 "The 'Waiting Schedule' status is set when the invoice is confirmed           "
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
+"Pokazuje status ponude ili prodajnog naloga.                                 "
+"                                               \n"
+"Status iznimke je automatski postavljen kada se dogodi poništenje u procesu "
+"validacije fakture (Iznimka fakture) ili u procesu odabira liste (Iznimka "
+"otpreme).\n"
+"Status 'Čekanje termina' je postavljen ako je faktura potvrđena ali se čeka "
+"planera da krene na datum narudžbe."
 
 #. module: sale
 #: field:sale.order,project_id:0
@@ -108,7 +115,7 @@ msgstr ""
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "Analitički konto"
+msgstr "Konto analitike"
 
 #. module: sale
 #: help:sale.order,message_summary:0
@@ -116,17 +123,20 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr "# količine"
+msgstr "# kol"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
 msgstr ""
+"Omogućuje vam da primijenite određena sniženja po stavkama prodajnog naloga."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -134,6 +144,9 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Omogućuje vam da upravljate različitim cijenama bazirano na pravilima po "
+"kategorijama kupaca.\n"
+"Npr: 10% za maloprodajne trgovce, promocija od 5€ na proizvod, itd."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -144,17 +157,17 @@ msgstr "Standardan uvjet plaćanja"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Faktura  <b>plaćeno</b>,"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Dopusti korištenje različitih mjernih jedinica"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Postotak"
 
 #. module: sale
 #: report:sale.order:0
@@ -171,7 +184,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,price_total:0
 msgid "Total Price"
-msgstr "Ukupna cijena"
+msgstr "Ukupni iznos"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
@@ -192,6 +205,13 @@ msgid ""
 "user-wise as well as month wise.\n"
 "                This installs the module account_analytic_analysis."
 msgstr ""
+"Za modificiranje pogleda analitičkog konta kako bi prikazivao važne podatke "
+"projektnom menadžeru servisnih kompanija.\n"
+"                                                                             "
+"  Možete također vidjeti sažeti izvještaj analitičkog konta prema korisniku "
+"isto tako i prema mjesecu.\n"
+"                                                                             "
+"  Ovo instalira modul account_analytic_analysis."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -214,17 +234,17 @@ msgstr "Ostali podaci"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Upozorenje!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Proces fakturiranja"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Prodajni nalog gotov"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -237,6 +257,7 @@ msgstr "Ponude i prodaje"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Omogućuje vam da odaberete i zadržite različite mjerne jedinice za proizvode."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -247,7 +268,7 @@ msgstr "Faktura obavljene prodaje"
 #: code:addons/sale/sale.py:293
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "Upozorenje cjenovnika!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -257,7 +278,7 @@ msgstr "Popust (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Kreiraj i pogledaj fakturu"
 
 #. module: sale
 #: view:board.board:0
@@ -268,7 +289,7 @@ msgstr "Moje Ponude"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Dopusti kreiranje alarma prema kupcima ili proizvodima"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -289,17 +310,26 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Ovdje je lista svakog prodajnog naloga koji će se "
+"fakturirati. Možete \n"
+"                fakturirati prodajni nalog djelomično, prema određenim "
+"stavkama. Ne trebate\n"
+"                ovu listu ako fakturirate iz otpreminica ili ako fakturirate "
+"prodajnu općenito.\n"
+"        </p>\n"
+"            "
 
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Ponuda "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "Avans od %s %%"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
@@ -309,7 +339,7 @@ msgstr "Prodaje u iznimci"
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Partner kojemu određeni proizvod treba biti dodijeljen"
 
 #. module: sale
 #: view:sale.order:0
@@ -339,6 +369,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                           "
+"Kliknite da bi kreirali ponudu koja može biti pretvorena u prodajni\n"
+"                                                                           "
+"nalog.\n"
+"                                                                 </p><p>\n"
+"                                                                           "
+"OpenERP wam pomaže da efikasno upravljate kompletnim prodajnim tokom:\n"
+"                                                                           "
+"ponuda, prodajni nalog, otprema, fakturiranje i plaćanje.\n"
+"                                                                  </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -363,19 +405,19 @@ msgstr "Listopad"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Pogledaj fakturu"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "Avans od %s %s"
 
 #. module: sale
 #: view:board.board:0
@@ -394,7 +436,7 @@ msgstr "Količina"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr "Adresa dostave za trenutni prodajni nalog"
+msgstr "Adresa dostave za trenutni prodajni nalog."
 
 #. module: sale
 #: report:sale.order:0
@@ -409,7 +451,7 @@ msgstr "Rujan"
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Porezna pozicija"
+msgstr "Fiskalna pozicija"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -421,7 +463,7 @@ msgstr "U tijeku"
 #: code:addons/sale/sale.py:667
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "Nacrt fakture od %s %s <b>čekanje na validaciju</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -436,7 +478,7 @@ msgstr ""
 #: code:addons/sale/sale.py:843
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
+msgstr "Ne možete otkazati stavku prodajnog naloga koja je već fakturirana."
 
 #. module: sale
 #: report:sale.order:0
@@ -456,7 +498,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "Prije otpreme"
 
 #. module: sale
 #: code:addons/sale/sale.py:804
@@ -465,21 +507,23 @@ msgid ""
 "There is no Fiscal Position defined or Income category account defined for "
 "default properties of Product categories."
 msgstr ""
+"Nije definirana fiskalna pozicija ili prihodovni konto kategorije za zadane "
+"karakteristike proizvodnih kategorija."
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Adresa u prodajnom nalogu"
 
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract / Analytic"
-msgstr ""
+msgstr "Ugovor / Analitički"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Omogući fakturiranje stavki prodajnih naloga"
 
 #. module: sale
 #: view:sale.report:0
@@ -500,7 +544,7 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -511,7 +555,7 @@ msgstr "Fakturirano"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Analitičko računovodstvo za prodaju"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -536,7 +580,7 @@ msgstr "Ožujak"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
 msgid "Sale: Mark read"
-msgstr ""
+msgstr "Prodaja: označi crveno"
 
 #. module: sale
 #: help:sale.order,amount_total:0
@@ -556,7 +600,7 @@ msgstr "Podzbroj"
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Dopusti postavljanje popusta na stavke prodajnog naloga"
 
 #. module: sale
 #: report:sale.order:0
@@ -566,12 +610,12 @@ msgstr "Adresa fakture :"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "Mjerna jedinica "
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "Zadana jedninica radnog vremena za službe je"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -581,7 +625,7 @@ msgstr "Adresa fakture"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
+msgstr "Stavke prodajnog naloga vezane za moj prodajni nalog"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -596,11 +640,15 @@ msgid ""
 "                    or a fixed price (for advances) directly from the sale "
 "order form if you prefer."
 msgstr ""
+"Svi predmeti u ovim stavkama će biti fakturirani. Možete također fakturirati "
+"postotak prodajnog naloga \n"
+"                                                                             "
+"                  ili fiksnu cijenu (za avans) direktno iz prodajnog naloga."
 
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(ažuriraj)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -611,12 +659,12 @@ msgstr "Stavka prodajnog naloga"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "Jedan zaposlenik može imati različite uloge po ugovoru"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "Ispis"
 
 #. module: sale
 #: report:sale.order:0
@@ -651,7 +699,7 @@ msgstr "Datum kreiranja"
 #: code:addons/sale/sale.py:659
 #, python-format
 msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
+msgstr "Prodajni nalog za <em>%s</em> set to <b>Done</b>"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -688,6 +736,15 @@ msgid ""
 "             \n"
 "* The 'Cancelled' status is set when a user cancel the sales order related."
 msgstr ""
+"* Status 'Nacrt' je postavljen kada je vezani prodajni nalog u stanju "
+"nacrta.                     \n"
+"* Status 'Potvrđeno' je postavljen kada je vezani prodajni nalog potvrđen.   "
+"                  \n"
+"* Status 'Iznimka' je postavljen kada je vezani prodajni nalog postavljen "
+"kao iznimka.                     \n"
+"* Status 'Zaključeno' je postavljen kada je stavka prodjanog naloga "
+"odabrana.                     \n"
+"* Status 'Otkazano' je postavljen kada korisnik otkaže vezani prodajni nalog."
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
@@ -701,12 +758,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Greška u konfiguraciji!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Pošalji e-poštom"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -731,6 +788,8 @@ msgid ""
 "To allow your salesman to make invoices for sale order lines using the menu "
 "'Lines to Invoice'."
 msgstr ""
+"Da bi dopustili prodavaču da kreira fakture za stavke prodajnih naloga "
+"koristeći meni 'Stavke u fakture'."
 
 #. module: sale
 #: view:sale.report:0
@@ -741,7 +800,7 @@ msgstr "Partner"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "Kreiraj i prikaži fakturu"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -756,6 +815,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite da bi definirali novu prodavaonicu.\n"
+"              </p><p>\n"
+"                Svaka ponuda ili prodajni nalog mora biti vezan za "
+"prodavaonicu. Prodavaonica\n"
+"                također definira skladište iz kojega će proizvodi biti "
+"optremljeni\n"
+"                za svaku pojedinu prodaju.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: report:sale.order:0
@@ -786,7 +855,7 @@ msgstr "Kategorija proizvoda"
 #: code:addons/sale/sale.py:555
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Ne možete otkazati ovaj prodajni nalog!"
 
 #. module: sale
 #: view:sale.order:0
@@ -799,6 +868,7 @@ msgstr "Ponovno izradi fakturu"
 msgid ""
 "In order to delete a confirmed sale order, you must cancel it before !"
 msgstr ""
+"Kako bi obrisali potvrđeni prodajni nalog, morate ga prethodno otkazati!"
 
 #. module: sale
 #: report:sale.order:0
@@ -808,17 +878,17 @@ msgstr "Porezi :"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "Na zahtijev"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Pratitelj"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -842,6 +912,9 @@ msgid ""
 "                You may have to create it and set it as a default value on "
 "this field."
 msgstr ""
+"Odaberite proizvod od vrste servisa koji se zove 'Napredni proizvod'.\n"
+"                Možda ćete ga morati kreirati i postaviti kao zadanu "
+"vrijednost na ovom polju."
 
 #. module: sale
 #: help:sale.config.settings,module_warning:0
@@ -851,6 +924,10 @@ msgid ""
 "Example: Product: this product is deprecated, do not purchase more than 5.\n"
 "                Supplier: don't forget to ask for an express delivery."
 msgstr ""
+"Dopusti konfiguraciju notifikacija na proizvodima i iniciraj ih kada "
+"korisnik želi prodati određeni proizvod ili određenom kupcu.\n"
+"Nrp: Proizvod: ovaj proizvod je zastario, ne kupujte više od 5.\n"
+"                Dobavljač: ne zaboravi tražiti žurnu dostavu."
 
 #. module: sale
 #: code:addons/sale/sale.py:979
@@ -861,7 +938,7 @@ msgstr "Nije pronađena odgovarajuća stavka cjenika"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Prikazuj marže na prodajnim nalozima"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -882,7 +959,7 @@ msgstr "Vaša referenca"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr "Količina"
+msgstr "Kol."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -898,7 +975,7 @@ msgstr "Moje stavke prodajnog naloga"
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
-msgstr "Odustani"
+msgstr "Otkaži"
 
 #. module: sale
 #: sql_constraint:sale.order:0
@@ -912,6 +989,8 @@ msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Ne mogu naći stavku u cjenovniku koja odgovara ovom proizvodu i količini.\n"
+"Morate promijeniti ili proizvod, količinu ili cjenovnik."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -920,7 +999,7 @@ msgstr ""
 #: view:sale.advance.payment.inv:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
-msgstr "Napravi fakturu"
+msgstr "Kreiraj fakturu"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -934,6 +1013,9 @@ msgid ""
 "Manage Related Stock.\n"
 "                    This installs the module sale_stock."
 msgstr ""
+"Omogućuje vam da kreirate ponudu, prodajni nalog koristeći različita pravila "
+"narudžbe i upravljate vezanim zalihama.\n"
+"                    Ovo instalira modul sale_stock."
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -951,7 +1033,7 @@ msgstr "Cijena"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "Broj ponude"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -977,28 +1059,28 @@ msgstr "Prodajni nalog u stanju nacrta"
 #: code:addons/sale/sale.py:647
 #, python-format
 msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgstr "Ponuda za <em>%s</em> <b>created</b>."
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i povijest komuniciranja"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Nova kopija ponude"
 
 #. module: sale
 #: code:addons/sale/sale.py:1007
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Ne možete obrisati prodajni nalog koji je u stanju '%s'."
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
 msgid "Properties on lines"
-msgstr ""
+msgstr "Krakteristike na stavkama"
 
 #. module: sale
 #: code:addons/sale/sale.py:888
@@ -1007,6 +1089,8 @@ msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
 msgstr ""
+"Prije odabira proizvoda, \n"
+" odaberite kupca u prodajnom formularu."
 
 #. module: sale
 #: view:sale.order:0
@@ -1027,19 +1111,19 @@ msgstr "Potvrdite ponudu"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Narudžbene stavke u fakturu"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr "grupiraj po..."
+msgstr "Grupiraj po..."
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "Značajke proizvoda"
 
 #. module: sale
 #: selection:sale.order,state:0
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 0db7d9f9885..e7abea174e8 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 77349ebbf03..9227e0f9710 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-04-25 10:56+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
+"PO-Revision-Date: 2012-12-18 22:33+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \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-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dati Insufficienti!"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -31,27 +31,27 @@ msgstr "Converti in preventivo"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Statistiche Fatture"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marca Vinto"
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
 msgid "Default Sales Team"
-msgstr ""
+msgstr "Team Vendite di Default"
 
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "I Miei Team di Vendita"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -64,7 +64,7 @@ msgstr ""
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorie"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -91,7 +91,7 @@ msgstr "Effettua vendite"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -103,7 +103,7 @@ msgstr "Opportunità:%s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "L'opportunità è stata <b>convertita</b> nell'offerta <em>%s</em>."
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -114,7 +114,7 @@ msgstr "Negozio"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Nessun indirizzo/i definito/i per il cliente."
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -128,7 +128,7 @@ msgstr "Team vendite"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Crea Preventivo"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -148,7 +148,7 @@ msgstr "Ordine di vendita"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #~ msgid "All at once"
 #~ msgstr "Tutto in una volta"
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index a9b9accaf11..c644cc02491 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index df7da3760c7..2d137ab6c7a 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-13 18:20+0000\n"
+"PO-Revision-Date: 2012-12-18 06:08+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -44,7 +44,7 @@ msgstr "Auftragsposition"
 msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
-msgstr ""
+msgstr "Zeigt die Spanne zwischen Einstands- und Verkaufspreis"
 
 #~ msgid "Customer Invoice"
 #~ msgstr "Ausgangsrechnung"
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index fb822d9c614..63809a7cd7f 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index c6081ca0461..35634be5b09 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-02-08 11:50+0000\n"
+"PO-Revision-Date: 2012-12-18 06:07+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,12 +35,12 @@ msgstr "Anzeige der Kundenreferenz aus dem Verkaufsauftrag"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "Verkauf Referenze"
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "Verkauf Bezeichnung"
 
 #~ msgid "Sales and MRP Management"
 #~ msgstr "Verkauf und Fertigungsplanung"
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index 371b757174d..667f6f66a8c 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index 0416f71ef10..4d9b7622e2b 100644
--- a/addons/sale_order_dates/i18n/de.po
+++ b/addons/sale_order_dates/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-13 18:19+0000\n"
+"PO-Revision-Date: 2012-12-18 06:06+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumangaben"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -40,7 +40,7 @@ msgstr "Datum der Erstellung des Lieferauftrags"
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date requested by the customer for the sale."
-msgstr ""
+msgstr "Vom Kunden genünschtes Lieferdatum"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -55,7 +55,7 @@ msgstr "Verkaufsauftrag"
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Committed date for delivery."
-msgstr ""
+msgstr "Bestätigtes Lieferdatum"
 
 #~ msgid "Date on which customer has requested for sales."
 #~ msgstr "Datum der Anfrage an Vertrieb"
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 29a7a97b76f..98691ede9b9 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_order_dates
 #: view:sale.order:0
diff --git a/addons/sale_stock/i18n/it.po b/addons/sale_stock/i18n/it.po
index e34fb0558bc..51ee8996bc4 100644
--- a/addons/sale_stock/i18n/it.po
+++ b/addons/sale_stock/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-09-21 14:03+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
+"PO-Revision-Date: 2012-12-18 15:55+0000\n"
+"Last-Translator: Alessandro Camilli <a.camilli@yahoo.it>\n"
 "Language-Team: \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-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -40,6 +40,8 @@ msgid ""
 "Allows you to specify different delivery and invoice addresses on a sale "
 "order."
 msgstr ""
+"Consente nell'ordine di vendita di specificare un indirizzo di consegna "
+"diverso da quello di fatturazione"
 
 #. module: sale_stock
 #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
@@ -167,7 +169,7 @@ msgstr ""
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr ""
+msgstr "Consente un diverso indirizzo di consegna e di fatturazione "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:571
diff --git a/addons/sale_stock/i18n/pt_BR.po b/addons/sale_stock/i18n/pt_BR.po
index 75bb1a50b2d..717f96bdfa9 100644
--- a/addons/sale_stock/i18n/pt_BR.po
+++ b/addons/sale_stock/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 1dcd1c42082..8b1f19a1a50 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-13 16:31+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
+"PO-Revision-Date: 2012-12-18 19:04+0000\n"
+"Last-Translator: Salvatore <salvatore.trimarchi@gmail.com>\n"
 "Language-Team: \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-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #~ msgid "Stock Management"
 #~ msgstr "Gestión de inventario"
@@ -35,6 +35,9 @@ msgid ""
 "Shirts, for the same \"Linux T-Shirt\", you may have variants on  sizes or "
 "colors; S, M, L, XL, XXL."
 msgstr ""
+"Permite gestionar múltiples variantes por producto. Como ejemplo, si vende "
+"camisetas, para la misma \"camiseta Linux\", puede tener variantes de tallas "
+"y colores: S, M, L, XL, XXL."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -50,11 +53,11 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
-"Cuando se realiza una valorización de inventario en tiempo real, la "
+"Cuando se realiza una valoración de inventario en tiempo real, la "
 "contrapartida para todos los movimientos de entrada serán imputados en esta "
-"cuenta, a menos que se haya establecido una cuenta de valorización "
-"específica en la ubicación fuente. Éste es el valor por defecto para todos "
-"los productos en esta categoría. También se puede establecer directamente en "
+"cuenta, a menos que se haya establecido una cuenta de valoración específica "
+"en la ubicación fuente. Éste es el valor por defecto para todos los "
+"productos en esta categoría. También se puede establecer directamente en "
 "cada producto."
 
 #. module: stock
@@ -77,7 +80,7 @@ msgstr "Ubicación encadenada si fija"
 #: view:stock.inventory:0
 #: view:stock.move:0
 msgid "Put in a new pack"
-msgstr "Poner en un nuevo pack"
+msgstr "Poner en un nuevo paquete"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -551,7 +554,7 @@ msgstr "Moneda para precio promedio"
 #. module: stock
 #: view:product.product:0
 msgid "Stock and Expected Variations"
-msgstr ""
+msgstr "Stock y variaciones esperadas"
 
 #. module: stock
 #: help:product.category,property_stock_valuation_account_id:0
@@ -565,7 +568,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr ""
+msgstr "Rastrear número de serie en unidades logísticas (pallets)"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -574,6 +577,8 @@ msgid ""
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
 msgstr ""
+"El retraso medio en días entre la confirmación del pedido de cliente y la "
+"entrega de los productos finales. Es el tiempo que promete a sus clientes."
 
 #. module: stock
 #: code:addons/stock/product.py:196
@@ -590,7 +595,7 @@ msgstr "Tipo de ubicación"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Location & Warehouse"
-msgstr ""
+msgstr "Ubicación y almacén"
 
 #. module: stock
 #: code:addons/stock/stock.py:1848
@@ -599,6 +604,9 @@ msgid ""
 "Quantities, Units of Measure, Products and Locations cannot be modified on "
 "stock moves that have already been processed (except by the Administrator)."
 msgstr ""
+"Las cantidades, las unidades de medida, los productos y las ubicaciones no "
+"pueden ser modificadas en movimientos de stock que ya han sido procesados "
+"(excepto por un administrador)."
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -622,6 +630,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una petición de movimiento interno.\n"
+"</p><p>\n"
+"La mayoría de operaciones están preparadas automáticamente por OpenERP de "
+"acuerdo a sus reglas logísticas preconfiguradas, pero puede también "
+"registrar movimientos de stock manuales.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -632,7 +648,7 @@ msgstr "Etiquetas artículos"
 #: code:addons/stock/stock.py:1444
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
-msgstr ""
+msgstr "El pedido en espera <em>%s</em> ha sido <b>creado</b>."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -644,11 +660,13 @@ msgstr "Estadísticas de movimientos"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permite seleccionar y configurar diferentes unidades de medida para los "
+"productos."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by logistic serial number"
-msgstr ""
+msgstr "Informe de stock por nº de serie logístico"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -656,11 +674,13 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Fuerza a especificar un nº de serie para todos los movimientos conteniendo "
+"este producto y que vayan a una ubicación de cliente"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr ""
+msgstr "Recibir/Enviar productos"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -695,7 +715,7 @@ msgstr "Empaquetado"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_in
 msgid "Receipt Slip"
-msgstr ""
+msgstr "Ficha de expedición"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:214
@@ -703,6 +723,7 @@ msgstr ""
 msgid ""
 "Serial number quantity %d of %s is larger than available quantity (%d)!"
 msgstr ""
+"¡Cantidad %d del nº de serie %s es mayor que la cantidad disponible (%d)!"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -712,7 +733,7 @@ msgstr "Pedido (origen)"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Categorías de las unidades de medida"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -759,7 +780,7 @@ msgstr "Referencia adicional"
 #. module: stock
 #: view:stock.partial.picking.line:0
 msgid "Stock Picking Line"
-msgstr ""
+msgstr "Línea de albarán"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -829,13 +850,13 @@ msgstr ""
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
-msgstr ""
+msgstr "Analizar inventario actual"
 
 #. module: stock
 #: code:addons/stock/stock.py:1202
 #, python-format
 msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+msgstr "¡No puede eliminar un albrán que está en estado %s!"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -849,6 +870,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Fuerza a especificar un nº de serie para todos los movimientos que contienen "
+"este producto y vienen de una ubicación de proveedor"
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -858,6 +881,10 @@ msgid ""
 "                For instance, you can sell pieces of meat that you invoice "
 "based on their weight."
 msgstr ""
+"Permite vender unidades de un producto, pero facturar basándose en una "
+"unidad de medida diferente.\n"
+"Por ejemplo, puede vender piezas de carne, pero facturarlas basadas en su "
+"precio."
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -897,6 +924,8 @@ msgid ""
 "Please define stock output account for this product or its category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Defina por favor un cuenta de salida de stock para este producto o su "
+"categoría: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:stock.change.product.qty,message_summary:0
@@ -904,12 +933,12 @@ msgstr ""
 #: field:stock.picking.in,message_summary:0
 #: field:stock.picking.out,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: stock
 #: view:product.category:0
 msgid "Account Stock Properties"
-msgstr ""
+msgstr "Propiedades de cuenta de stock"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -923,7 +952,7 @@ msgstr "¡La referencia debe ser única por compañía!"
 #: field:stock.picking.in,date:0
 #: field:stock.picking.out,date:0
 msgid "Time"
-msgstr ""
+msgstr "Tiempo"
 
 #. module: stock
 #: code:addons/stock/product.py:443
@@ -939,7 +968,7 @@ msgstr "Urgente"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Delivered"
-msgstr ""
+msgstr "Entregado"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -961,7 +990,7 @@ msgstr "Desechar productos"
 #. module: stock
 #: view:product.product:0
 msgid "- update"
-msgstr ""
+msgstr "- actualizar"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -980,6 +1009,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "production lot has to be shown on the moves or not."
 msgstr ""
+"Este campo es para propósitos internos. Se usa para decidir si la columna "
+"lote de producción tiene que ser mostrada en los movimientos o no."
 
 #. module: stock
 #: selection:product.product,valuation:0
@@ -1014,11 +1045,13 @@ msgid ""
 "You cannot cancel the picking as some moves have been done. You should "
 "cancel the picking lines."
 msgstr ""
+"No puede cancelar un albarán que tiene algún movimiento realizado. Debe "
+"cancelar las líneas de albarán."
 
 #. module: stock
 #: field:stock.config.settings,decimal_precision:0
 msgid "Decimal precision on weight"
-msgstr ""
+msgstr "Precisión decimal en los pesos"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1058,23 +1091,24 @@ msgstr "Ubicación de inventario"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Debe asignar un nº de serie para este producto."
 
 #. module: stock
 #: code:addons/stock/stock.py:2326
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)"
 msgstr ""
+"Defina por favor un diario en la categoría de producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr ""
+msgstr "Listo para transferir"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1119,7 +1153,7 @@ msgstr "está planificado %s"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
-msgstr ""
+msgstr "Crear facturas borrador"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -1137,7 +1171,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Ready to Receive"
-msgstr ""
+msgstr "Listo para recibir"
 
 #. module: stock
 #: view:stock.move:0
@@ -1163,17 +1197,17 @@ msgstr "Existencias por ubicacion"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 msgid "Receive/Deliver By Orders"
-msgstr ""
+msgstr "Recibir/Enviar por pedidos"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots"
-msgstr ""
+msgstr "Lotes de producto"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "Revertir transferencia"
 
 #. module: stock
 #: help:stock.location,active:0
@@ -1197,12 +1231,14 @@ msgid ""
 "No products to return (only lines in Done state and not fully returned yet "
 "can be returned)!"
 msgstr ""
+"¡No hay productos a devolver (sólo las líneas en estado realizado y no "
+"totalmente devueltas puede sen devueltas)!"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Back Orders"
-msgstr "Albaranes relacionados"
+msgstr "Pedidos en espera"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1228,12 +1264,12 @@ msgstr "Cuenta de valoración de existencias"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: stock
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Fila"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1245,6 +1281,7 @@ msgstr "Ubicación de producción"
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)."
 msgstr ""
+"Defina por favor un diario en la categoría de producto: \"%s\" (id: %d)."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1321,11 +1358,13 @@ msgstr "Autor"
 msgid ""
 "You are moving %.2f %s but only %.2f %s available for this serial number."
 msgstr ""
+"Está moviendo %.2f %s, pero sólo hay disponible %.2f %s para este nº de "
+"serie."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Internal Shipment :"
-msgstr ""
+msgstr "Envío interno:"
 
 #. module: stock
 #: code:addons/stock/stock.py:1401
@@ -1344,7 +1383,7 @@ msgstr "Operación manual"
 #: field:report.stock.move,picking_id:0
 #, python-format
 msgid "Shipment"
-msgstr ""
+msgstr "Envío"
 
 #. module: stock
 #: view:stock.location:0
@@ -1374,7 +1413,7 @@ msgstr "Fecha realizado"
 #: code:addons/stock/stock.py:1450
 #, python-format
 msgid "Products have been <b>moved</b>."
-msgstr ""
+msgstr "Los productos han sido <b>movidos</b>."
 
 #. module: stock
 #: help:stock.config.settings,group_stock_packaging:0
@@ -1382,6 +1421,8 @@ msgid ""
 "Allows you to create and manage your packaging dimensions and types you want "
 "to be maintained in your system."
 msgstr ""
+"Permite crear y gestionar las dimensiones y tipos del empaquetado que quiere "
+"mantener en el sistema."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1406,7 +1447,7 @@ msgstr "Inventario físico"
 #: code:addons/stock/wizard/stock_move.py:214
 #, python-format
 msgid "Processing Error!"
-msgstr ""
+msgstr "¡Error en el procesamiento!"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1430,6 +1471,15 @@ msgid ""
 "* Available: When products are reserved, it is set to 'Available'.\n"
 "* Done: When the shipment is processed, the state is 'Done'."
 msgstr ""
+"Nuevo: Cuando el movimiento de stock se ha creado y no se ha confirmado "
+"aún.\n"
+"Esperando otro movimiento: Este estado se da cuando un movimiento está "
+"esperando a otro, por ejemplo en un flujo encadenado.\n"
+"Esperando disponibilidad: Se alcanza este estado cuando la resolución de "
+"abastecimiento no es correcta. Puede necesitar que se ejecute el "
+"planificador, un componente que sea fabricado...\n"
+"Disponible: Se establece cuando se reservan productos.\n"
+"Realizado: Cuando se procesa el envío, entonces se alcanza este estado."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1439,7 +1489,7 @@ msgstr "Ubicaciones de empresas"
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recibido"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1452,7 +1502,7 @@ msgstr "Cantidad total"
 #: field:stock.picking.in,min_date:0
 #: field:stock.picking.out,min_date:0
 msgid "Scheduled Time"
-msgstr ""
+msgstr "Tiempo programado"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
@@ -1463,7 +1513,7 @@ msgstr "Movimiento consumo"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Orden de entrega :"
 
 #. module: stock
 #: help:stock.location,chained_delay:0
@@ -1486,6 +1536,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un nuevo diario.\n"
+"</p><p>\n"
+"El sistema de diario de stock permite asignar cada operación de stock a un "
+"diario específico de acuerdo con el tipo de operación a realizar o el "
+"trabajador/equipo que debe realizar la operación. Ejemplo de diarios de "
+"stock pueden ser: control de calidad, albaranes, empaquetado, etc.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1528,6 +1587,7 @@ msgstr "Esperando otro movimiento"
 msgid ""
 "This quantity is expressed in the Default Unit of Measure of the product."
 msgstr ""
+"Esta cantidad está expresada en la unidad de medida por defecto del producto."
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1549,7 +1609,7 @@ msgstr "está en estado borrador."
 #: code:addons/stock/stock.py:1961
 #, python-format
 msgid "Warning: No Back Order"
-msgstr ""
+msgstr "Advertencia: No hay pedido en espera"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1577,12 +1637,12 @@ msgstr "Sólo puede eliminar movimientos borrador."
 #: code:addons/stock/stock.py:1736
 #, python-format
 msgid "You cannot move product %s to a location of type view %s."
-msgstr ""
+msgstr "No puede mover el producto %s a la ubicación de tipo vista %s."
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Split in serial numbers"
-msgstr ""
+msgstr "Separar en números de serie"
 
 #. module: stock
 #: view:stock.move:0
@@ -1600,7 +1660,7 @@ msgstr "Vista calendario"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Plazo de entrega del cliente"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1654,7 +1714,7 @@ msgstr "Albarán interno"
 #: code:addons/stock/stock.py:1453
 #, python-format
 msgid "Products have been <b>%s</b>."
-msgstr ""
+msgstr "Los productos han sido <b>%s</b>."
 
 #. module: stock
 #: view:stock.move:0
@@ -1665,7 +1725,7 @@ msgstr "Dividir"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_out
 msgid "Delivery Slip"
-msgstr ""
+msgstr "Vale de entrega"
 
 #. module: stock
 #: view:stock.move:0
@@ -1691,7 +1751,7 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
-"Usado para una valorización en tiempo real del inventario. Cuando está "
+"Usado para una valoración en tiempo real del inventario. Cuando está "
 "establecido en una ubicación virtual (no de tipo interno), esta cuenta se "
 "usará para mantener el valor de los productos que son movidos fuera de la "
 "ubicación a una ubicación interna, en lugar de la cuenta de salida de stock "
@@ -1720,13 +1780,13 @@ msgstr "Dirección del cliente o proveedor."
 #: code:addons/stock/stock.py:1434
 #, python-format
 msgid "%s has been <b>created</b>."
-msgstr ""
+msgstr "%s ha sido  <b>creado</b>."
 
 #. module: stock
 #: code:addons/stock/stock.py:1438
 #, python-format
 msgid "%s has been <b>confirmed</b>."
-msgstr ""
+msgstr "%s ha sido  <b>confirmado</b>."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1777,6 +1837,16 @@ msgid ""
 "Thank you in advance for your cooperation.\n"
 "Best Regards,"
 msgstr ""
+"Estimado/a señor/señora,\n"
+"\n"
+"Nuestros registros indican que algunos pagos en nuestra cuenta están aún "
+"pendientes. Puede encontrar los detalles a continuación.\n"
+"Si la cantidad ha sido ya pagada, por favor, descarte esta notificación. En "
+"otro caso, por favor remítanos el importe total abajo indicado.\n"
+"Si tiene alguna pregunta con respecto a su cuenta, por favor contáctenos.\n"
+"\n"
+"Gracias de antemano por su colaboración.\n"
+"Saludos cordiales,"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1808,6 +1878,8 @@ msgstr "Ubicación padre"
 #, python-format
 msgid "Please define stock output account for this product: \"%s\" (id: %d)."
 msgstr ""
+"Defina por favor una cuenta de salida de stock para este producto: \"%s\" "
+"(id: %d)."
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1824,7 +1896,7 @@ msgstr "Tiempo inicial encadenado"
 #. module: stock
 #: field:stock.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr ""
+msgstr "Gestionar diferentes unidades de medida para los productos"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
@@ -1835,18 +1907,18 @@ msgstr "Stock factura en el envío"
 #: code:addons/stock/stock.py:2546
 #, python-format
 msgid "Please provide a positive quantity to scrap."
-msgstr ""
+msgstr "Introduzca por favor una cantidad positiva a deshechar"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Your Company, Birmingham shop"
-msgstr ""
+msgstr "Su compañía, tienda de Birmingham"
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Location"
-msgstr ""
+msgstr "Ubicación de almacenamiento"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1859,7 +1931,7 @@ msgstr "Moneda en la que se expresa el coste unidad."
 #: selection:stock.picking.in,move_type:0
 #: selection:stock.picking.out,move_type:0
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1870,7 +1942,7 @@ msgstr "Septiembre"
 #. module: stock
 #: view:product.product:0
 msgid "days"
-msgstr ""
+msgstr "días"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1888,18 +1960,18 @@ msgstr "Moneda"
 #: help:stock.picking.in,origin:0
 #: help:stock.picking.out,origin:0
 msgid "Reference of the document"
-msgstr ""
+msgstr "Referencia del documento"
 
 #. module: stock
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Is a Back Order"
-msgstr "Es un albarán relacionado"
+msgstr "Es un pedido en espera"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Incoming Shipment :"
-msgstr ""
+msgstr "Envío entrante :"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
@@ -1909,7 +1981,7 @@ msgstr "Cuenta de valoracion de existencias (salida)"
 #. module: stock
 #: view:stock.return.picking.memory:0
 msgid "Return Picking Memory"
-msgstr ""
+msgstr "Memoría de albarán de devolución"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_move_form2
@@ -1927,6 +1999,9 @@ msgid ""
 "Check this option to select existing serial numbers in the list below, "
 "otherwise you should enter new ones line by line."
 msgstr ""
+"Marque esta opción para seleccionar números de serie existentes en la lista "
+"a continuación. En caso contrario, deberá introducir nuevos número línea a "
+"línea."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1952,7 +2027,7 @@ msgstr "Cancelar disponibilidad"
 #: code:addons/stock/wizard/stock_location_product.py:49
 #, python-format
 msgid "Current Inventory"
-msgstr ""
+msgstr "Inventario actual"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1960,6 +2035,9 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by manufacturing orders."
 msgstr ""
+"Se usará esta ubicación de stock, en lugar de la de por defecto, como la "
+"ubicación origen para los movimientos de stock generados por las órdenes de "
+"fabricación."
 
 #. module: stock
 #: help:stock.move,date_expected:0
@@ -1991,7 +2069,7 @@ msgstr "preparado para procesar."
 #: code:addons/stock/stock.py:529
 #, python-format
 msgid "You cannot remove a lot line."
-msgstr ""
+msgstr "No puede eliminar una línea de lote."
 
 #. module: stock
 #: help:stock.location,posx:0
@@ -2020,7 +2098,7 @@ msgstr "Ctdad enviada"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr ""
+msgstr "Transferir productos"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2028,6 +2106,9 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated when you do an inventory."
 msgstr ""
+"Se usará esta ubicación de stock, en lugar de la de por defecto, como la "
+"ubicación origen para los movimientos de stock generados cuando realiza "
+"inventarios."
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -2037,11 +2118,11 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
-"Cuando se realiza una valorización de inventario en tiempo real, la "
+"Cuando se realiza una valoración de inventario en tiempo real, la "
 "contrapartida para todos los movimientos de salida serán imputados en esta "
-"cuenta, a menos que se haya establecido una cuenta de valorización "
-"específica en la ubicación destino. Cuando no se establece en el producto, "
-"se usa la establecida en la categoría."
+"cuenta, a menos que se haya establecido una cuenta de valoración específica "
+"en la ubicación destino. Cuando no se establece en el producto, se usa la "
+"establecida en la categoría."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2069,6 +2150,17 @@ msgid ""
 "\n"
 "            * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"\n"
+"            * Borrador: no confirmado todavía y que no será planificado "
+"hasta que se confirme.\n"
+"* Esperando otra operación: esperando a otro movimiento antes de que se "
+"convierta automáticamente en disponible  (por ejemplo en flujos de "
+"\"realizar para el pedido\").\n"
+"* Esperando disponibilidad: esperando la disponibilidad de productos.\n"
+"* Listo para transferir: productos reservados, simplemente esperando su "
+"confirmación.\n"
+"* Transferidos: ha sido procesado, no puede ser modificado o cancelado.\n"
+"* Cancelado: ha sido cancelado. No puede ser confirmado otra vez."
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2089,7 +2181,7 @@ msgstr "Fecha"
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Es un seguidor"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2106,7 +2198,7 @@ msgstr "Ubicación stock"
 #: code:addons/stock/wizard/stock_partial_picking.py:96
 #, python-format
 msgid "_Deliver"
-msgstr ""
+msgstr "_Entregar"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
@@ -2134,6 +2226,16 @@ msgid ""
 "\n"
 "                 * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Borrador: no confirmado todavía y que no será planificado hasta que se "
+"confirme.\n"
+"* Esperando otra operación: esperando a otro movimiento antes de que se "
+"convierta automáticamente en disponible  (por ejemplo en flujos de realizar "
+"para el pedido).\n"
+"* Esperando disponibilidad: esperando la disponibilidad de productos.\n"
+"* Listo para transferir: productos reservados, simplemente esperando su "
+"confirmación.\n"
+"* Transferidos: ha sido procesado, no puede ser modificado o cancelado.\n"
+"* Cancelado: ha sido cancelado. No puede ser confirmado otra vez."
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -2149,7 +2251,7 @@ msgstr "Número lotes"
 #: model:ir.actions.act_window,name:stock.action_deliver_move
 #: view:product.product:0
 msgid "Deliveries"
-msgstr ""
+msgstr "Entregas"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2170,6 +2272,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para registrar una recepción de producto.\n"
+"</p><p>\n"
+"Aquí puede recibir productos individuales, no importa de qué pedido de "
+"compra o de qué albarán provengan. Encontrará la lista de todos los "
+"productos que está esperando. Una vez recibido un pedido, puede realizar un "
+"filtro basado en el nombre del proveedor o la referencia del pedido de "
+"venta. Puede confirmar entonces todos los productos recibidos usando los "
+"botones a la derecha de cada línea.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -2200,7 +2313,7 @@ msgstr "Devolver albarán"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
 msgid "Return Shipment"
-msgstr ""
+msgstr "Devolver envío"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -2229,7 +2342,7 @@ msgstr "Precio coste"
 #: view:product.product:0
 #: field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "Valoración inventario"
+msgstr "Valoración del inventario"
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2256,6 +2369,7 @@ msgstr ""
 msgid ""
 "The combination of Serial Number and internal reference must be unique !"
 msgstr ""
+"¡La combinación del nº de serie y la referencia interna debe ser única!"
 
 #. module: stock
 #: field:stock.warehouse,partner_id:0
@@ -2277,7 +2391,7 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2293,6 +2407,7 @@ msgstr "Precio"
 #: field:stock.config.settings,module_stock_invoice_directly:0
 msgid "Create and open the invoice when the user finish a delivery order"
 msgstr ""
+"Crear y abrir la factura cuando el usuario finalice la orden de entrega"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2302,7 +2417,7 @@ msgstr "Devolución de albarán"
 #. module: stock
 #: field:stock.config.settings,group_stock_inventory_valuation:0
 msgid "Generate accounting entries per stock movement"
-msgstr ""
+msgstr "Generar asientos contrables por cada movimiento de stock"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -2337,6 +2452,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Fuerza a especificar un número de serie para todos los movimientos que "
+"contienen este productos y son generados por una orden de fabricación"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_fill_inventory
@@ -2354,7 +2471,7 @@ msgstr "Nombre"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "Dirección del proveedor :"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2386,17 +2503,17 @@ msgstr "Ubicaciones de cliente"
 #: code:addons/stock/stock.py:2928
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "¡Error de usuario!"
 
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "Albarán parcial de stock"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice/Refund"
-msgstr ""
+msgstr "Crear factura/abono"
 
 #. module: stock
 #: help:stock.change.product.qty,message_ids:0
@@ -2404,7 +2521,7 @@ msgstr ""
 #: help:stock.picking.in,message_ids:0
 #: help:stock.picking.out,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Mensajes e historial de comunicación"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2432,7 +2549,7 @@ msgstr "Ubicación del proveedor"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "Ver inventario de productos"
 
 #. module: stock
 #: view:stock.move:0
@@ -2443,7 +2560,7 @@ msgstr "Creación"
 #: code:addons/stock/stock.py:1847
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "¡Operación prohibida!"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2473,7 +2590,7 @@ msgstr "Especificar el tipo de envío, para mercancias entrantes o salientes"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidad"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
@@ -2518,6 +2635,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear un movimiento de stock.\n"
+"</p><p>\n"
+"Este menú muestra una trazabilidad completa de las operaciones de inventario "
+"de un producto específico. Puede realizar un filtro en el producto para ver "
+"todos los movimientos pasados o futuros del mismo.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: view:stock.location:0
@@ -2550,12 +2675,12 @@ msgstr "Unidad de medida"
 #. module: stock
 #: field:stock.config.settings,group_stock_multiple_locations:0
 msgid "Manage multiple locations and warehouses"
-msgstr ""
+msgstr "Gestionar múltiples ubicaciones y almacenes"
 
 #. module: stock
 #: field:stock.config.settings,group_stock_production_lot:0
 msgid "Track serial number on products"
-msgstr ""
+msgstr "Rastrear nº de serie en los productos"
 
 #. module: stock
 #: field:stock.change.product.qty,message_unread:0
@@ -2563,7 +2688,7 @@ msgstr ""
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensajes sin leer"
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -2571,6 +2696,8 @@ msgid ""
 "Current quantity of products with this Serial Number available in company "
 "warehouses"
 msgstr ""
+"Cantidad actual de productos con este nº de serie disponible en los "
+"almacenes de la compañía"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2592,7 +2719,7 @@ msgstr "Lotes"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Transferir"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2629,7 +2756,7 @@ msgstr "Ctdad futura"
 #. module: stock
 #: model:res.groups,name:stock.group_production_lot
 msgid "Manage Serial Numbers"
-msgstr ""
+msgstr "Gestionar números de serie"
 
 #. module: stock
 #: field:stock.move,note:0
@@ -2642,7 +2769,7 @@ msgstr "Notas"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Transferred"
-msgstr ""
+msgstr "Transferido"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2663,7 +2790,7 @@ msgstr "Tipo de envío"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Partially"
-msgstr ""
+msgstr "Procesar parcialmente"
 
 #. module: stock
 #: view:stock.move:0
@@ -2686,7 +2813,7 @@ msgstr "Productos"
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Split Inventory Line"
-msgstr ""
+msgstr "Dividir línea de inventario"
 
 #. module: stock
 #: code:addons/stock/stock.py:2314
@@ -2695,6 +2822,8 @@ msgid ""
 "Cannot create Journal Entry, Output Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
+"No se puede crear el asiento. La cuenta de salida de este producto y la "
+"cuenta de valoración en la categoría de este producto son la misma."
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2735,6 +2864,8 @@ msgid ""
 "Please define stock input account for this product or its category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Define por favor la cuenta de entrada de stock para este producto o su "
+"categoría: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -2745,13 +2876,13 @@ msgstr "Retraso (días)"
 #: code:addons/stock/stock.py:2718
 #, python-format
 msgid "Missing partial picking data for move #%s."
-msgstr ""
+msgstr "Datos incompletos para el albarán parcial para el movimiento #%s."
 
 #. module: stock
 #: code:addons/stock/stock.py:1457
 #, python-format
 msgid "%s has been <b>cancelled</b>."
-msgstr ""
+msgstr "%s ha sido  <b>cancelado</b>."
 
 #. module: stock
 #: code:addons/stock/product.py:461
@@ -2762,7 +2893,7 @@ msgstr "Ctdad P&L"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_config_settings
 msgid "stock.config.settings"
-msgstr ""
+msgstr "Parámetros de configuración del stock"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -2789,7 +2920,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Suppliers"
-msgstr ""
+msgstr "Grandes proveedores"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2820,7 +2951,7 @@ msgstr "Crear"
 #. module: stock
 #: field:stock.change.product.qty,new_quantity:0
 msgid "New Quantity on Hand"
-msgstr ""
+msgstr "Nueva cantidad a mano"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2870,7 +3001,7 @@ msgstr "Cancelar el inventario"
 #. module: stock
 #: field:stock.config.settings,group_product_variant:0
 msgid "Support multiple variants per products  "
-msgstr ""
+msgstr "Permite múltiples variantes por producto  "
 
 #. module: stock
 #: code:addons/stock/stock.py:2317
@@ -2879,6 +3010,8 @@ msgid ""
 "Cannot create Journal Entry, Input Account of this product and Valuation "
 "account on category of this product are same."
 msgstr ""
+"No se puede crear el asiento. La cuenta de entrada de este producto y la "
+"cuenta de valoración en la categoría de este producto son la misma."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
@@ -2894,7 +3027,7 @@ msgstr "Ubicaciones fijas"
 #. module: stock
 #: field:report.stock.inventory,scrap_location:0
 msgid "scrap"
-msgstr ""
+msgstr "desecho"
 
 #. module: stock
 #: code:addons/stock/stock.py:1962
@@ -2903,22 +3036,24 @@ msgid ""
 "By changing the quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a Back Order."
 msgstr ""
+"Cambiando la cantidad aquí, acepta la nueva cantidad como completa: OpenERP "
+"no generará automáticamente un pedido en espera."
 
 #. module: stock
 #: code:addons/stock/product.py:113
 #, python-format
 msgid "Please specify company in Location."
-msgstr ""
+msgstr "Especifique por favor una compañía en 'Ubicación'."
 
 #. module: stock
 #: view:product.product:0
 msgid "On hand:"
-msgstr ""
+msgstr "A mano:"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by serial number"
-msgstr ""
+msgstr "Informe de stock por nº de serie"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2948,7 +3083,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "Por favor, cree facturas."
 
 #. module: stock
 #: help:stock.config.settings,module_product_expiry:0
@@ -2961,12 +3096,19 @@ msgid ""
 "    - alert date.\n"
 "This installs the module product_expiry."
 msgstr ""
+"Gestionar diversas fechas en los productos y los números de serie.\n"
+"Pueden seguirse las siguientes fechas:\n"
+"    - fecha de caducidad.\n"
+"    - fecha de correcta conservación.\n"
+"    - fecha de eliminación.\n"
+"    - fecha de alerta.\n"
+"Esto instala el módulo 'product_expiry'."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:173
 #, python-format
 msgid "Please provide proper Quantity."
-msgstr ""
+msgstr "Introduzca por favor una cantidad adecuada."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -3005,7 +3147,7 @@ msgstr "Forzar disponibilidad"
 #. module: stock
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Estante"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap
@@ -3016,7 +3158,7 @@ msgstr "Movimiento desecho"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Serial number is used to put a serial number on the production"
-msgstr ""
+msgstr "El nº de serie se usa para poner un nº de serie en la fabricación"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:99
@@ -3056,7 +3198,7 @@ msgstr "Fecha de realización."
 #: code:addons/stock/stock.py:1734
 #, python-format
 msgid "You cannot move product %s from a location of type view %s."
-msgstr ""
+msgstr "No puede mover el producto %s de una ubicación de tipo vista %s."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -3110,6 +3252,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir una ubicación.\n"
+"</p><p>\n"
+"Ésta es la estructura de los almacenes y ubicaciones de su compañía. Puede "
+"pulsar en una ubicación para obtener la lista de los productos y su nivel de "
+"stock en esa ubicación en particular y todos sus hijos.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -3119,7 +3269,7 @@ msgstr "Stock real"
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Logistic Serial Number"
-msgstr ""
+msgstr "Número de serie logístico"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:115
@@ -3127,6 +3277,8 @@ msgstr ""
 msgid ""
 "<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
 msgstr ""
+"<b>La cantidad ha sido cambiada</b> a <em>%s %s </em> para la ubicación "
+"<em>%s</em>."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -3148,11 +3300,13 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)."
 msgstr ""
+"Cantidad total después que la división exceda la cantidad a dividir para "
+"este producto: \"%s\" (id: %d)."
 
 #. module: stock
 #: view:stock.partial.move.line:0
 msgid "Stock Partial Move Line"
-msgstr ""
+msgstr "Línea de movimiento parcial de stock"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -3196,7 +3350,7 @@ msgstr "Dirección de contacto :"
 #: field:stock.production.lot.revision,lot_id:0
 #: field:stock.report.prodlots,prodlot_id:0
 msgid "Serial Number"
-msgstr ""
+msgstr "Nº de serie"
 
 #. module: stock
 #: help:stock.config.settings,group_stock_tracking_lot:0
@@ -3204,12 +3358,14 @@ msgid ""
 "When you select a serial number on product moves, you can get the upstream "
 "or downstream traceability of that product."
 msgstr ""
+"Cuando selecciona un nº de serie en los movimientos de producto, puede "
+"obtener la trazabilidad ascendente o descendente de ese producto."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:94
 #, python-format
 msgid "_Receive"
-msgstr ""
+msgstr "_Recibir"
 
 #. module: stock
 #: field:stock.incoterms,active:0
@@ -3280,6 +3436,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para registrar una recepción para este producto.\n"
+"</p><p>\n"
+"Aquí puede encontrar el historial de todas las recepciones relativas a este "
+"producto, así como las futuras recepciones que está esperando de sus "
+"proveedores.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -3295,6 +3459,8 @@ msgstr ""
 msgid ""
 "Allows to configure inventory valuations on products and product categories."
 msgstr ""
+"Permite configurar valoraciones de inventario en los productos y categorías "
+"de producto."
 
 #. module: stock
 #: help:stock.config.settings,module_stock_location:0
@@ -3306,6 +3472,11 @@ msgid ""
 "needs, etc.\n"
 "                This installs the module stock_location."
 msgstr ""
+"Provee flujos de inventario entrante y saliente. Los usos típicos de esta "
+"característica son: gestionar cadenas de fabricación de producto, gestionar "
+"ubicaciones por defecto para el producto, definir rutas en el almacén acorde "
+"a las necesidades de negocio, etc.\n"
+"Esto instala el módulo 'stock_location'."
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3339,6 +3510,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para registrar la entrega de un producto.\n"
+"</p>\n"
+"<p>\n"
+"Puede encontrar en esta lista todos los productos que tiene que entregar a "
+"sus clientes. Puede procesar las entregas directamente usando los botones a "
+"la derecha de cada línea. Puede filtrar los productos a entregar por "
+"cliente, producto o pedido de venta (usando el campo 'Origen').\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: view:stock.move:0
@@ -3365,7 +3546,7 @@ msgstr "Almacén"
 #. module: stock
 #: model:res.groups,name:stock.group_tracking_lot
 msgid "Manage Logistic Serial Numbers"
-msgstr ""
+msgstr "Gestionar números de serie logísticos"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -3386,12 +3567,20 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir un nº de seguimiento.\n"
+"</p><p>\n"
+"Ésta es la lista de todos sus paquetes. Cuando selecciona un paquete, puede "
+"obtener la trazabilidad ascendente o descendente de los productos contenidos "
+"en el paquete.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: code:addons/stock/stock.py:1441
 #, python-format
 msgid "%s %s %s has been <b>moved to</b> scrap."
-msgstr ""
+msgstr "%s %s %s ha sido <b>desechado</b>."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
@@ -3445,14 +3634,14 @@ msgstr ""
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Confirm & Receive"
-msgstr ""
+msgstr "Confirmar y recibir"
 
 #. module: stock
 #: field:stock.picking,origin:0
 #: field:stock.picking.in,origin:0
 #: field:stock.picking.out,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento origen"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -3478,7 +3667,7 @@ msgstr "Responsable"
 #. module: stock
 #: view:stock.move:0
 msgid "Process Entirely"
-msgstr ""
+msgstr "Procesar completamente"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3486,6 +3675,9 @@ msgid ""
 "This stock location will be used, instead of the default one, as the source "
 "location for stock moves generated by procurements."
 msgstr ""
+"Se usará esta ubicación de stock, en lugar de la de por defecto, como la "
+"ubicación origen para los movimientos de stock generados por los "
+"abastecimientos."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
@@ -3509,7 +3701,7 @@ msgstr "Stock"
 #: code:addons/stock/wizard/stock_return_picking.py:212
 #, python-format
 msgid "Returned Picking"
-msgstr ""
+msgstr "Albarán devuelto"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
@@ -3555,6 +3747,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para iniciar un inventario.\n"
+"</p><p>\n"
+"Los inventarios periódicos se usan para contar el nº de productos disponible "
+"por ubicación. Puede usar uno al año cuando se realice el inventario general "
+"o siempre que lo necesite, para adaptar el nivel actual de inventario de un "
+"producto.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3575,12 +3776,12 @@ msgstr "Movimientos internos asignados"
 #: code:addons/stock/stock.py:795
 #, python-format
 msgid "You cannot process picking without stock moves."
-msgstr ""
+msgstr "No puede procesar un albarán sin movimientos de stock."
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this serial number"
-msgstr ""
+msgstr "Movimientos para este nº de serie"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -3617,7 +3818,7 @@ msgstr "Pasillo (X)"
 #. module: stock
 #: field:stock.config.settings,group_stock_packaging:0
 msgid "Allow to define several packaging methods on products"
-msgstr ""
+msgstr "Permite definir varios métodos de empaquetado en los productos"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -3668,7 +3869,7 @@ msgstr "Productos por ubicación"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logística"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -3698,6 +3899,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir una ubicación.\n"
+"</p><p>\n"
+"Defina sus ubicaciones para reflejar la estructura y organización de su "
+"almacén. OpenERP puede manejar ubicaciones físicas (almacenes, estanterías, "
+"contenedores, etc), ubicaciones de empresa (clientes, proveedores) y "
+"ubicaciones virtuales que son contrapartida de operaciones de stock como los "
+"consumos de las órdenes de fabricación, inventarios, etc.\n"
+"</p><p>  \n"
+"Cada operación de stock en OpenERP mueve el producto de una ubicación a "
+"otra. Por ejemplo, si recibe productos de un proveedor, OpenERP moverá los "
+"productos de una ubicación de proveedor a la ubicación de stock. Cada "
+"informe puede realizarse sobre ubicaciones físicas, de empresa o virtuales.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
@@ -3714,7 +3930,7 @@ msgstr "Estante 1"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation time, usually the time of the order."
-msgstr ""
+msgstr "Hora de creación. Usualmente, la hora del pedido."
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3749,6 +3965,7 @@ msgstr "Envíos internos"
 #: field:stock.config.settings,group_uos:0
 msgid "Invoice products in a different unit of measure than the sale order"
 msgstr ""
+"Factura productos en una unidad de medida distinta a la del pedido de venta"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
@@ -3758,7 +3975,7 @@ msgstr "Activa cuenta relacionada"
 #. module: stock
 #: field:stock.location.product,type:0
 msgid "Analyse Type"
-msgstr ""
+msgstr "Tipo de análisis"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3774,6 +3991,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una envío a recibir.\n"
+"</p><p>\n"
+"Los envíos a recibir es la lista de todos los pedidos que recibirá de sus "
+"proveedores. Un envío a recibir contiene una lista de productos a ser "
+"recibidos de acuerdo con el pedido de compra original.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: view:stock.move:0
@@ -3790,7 +4015,7 @@ msgstr "Todo junto"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 msgid "Inventory Move"
-msgstr ""
+msgstr "Movimiento de inventario"
 
 #. module: stock
 #: code:addons/stock/product.py:471
@@ -3818,12 +4043,22 @@ msgid ""
 "\n"
 "                 * Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"* Borrador: no confirmado todavía y que no será planificado hasta que se "
+"confirme.\n"
+"* Esperando otra operación: esperando a otro movimiento antes de que se "
+"convierta automáticamente en disponible  (por ejemplo en flujos de "
+"\"realizar para el pedido\").\n"
+"* Esperando disponibilidad: esperando la disponibilidad de productos.\n"
+"* Listo para transferir: productos reservados, simplemente esperando su "
+"confirmación.\n"
+"* Transferidos: ha sido procesado, no puede ser modificado o cancelado.\n"
+"* Cancelado: ha sido cancelado. No puede ser confirmado otra vez."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_config_settings
 #: view:stock.config.settings:0
 msgid "Configure Warehouse"
-msgstr ""
+msgstr "Configurar almacén"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3851,7 +4086,7 @@ msgstr "Fechas de inventarios"
 #: model:ir.actions.act_window,name:stock.action_receive_move
 #: view:product.product:0
 msgid "Receptions"
-msgstr ""
+msgstr "Recepciones"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3886,13 +4121,13 @@ msgstr "Compañía"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida del producto"
 
 #. module: stock
 #: code:addons/stock/stock.py:1426
 #, python-format
 msgid "Delivery order"
-msgstr ""
+msgstr "Orden de entrega"
 
 #. module: stock
 #: view:stock.move:0
@@ -3944,11 +4179,11 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
-"Cuando se realiza una valorización de inventario en tiempo real, la "
+"Cuando se realiza una valoración de inventario en tiempo real, la "
 "contrapartida para todos los movimientos de salida serán imputados en esta "
-"cuenta, a menos que se haya establecido una cuenta de valorización "
-"específica en la ubicación destino. Éste es el valor por defecto para todos "
-"los productos en esta categoría. También se puede establecer directamente en "
+"cuenta, a menos que se haya establecido una cuenta de valoración específica "
+"en la ubicación destino. Éste es el valor por defecto para todos los "
+"productos en esta categoría. También se puede establecer directamente en "
 "cada producto."
 
 #. module: stock
@@ -3957,7 +4192,7 @@ msgstr ""
 #: field:stock.picking.in,message_ids:0
 #: field:stock.picking.out,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3999,6 +4234,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para definir un nuevo almacén.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -4020,7 +4259,7 @@ msgstr "Órdenes de entrega confirmadas"
 #: code:addons/stock/wizard/stock_return_picking.py:164
 #, python-format
 msgid "%s-return"
-msgstr ""
+msgstr "%s-devolución"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
@@ -4035,11 +4274,13 @@ msgid ""
 "The unit of measure rounding does not allow you to ship \"%s %s\", only "
 "roundings of \"%s %s\" is accepted by the Unit of Measure."
 msgstr ""
+"El redondeo de la unidad de medida no le permite enviar \"%s %s\", sólo "
+"múltiplos de \"%s %s\" se aceptan como unidad de medida."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Your Company, Chicago shop"
-msgstr ""
+msgstr "Su compañía, tienda de Chicago"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -4082,11 +4323,13 @@ msgid ""
 "By changing this quantity here, you accept the new quantity as complete: "
 "OpenERP will not automatically generate a back order."
 msgstr ""
+"Cambiando la cantidad aquí, acepta la nueva cantidad como completa: OpenERP "
+"no generará automáticamente un pedido en espera."
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Serial Number Revisions"
-msgstr ""
+msgstr "Revisiones del nº de serie"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
@@ -4104,7 +4347,7 @@ msgstr "Ordenes de entrega ya procesadas"
 #. module: stock
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Caso"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -4148,13 +4391,13 @@ msgstr ""
 #: field:stock.picking.in,message_follower_ids:0
 #: field:stock.picking.out,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: stock
 #: code:addons/stock/stock.py:2655
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
+msgstr "No se puede consumir un movimiento con cantidad negativa o nula."
 
 #. module: stock
 #: help:stock.config.settings,decimal_precision:0
@@ -4162,6 +4405,8 @@ msgid ""
 "As an example, a decimal precision of 2 will allow weights like: 9.99 kg, "
 "whereas a decimal precision of 4 will allow weights like:  0.0231 kg."
 msgstr ""
+"Como ejemplo, una precisión decimal de 2 permitirá pesos como 9.99 kh, "
+"cuando una precisión decimal de 4 permitiría pesos como: 0.0231 kg."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -4174,7 +4419,7 @@ msgstr "Cantidad de salida total"
 #: field:stock.picking.in,backorder_id:0
 #: field:stock.picking.out,backorder_id:0
 msgid "Back Order of"
-msgstr "Albarán relacionado de:"
+msgstr "Pedido en espera de"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0
@@ -4215,7 +4460,7 @@ msgstr "Configuración"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "Gestionar múltiples ubicaciones y almacenes"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4236,7 +4481,7 @@ msgstr ""
 #: code:addons/stock/stock.py:2881
 #, python-format
 msgid "INV:"
-msgstr ""
+msgstr "FV:"
 
 #. module: stock
 #: help:stock.config.settings,module_stock_invoice_directly:0
@@ -4245,6 +4490,9 @@ msgid ""
 "                to be invoiced when you send or deliver goods.\n"
 "                This installs the module stock_invoice_directly."
 msgstr ""
+"Permite el lanzamiento automático del asistente de facturación si la entrega "
+"debe ser facturada cuando se envíen o entreguen bienes.\n"
+"Esto instala el módulo 'stock_invoice_directly'."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -4272,6 +4520,12 @@ msgid ""
 "this quantity on assigned moves affects the product reservation, and should "
 "be done with care."
 msgstr ""
+"Ésta es la cantidad de productos desde un punto de vista de inventario. Para "
+"movimientos en el estado 'Realizado', ésta es la cantidad de productos que "
+"se movieron realmente. Para otros movimiento, ésta es la cantidad de "
+"producto que está planeado mover. Disminuyendo esta cantidad no se genera un "
+"pedido en espera. Cambiando esta cantidad en movimientos asignados, afecta "
+"la reserva de producto, y debe ser realizado con cuidado."
 
 #. module: stock
 #: code:addons/stock/stock.py:1411
@@ -4288,7 +4542,7 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
-"Usado para una valorización en tiempo real del inventario. Cuando está "
+"Usado para una valoración en tiempo real del inventario. Cuando está "
 "establecido en una ubicación virtual (no de tipo interno), esta cuenta se "
 "usará para mantener el valor de los productos que son movidos de una "
 "ubicación interna a esta ubicación, en lugar de la cuenta de salida de stock "
@@ -4322,7 +4576,7 @@ msgstr "Auto validar"
 #: code:addons/stock/stock.py:1892
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "¡Stock insuficiente para el nº de serie!"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4369,24 +4623,26 @@ msgstr ""
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique Serial Number, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Nº de serie único, será mostrado como: PREFIJO/NUM_SERIE [REF_INT]"
 
 #. module: stock
 #: code:addons/stock/product.py:142
 #, python-format
 msgid "Please define stock input account for this product: \"%s\" (id: %d)."
 msgstr ""
+"Defina por favor una cuenta de entrada de stock para este producto: \"%s\" "
+"(id: %d)."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 msgid "Incoming  Products"
-msgstr ""
+msgstr "Productos a recibir"
 
 #. module: stock
 #: view:product.product:0
 msgid "update"
-msgstr ""
+msgstr "actualizar"
 
 #. module: stock
 #: view:stock.change.product.qty:0
@@ -4405,7 +4661,7 @@ msgstr ""
 #: view:stock.return.picking:0
 #: view:stock.split.into:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -4453,7 +4709,7 @@ msgstr "Auto-Albarán"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Customer Address :"
-msgstr ""
+msgstr "Dirección del cliente :"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
@@ -4521,17 +4777,20 @@ msgid ""
 "Please define inventory valuation account on the product category: \"%s\" "
 "(id: %d)"
 msgstr ""
+"Defina por favor la cuenta de valoración de inventario en la categoría de "
+"producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Serial Number Revision"
-msgstr ""
+msgstr "Revisión del nº de serie"
 
 #. module: stock
 #: code:addons/stock/product.py:96
 #, python-format
 msgid "Specify valuation Account for Product Category: %s."
 msgstr ""
+"Especifique una cuenta de valoración para la categoría de producto: %s."
 
 #. module: stock
 #: help:stock.config.settings,module_claim_from_delivery:0
@@ -4539,12 +4798,14 @@ msgid ""
 "Adds a Claim link to the delivery order.\n"
 "                This installs the module claim_from_delivery."
 msgstr ""
+"Añade un enlace de una reclamación a la orden de entrega.\n"
+"Esto instala el módulo 'claim_from_delivery'."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:198
 #, python-format
 msgid "Please specify at least one non-zero quantity."
-msgstr ""
+msgstr "Especifique por favor al menos una cantidad no nula."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -4559,7 +4820,7 @@ msgstr "Usuario"
 #. module: stock
 #: field:stock.config.settings,module_stock_location:0
 msgid "Create push/pull logistic rules"
-msgstr ""
+msgstr "Crear reglas logísticas entrantes/salientes"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -4589,7 +4850,7 @@ msgstr "Ctdad no planificada"
 #: field:stock.picking.out,message_comment_ids:0
 #: help:stock.picking.out,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentarios y correos electrónicos"
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
@@ -4619,7 +4880,7 @@ msgstr "Enero"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
 
 #. module: stock
 #: help:stock.config.settings,group_stock_production_lot:0
@@ -4628,6 +4889,9 @@ msgid ""
 "a serial number on product moves, you can get the upstream or downstream "
 "traceability of that product."
 msgstr ""
+"Esto permite gestionar producto usando números de serie. Cuando selecciona "
+"un nº de serie en los movimientos de producto, puede obtener la trazabilidad "
+"ascendente y descendente del mismo."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:124
@@ -4635,6 +4899,8 @@ msgstr ""
 msgid ""
 "No product in this location. Please select a location in the product form."
 msgstr ""
+"No hay productos en esta ubicación. Seleccione por favor una ubicación en el "
+"formulario de producto."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -4686,6 +4952,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir una orden de entrega para este producto.\n"
+"</p><p>\n"
+"Aquí podrá encontrar el historial de todos las entregas pasadas relativas a "
+"este producto, así como todos los productos que debe entregar a los "
+"clientes.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -4703,6 +4977,8 @@ msgid ""
 "If this shipment was split, then this field links to the shipment which "
 "contains the already processed part."
 msgstr ""
+"Si se dividió el envío, entonces este campo enlaza con el envío que contenga "
+"la parte ya procesada."
 
 #. module: stock
 #: view:stock.inventory:0
@@ -4721,7 +4997,7 @@ msgstr "Prefijo"
 #: view:stock.move:0
 #: view:stock.move.split:0
 msgid "Split in Serial Numbers"
-msgstr ""
+msgstr "Separar en números de serie"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -4731,11 +5007,11 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
-"Cuando se realiza una valorización de inventario en tiempo real, la "
+"Cuando se realiza una valoración de inventario en tiempo real, la "
 "contrapartida para todos los movimientos de entrada serán imputados en esta "
-"cuenta, a menos que se haya establecido una cuenta de valorización "
-"específica en la ubicación fuente. Cuando no se establece en el producto, se "
-"usa la establecida en la categoría."
+"cuenta, a menos que se haya establecido una cuenta de valoración específica "
+"en la ubicación fuente. Cuando no se establece en el producto, se usa la "
+"establecida en la categoría."
 
 #. module: stock
 #: view:stock.move:0
@@ -4758,7 +5034,7 @@ msgstr "Ubicación destino"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Picking Slip"
-msgstr ""
+msgstr "Vale del albarán"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -4771,12 +5047,12 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Delays"
-msgstr ""
+msgstr "Retrasos"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "Fecha planificada"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -4826,7 +5102,7 @@ msgstr "Mayo"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "¡No hay diferencias entre el precio estándar y el nuevo precio!"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4841,7 +5117,7 @@ msgstr "Entrega"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import the current inventory"
-msgstr ""
+msgstr "Importar el inventario actual"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5
@@ -4877,7 +5153,7 @@ msgstr "Tipo ubicaciones encadenadas"
 #: help:stock.picking.in,min_date:0
 #: help:stock.picking.out,min_date:0
 msgid "Scheduled time for the shipment to be processed"
-msgstr ""
+msgstr "Tiempo planificado para que se procese el envío"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -4924,6 +5200,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para añadir un nº de serie.\n"
+"</p><p>\n"
+"Ésta es la lista de todos los lotes de producción que ha grabado. Cuando "
+"seleccione un lote, puede obtener la trazabilidad ascendente y descendente "
+"de los productos contenidos en el lote. Por defecto, la lista está filtrada "
+"con los números de serie que están disponibles en su almacén, pero puede "
+"desmarcar el botón 'Disponible' para obtener todos los lotes fabricados, "
+"recibidos o entregados a los clientes.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: help:stock.config.settings,group_stock_multiple_locations:0
@@ -4931,11 +5218,13 @@ msgid ""
 "This allows to configure and use multiple stock locations and warehouses,\n"
 "                instead of having a single default one."
 msgstr ""
+"Permite configurar y usar múltiples ubicaciones de stock y almacenes, en "
+"lugar de tener un único por defecto."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm & Transfer"
-msgstr ""
+msgstr "Confirmar y transferir"
 
 #. module: stock
 #: field:stock.location,scrap_location:0
@@ -4981,6 +5270,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una orden de entrega.\n"
+"</p><p>\n"
+"Ésta es la lista de todas las órdenes de entrega que deben ser preparadas, "
+"de acuerdo a los diferentes pedidos de venta y reglas logísticas.\n"
+"</p>\n"
+"            "
 
 #. module: stock
 #: help:stock.tracking,name:0
@@ -5031,7 +5327,7 @@ msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Print Delivery Slip"
-msgstr ""
+msgstr "Imprimir vale de entrega"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -5054,7 +5350,7 @@ msgstr "Preparado para procesarse"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "Dirección del almacén:"
 
 #~ msgid "Packing list"
 #~ msgstr "Albarán"
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 2e7070620db..21b66600c1e 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-17 16:13+0000\n"
+"PO-Revision-Date: 2012-12-18 21:43+0000\n"
 "Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \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-18 04:59+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -544,6 +544,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Če je na izdelku omogočeno sprotno vrednotenje zalog, bo ta konto prikazal "
+"tekočo vrednost izdelkov."
 
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
@@ -645,7 +647,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr ""
+msgstr "Prejem/Dobava izdelkov"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -813,7 +815,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location.product,type:0
 msgid "Analyse Current Inventory"
-msgstr ""
+msgstr "Analiza trenutne zaloge"
 
 #. module: stock
 #: code:addons/stock/stock.py:1202
@@ -862,7 +864,7 @@ msgstr "Vsebuje"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Postavka inventure"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -890,7 +892,7 @@ msgstr "Povzetek"
 #. module: stock
 #: view:product.category:0
 msgid "Account Stock Properties"
-msgstr ""
+msgstr "Lastnosti konta zalog"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -1451,7 +1453,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Oznaka paketa"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1537,7 +1539,7 @@ msgstr "Pogled koledarja"
 #. module: stock
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Dobavni rok"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1649,13 +1651,13 @@ msgstr "Naslov kupca oz. dobavitelja"
 #: code:addons/stock/stock.py:1434
 #, python-format
 msgid "%s has been <b>created</b>."
-msgstr ""
+msgstr "%s je <b>ustvarjen</b>."
 
 #. module: stock
 #: code:addons/stock/stock.py:1438
 #, python-format
 msgid "%s has been <b>confirmed</b>."
-msgstr ""
+msgstr "%s je <b>potrjen</b>."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1877,7 +1879,7 @@ msgstr "Prekliči razpoložljivost"
 #: code:addons/stock/wizard/stock_location_product.py:49
 #, python-format
 msgid "Current Inventory"
-msgstr ""
+msgstr "Trenutna zaloga"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -2009,7 +2011,7 @@ msgstr "Datum"
 #: field:stock.picking.in,message_is_follower:0
 #: field:stock.picking.out,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Je sledilec"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2020,7 +2022,7 @@ msgstr ""
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr ""
+msgstr "Lokacija zaloge"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:96
@@ -2172,7 +2174,7 @@ msgstr ""
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of Serial Number and internal reference must be unique !"
-msgstr ""
+msgstr "Kombinacija serijske številke in interne oznake mora biti enolična!"
 
 #. module: stock
 #: field:stock.warehouse,partner_id:0
@@ -2195,7 +2197,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Načrtovani dobavni rok (dnevi)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
@@ -2297,12 +2299,12 @@ msgstr "Lokacije kupca"
 #: code:addons/stock/stock.py:2928
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Napaka uporabnika!"
 
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Stock partial Picking"
-msgstr ""
+msgstr "Delni prevzem zaloge"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2351,7 +2353,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1847
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "Prepovedana operacija !"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2468,7 +2470,7 @@ msgstr ""
 #: field:stock.picking.in,message_unread:0
 #: field:stock.picking.out,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Neprebrana sporočila"
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -2497,7 +2499,7 @@ msgstr "Veliko"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "_Transfer"
-msgstr ""
+msgstr "_Prenos"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2523,7 +2525,7 @@ msgstr "Notranja lokacija"
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "Nadzorna plošča skladišča"
 
 #. module: stock
 #: code:addons/stock/product.py:465
@@ -2547,7 +2549,7 @@ msgstr "Opombe"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Transferred"
-msgstr ""
+msgstr "Prenešeno"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2563,7 +2565,7 @@ msgstr "Vrednost"
 #: field:stock.picking.in,type:0
 #: field:stock.picking.out,type:0
 msgid "Shipping Type"
-msgstr ""
+msgstr "Vrsta odpreme"
 
 #. module: stock
 #: view:stock.move:0
@@ -2643,7 +2645,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Zamuda(dni)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2718
@@ -2655,7 +2657,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1457
 #, python-format
 msgid "%s has been <b>cancelled</b>."
-msgstr ""
+msgstr "%s je <b>preklican</b>."
 
 #. module: stock
 #: code:addons/stock/product.py:461
@@ -2687,7 +2689,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Big Suppliers"
-msgstr ""
+msgstr "Večji dobavitelji"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2806,7 +2808,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "On hand:"
-msgstr ""
+msgstr "Na zalogi:"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -2855,7 +2857,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:173
 #, python-format
 msgid "Please provide proper Quantity."
-msgstr ""
+msgstr "Prosim zagotovite ustrezno količino."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2911,7 +2913,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:99
 #, python-format
 msgid "Receive Products"
-msgstr ""
+msgstr "Prejem izdelkov"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:101
@@ -3151,6 +3153,9 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
+"Incoterms je zbirka terminov, ki se uporabljajo za določanje pravic in "
+"obveznosti strank v zvezi z dobavo blaga, razporeditvijo stroškov in prehodu "
+"nevarnosti s prodajalca na kupca."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_receive_move
@@ -3374,7 +3379,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Analiza zaloge"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -3478,7 +3483,7 @@ msgstr "Višina (Z)"
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Potrebni izdelki"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3989,7 +3994,7 @@ msgstr "Potrdi"
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Ikona v hierarhični drevesni strukturi"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
@@ -4019,7 +4024,7 @@ msgstr "Sledilci"
 #: code:addons/stock/stock.py:2655
 #, python-format
 msgid "Cannot consume a move with negative or zero quantity."
-msgstr ""
+msgstr "Količina ne sme biti 0 ali manj od 0"
 
 #. module: stock
 #: help:stock.config.settings,decimal_precision:0
@@ -4080,7 +4085,7 @@ msgstr "Konfiguracija"
 #. module: stock
 #: model:res.groups,name:stock.group_locations
 msgid "Manage Multiple Locations and Warehouses"
-msgstr ""
+msgstr "Upravljanje z več različnimi lokacijami in skladišči"
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -4176,7 +4181,7 @@ msgstr "Samodejno preveri"
 #: code:addons/stock/stock.py:1892
 #, python-format
 msgid "Insufficient Stock for Serial Number !"
-msgstr ""
+msgstr "Nezadostna zaloga za serijsko številko !"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -4663,7 +4668,7 @@ msgstr "Maj"
 #: code:addons/stock/product.py:110
 #, python-format
 msgid "No difference between standard price and new price!"
-msgstr ""
+msgstr "Ni razlike med standardno in novo ceno!"
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -4695,7 +4700,7 @@ msgstr ""
 #: code:addons/stock/product.py:473
 #, python-format
 msgid "Produced Qty"
-msgstr ""
+msgstr "Proizvedena količina"
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
@@ -4883,7 +4888,7 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Warehouse Address :"
-msgstr ""
+msgstr "Naslov skladišča:"
 
 #~ msgid "LIFO"
 #~ msgstr "LIFO"
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index 418425300a6..49fd9f4d761 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-13 18:18+0000\n"
+"PO-Revision-Date: 2012-12-18 06:05+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.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-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company the pickings and moves belong."
-msgstr ""
+msgstr "zu welchem Unternhemen gehören die Lieferscheine und Lagerbuchungen"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -196,7 +196,7 @@ msgstr "Disponiere vom Lager"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr ""
+msgstr "Von anderem Lager bezogen"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index ab98efdf48e..3fd63ba9423 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -8,14 +8,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: 2012-01-13 18:10+0000\n"
+"PO-Revision-Date: 2012-12-18 06:04+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.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-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -175,7 +175,7 @@ msgstr "Tage"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index a44a1b539a6..082af7fce60 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.po
@@ -7,14 +7,15 @@ 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: 2011-01-23 09:41+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-18 17:24+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \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:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:15+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -66,7 +67,7 @@ msgstr "Semanas"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "Status"
-msgstr ""
+msgstr "Situação"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
@@ -175,7 +176,7 @@ msgstr "Dias"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index c1f9e34fcc9..d1938c6dbef 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/i18n/de.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-02-08 11:57+0000\n"
+"PO-Revision-Date: 2012-12-18 06:03+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \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-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -25,7 +25,7 @@ msgstr "Einkaufspositionen"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "Wareneingang"
 
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
@@ -219,7 +219,7 @@ msgstr "Verkaufsauftrag"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "Warenauslieferung"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po
index 7b049be508d..552ab8a62d9 100644
--- a/addons/web/i18n/et.po
+++ b/addons/web/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-30 18:13+0000\n"
-"PO-Revision-Date: 2012-12-17 20:17+0000\n"
+"PO-Revision-Date: 2012-12-18 18:50+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
 "Language-Team: Estonian <et@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-18 05:08+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:22+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web
 #. openerp-web
@@ -147,7 +147,7 @@ msgstr "Fail"
 #: code:addons/web/controllers/main.py:842
 #, python-format
 msgid "You cannot leave any password empty."
-msgstr ""
+msgstr "Sa ei saa jätta ühtegi salasõna tühjaks."
 
 #. module: web
 #. openerp-web
@@ -192,7 +192,7 @@ msgstr "Versioon"
 #: code:addons/web/static/src/xml/base.xml:564
 #, python-format
 msgid "Latest Modification Date:"
-msgstr ""
+msgstr "Viimase muudatuse kuupäev:"
 
 #. module: web
 #. openerp-web
@@ -213,7 +213,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1583
 #, python-format
 msgid "Share with all users"
-msgstr ""
+msgstr "Jaga kõigi kasutajatega"
 
 #. module: web
 #. openerp-web
@@ -242,7 +242,7 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:1299
 #, python-format
 msgid "not a valid number"
-msgstr ""
+msgstr "ei ole korrektne number"
 
 #. module: web
 #. openerp-web
@@ -263,7 +263,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_list.js:1319
 #, python-format
 msgid "Undefined"
-msgstr ""
+msgstr "Määramata"
 
 #. module: web
 #. openerp-web
@@ -277,7 +277,7 @@ msgstr ""
 #: code:addons/web/static/src/js/coresetup.js:598
 #, python-format
 msgid "about a month ago"
-msgstr ""
+msgstr "umbes kuu eest"
 
 #. module: web
 #. openerp-web
@@ -298,7 +298,7 @@ msgstr "Nupu tüüp:"
 #: code:addons/web/static/src/xml/base.xml:419
 #, python-format
 msgid "OpenERP SA Company"
-msgstr ""
+msgstr "OpenERP SA Ettevõte"
 
 #. module: web
 #. openerp-web
@@ -377,7 +377,7 @@ msgstr "Valik:"
 #: code:addons/web/static/src/js/view_form.js:869
 #, python-format
 msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Järgnevad väljad on vigased:"
 
 #. module: web
 #: code:addons/web/controllers/main.py:863
@@ -390,7 +390,7 @@ msgstr "Keeled"
 #: code:addons/web/static/src/xml/base.xml:1245
 #, python-format
 msgid "...Upload in progress..."
-msgstr ""
+msgstr "...Toimub üleslaadimine..."
 
 #. module: web
 #. openerp-web
@@ -447,7 +447,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:413
 #, python-format
 msgid "Activate the developer mode"
-msgstr ""
+msgstr "Aktiveeri arendusreziim"
 
 #. module: web
 #. openerp-web
@@ -468,7 +468,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_list.js:684
 #, python-format
 msgid "You must select at least one record."
-msgstr ""
+msgstr "Sa pead valima vähemalt ühe kirje."
 
 #. module: web
 #. openerp-web
@@ -489,7 +489,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:956
 #, python-format
 msgid "Relation:"
-msgstr ""
+msgstr "Seos:"
 
 #. module: web
 #. openerp-web
@@ -503,7 +503,7 @@ msgstr "vähe kui minuti eest"
 #: code:addons/web/static/src/xml/base.xml:829
 #, python-format
 msgid "Condition:"
-msgstr ""
+msgstr "Seisukord:"
 
 #. module: web
 #. openerp-web
@@ -524,7 +524,7 @@ msgstr ""
 #: code:addons/web/static/src/js/chrome.js:549
 #, python-format
 msgid "Restored"
-msgstr ""
+msgstr "Taastatud"
 
 #. module: web
 #. openerp-web
@@ -559,7 +559,7 @@ msgstr ""
 #: code:addons/web/static/src/js/search.js:1963
 #, python-format
 msgid "is not"
-msgstr ""
+msgstr "ei ole"
 
 #. module: web
 #. openerp-web
@@ -587,7 +587,7 @@ msgstr "UTF-8"
 #: code:addons/web/static/src/xml/base.xml:421
 #, python-format
 msgid "For more information visit"
-msgstr ""
+msgstr "Rohkema info saamiseks külastage"
 
 #. module: web
 #. openerp-web
@@ -601,7 +601,7 @@ msgstr "Lisa kogu info..."
 #: code:addons/web/static/src/xml/base.xml:1658
 #, python-format
 msgid "Export Formats"
-msgstr ""
+msgstr "Ekspordi formaadid"
 
 #. module: web
 #. openerp-web
@@ -666,7 +666,7 @@ msgstr "Toimingu ID:"
 #: code:addons/web/static/src/xml/base.xml:453
 #, python-format
 msgid "Your user's preference timezone does not match your browser timezone:"
-msgstr ""
+msgstr "Sinu kasutaja ajatsoon ei ühti brauseri ajatsooniga."
 
 #. module: web
 #. openerp-web
@@ -751,7 +751,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_list.js:325
 #, python-format
 msgid "Unlimited"
-msgstr ""
+msgstr "Piiramatu"
 
 #. module: web
 #. openerp-web
@@ -834,7 +834,7 @@ msgstr "OpenERP.com"
 #: code:addons/web/static/src/js/view_form.js:2316
 #, python-format
 msgid "Can't send email to invalid e-mail address"
-msgstr ""
+msgstr "Ei saa saata kirja vigasele e-posti aadressile"
 
 #. module: web
 #. openerp-web
@@ -1108,7 +1108,7 @@ msgstr "Laadimine..."
 #: code:addons/web/static/src/xml/base.xml:561
 #, python-format
 msgid "Latest Modification by:"
-msgstr ""
+msgstr "Viimase muudatuse tegija:"
 
 #. module: web
 #. openerp-web
@@ -1137,7 +1137,7 @@ msgstr "%d / %d"
 #: code:addons/web/static/src/xml/base.xml:1757
 #, python-format
 msgid "2. Check your file format"
-msgstr ""
+msgstr "2. Kontrolli oma faili formaati"
 
 #. module: web
 #. openerp-web
@@ -1324,7 +1324,7 @@ msgstr "Salvesta kui..."
 #: code:addons/web/static/src/js/view_form.js:4971
 #, python-format
 msgid "Could not display the selected image."
-msgstr ""
+msgstr "Ei saa kuvada valitud pilti."
 
 #. module: web
 #. openerp-web
@@ -1790,7 +1790,7 @@ msgstr "Domeen:"
 #: code:addons/web/static/src/xml/base.xml:812
 #, python-format
 msgid "Default:"
-msgstr ""
+msgstr "Vaikimisi:"
 
 #. module: web
 #. openerp-web
@@ -1815,7 +1815,7 @@ msgstr "Andmebaas:"
 #: code:addons/web/static/src/xml/base.xml:1215
 #, python-format
 msgid "Uploading ..."
-msgstr ""
+msgstr "Üleslaadimine ..."
 
 #. module: web
 #. openerp-web
@@ -1829,14 +1829,14 @@ msgstr "Nimi:"
 #: code:addons/web/static/src/js/chrome.js:1027
 #, python-format
 msgid "About"
-msgstr ""
+msgstr "Infot"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1406
 #, python-format
 msgid "Search Again"
-msgstr ""
+msgstr "Otsi Uuesti"
 
 #. module: web
 #. openerp-web
@@ -2004,7 +2004,7 @@ msgstr "Ok"
 #: code:addons/web/static/src/js/views.js:1163
 #, python-format
 msgid "Uploading..."
-msgstr ""
+msgstr "Üleslaadimine..."
 
 #. module: web
 #. openerp-web
@@ -2348,7 +2348,7 @@ msgstr "Filter"
 #: code:addons/web/static/src/xml/base.xml:928
 #, python-format
 msgid "Widget:"
-msgstr ""
+msgstr "Vidin:"
 
 #. module: web
 #. openerp-web
@@ -2549,7 +2549,7 @@ msgstr "Tagasi sisenemiskuvale"
 #: code:addons/web/static/src/xml/base.xml:1429
 #, python-format
 msgid "Filters"
-msgstr ""
+msgstr "Filtrid"
 
 #~ msgid "Translations"
 #~ msgstr "Tõlked"
diff --git a/addons/web_linkedin/i18n/ro.po b/addons/web_linkedin/i18n/ro.po
index c37f11fa10a..8997f261e33 100644
--- a/addons/web_linkedin/i18n/ro.po
+++ b/addons/web_linkedin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
-"X-Generator: Launchpad (build 16372)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: web_linkedin
 #: view:sale.config.settings:0
diff --git a/addons/web_shortcuts/i18n/sl.po b/addons/web_shortcuts/i18n/sl.po
new file mode 100644
index 00000000000..0d227589eee
--- /dev/null
+++ b/addons/web_shortcuts/i18n/sl.po
@@ -0,0 +1,25 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-12-18 22:32+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
+"Language-Team: Slovenian <sl@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-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Dodaj / Odstrani bližnjico..."

From 5822bfa5ba604c34d21dc5c8481daef4bb9c34e7 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 19 Dec 2012 09:58:36 +0100
Subject: [PATCH 13/22] [FIX] hr_holidays: workflow transition was missing
 signal for first validation

bzr revid: rco@openerp.com-20121219085836-eawn6pn44flnytwu
---
 addons/hr_holidays/hr_holidays_workflow.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index a2e1d54f96c..b729ea54a30 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -77,6 +77,7 @@
     <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate1" />
+        <field name="signal">validate</field>
         <field name="condition">double_validation</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>

From 7fc896564b9ebd640119dc4a5b654a19c8d8bc1f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 19 Dec 2012 10:35:57 +0100
Subject: [PATCH 14/22] [IMP] Use _.debounce helper for lazy reflow

bzr revid: fme@openerp.com-20121219093557-g1of11sh45rn05xg
---
 addons/web/static/src/js/chrome.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 3812a00d8f3..ffc98693470 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -813,18 +813,8 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
-        var resizing_timer = null;
-        instance.web.bus.on('resize', this, function(ev) {
-            if (resizing_timer) {
-                clearTimeout(resizing_timer);
-            } else {
-                self.$el.hide();
-            }
-            resizing_timer = setTimeout(function() {
-                self.reflow();
-                resizing_timer = null;
-            }, 300);
-        });
+        var lazyreflow = _.debounce(this.reflow.bind(this), 300);
+        instance.web.bus.on('resize', this, lazyreflow);
     },
     start: function() {
         this._super.apply(this, arguments);

From b63518345ec549432529e142973c1d4d60b2e8b4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 19 Dec 2012 10:38:16 +0100
Subject: [PATCH 15/22] [FIX] web_services: fix incorrect query to set admin's
 password and lang

bzr revid: rco@openerp.com-20121219093816-atf0p0jtuwv6hd31
---
 openerp/service/web_services.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py
index d393dfa1003..5b88e0fd880 100644
--- a/openerp/service/web_services.py
+++ b/openerp/service/web_services.py
@@ -77,11 +77,11 @@ def _initialize_db(serv, id, db_name, demo, lang, user_password):
             mids = modobj.search(cr, SUPERUSER_ID, [('state', '=', 'installed')])
             modobj.update_translations(cr, SUPERUSER_ID, mids, lang)
 
-        cr.execute('UPDATE res_users SET password=%s, lang=%s, active=True WHERE login=%s', (
-            user_password, lang, 'admin'))
-        cr.execute('SELECT login, password ' \
-                   ' FROM res_users ' \
-                   ' ORDER BY login')
+        # update admin's password and lang
+        values = {'password': user_password, 'lang': lang}
+        pool.get('res.users').write(cr, SUPERUSER_ID, [SUPERUSER_ID], values)
+
+        cr.execute('SELECT login, password FROM res_users ORDER BY login')
         serv.actions[id].update(users=cr.dictfetchall(), clean=True)
         cr.commit()
         cr.close()

From 0272bd4aecdfd44e900ba7486a1da4ecbdb74dee Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 19 Dec 2012 10:55:50 +0100
Subject: [PATCH 16/22] [IMP] Take menu out of the rendering flow during the
 window resize

bzr revid: fme@openerp.com-20121219095550-8imsql4rl4up1hw2
---
 addons/web/static/src/js/chrome.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ffc98693470..db418eb6827 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -813,8 +813,11 @@ instance.web.Menu =  instance.web.Widget.extend({
                 });
             }
         });
-        var lazyreflow = _.debounce(this.reflow.bind(this), 300);
-        instance.web.bus.on('resize', this, lazyreflow);
+        var lazyreflow = _.debounce(this.reflow.bind(this), 200);
+        instance.web.bus.on('resize', this, function() {
+            self.$el.height(0);
+            lazyreflow();
+        });
     },
     start: function() {
         this._super.apply(this, arguments);
@@ -859,7 +862,7 @@ instance.web.Menu =  instance.web.Widget.extend({
      */
     reflow: function() {
         var self = this;
-        this.$el.show();
+        this.$el.height('auto').show();
         var $more_container = this.$('.oe_menu_more_container').hide();
         var $more = this.$('.oe_menu_more');
         $more.children('li').insertBefore($more_container);

From 5ab624b11e173da99d3059e10d34aa35e4562de8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 19 Dec 2012 11:13:15 +0100
Subject: [PATCH 17/22] [FIX] res.users: context_get cache was not cleared
 properly, due to braindead implementation of ormcache (skiparg is misused and
 off by 1 in clear_cache)

Discarding the cache completely is suboptimal but
makes the code simpler, and this is not performance
critical anyway. The cache is mostly useful during
module installation, which involves no call to clear_cache.

bzr revid: odo@openerp.com-20121219101315-1ccuwm6nvmov12zv
---
 openerp/addons/base/res/res_users.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index a2301cec37e..df83f0ac1e3 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -299,8 +299,7 @@ class res_users(osv.osv):
             for id in ids:
                 if id in self._uid_cache[db]:
                     del self._uid_cache[db][id]
-        self.context_get.clear_cache(self, cr)
-
+        self.context_get.clear_cache(self)
         return res
 
     def unlink(self, cr, uid, ids, context=None):

From 698369a0cff70bad9a2f2ea78848bcef9cd10da4 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 19 Dec 2012 11:26:52 +0100
Subject: [PATCH 18/22] [IMP] project_issue: make extra info visible to project
 managers

bzr revid: rco@openerp.com-20121219102652-q5dov3t02l2kjqfl
---
 addons/project_issue/project_issue_view.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 279fec28411..dc712852be5 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -95,9 +95,8 @@
                         <page string="Description">
                             <field name="description" placeholder="Add an internal note..." groups="base.group_user"/>
                         </page>
-                        <page string="Extra Info" groups="base.group_no_one">
-                            <group col="4" colspan="4">
-                                <separator string="Statistics" colspan="4" col="4"/>
+                        <page string="Extra Info" groups="project.group_project_manager">
+                            <group string="Statistics">
                                 <field name="day_open"/>
                                 <field name="day_close"/>
                                 <field name="working_hours_open" widget="float_time"/>
@@ -105,14 +104,12 @@
                                 <field name="inactivity_days"/>
                                 <field name="days_since_creation"/>
                             </group>
-                            <group colspan="4" col="4">
-                                <separator string="References" colspan="4"/>
+                            <group string="References">
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
-                            <group colspan="4" col="4" invisible="1">
-                                <separator string="Status" colspan="4"/>
-                                <field name="state" groups="base.group_no_one" string="Status"/>
+                            <group string="Status" groups="base.group_no_one">
+                                <field name="state" string="Status"/>
                             </group>
                         </page>
                     </notebook>

From ac0045d3c36cc91306ff85e500e3abc61a9cf14e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 19 Dec 2012 11:40:25 +0100
Subject: [PATCH 19/22] [DOC] Document full.css

bzr revid: fme@openerp.com-20121219104025-bg4o1v6y90csxjjd
---
 addons/web/static/src/css/full.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css
index 7f3a2f60ea4..2692792d46d 100644
--- a/addons/web/static/src/css/full.css
+++ b/addons/web/static/src/css/full.css
@@ -1,6 +1,12 @@
+/* This css contains the styling specific to the 'normal mode'. (as opposite to the embedded mode) */
+/* In embedded mode [1], this stylesheet won't be loaded. */
+
+/* [1] The web client features an embedded mode in which the webclient */
+/*     or a part of it can be started in any element of any webpage host. */
+
 body {
     padding: 0;
     margin: 0;
     overflow-y: scroll;
     height: 100%;
-}
\ No newline at end of file
+}

From 3f2de50afccccedd5ccf6290b7bfb190bf49d0c5 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 19 Dec 2012 12:20:31 +0100
Subject: [PATCH 20/22] [IMP] auth_crypt base_crypt cleanup

bzr revid: al@openerp.com-20121219112031-mtogxyq1fxsbopz0
---
 addons/{base_crypt => auth_crypt}/__init__.py |   3 +-
 .../{base_crypt => auth_crypt}/__openerp__.py |  26 +-
 addons/auth_crypt/auth_crypt.py               | 150 +++++++++
 addons/{base_crypt => auth_crypt}/i18n/ar.po  |   0
 .../i18n/base_crypt.pot                       |   0
 addons/{base_crypt => auth_crypt}/i18n/bg.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/ca.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/cs.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/da.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/de.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/el.po  |   0
 .../{base_crypt => auth_crypt}/i18n/en_GB.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/es.po  |   0
 .../{base_crypt => auth_crypt}/i18n/es_CL.po  |   0
 .../{base_crypt => auth_crypt}/i18n/es_CR.po  |   0
 .../{base_crypt => auth_crypt}/i18n/es_MX.po  |   0
 .../{base_crypt => auth_crypt}/i18n/es_PY.po  |   0
 .../{base_crypt => auth_crypt}/i18n/es_VE.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/et.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/fa.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/fi.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/fr.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/gl.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/gu.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/hr.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/id.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/it.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/ja.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/lv.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/mn.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/nb.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/nl.po  |   0
 .../{base_crypt => auth_crypt}/i18n/nl_BE.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/oc.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/pl.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/pt.po  |   0
 .../{base_crypt => auth_crypt}/i18n/pt_BR.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/ro.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/ru.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/sk.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/sl.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/sq.po  |   0
 .../i18n/sr@latin.po                          |   0
 addons/{base_crypt => auth_crypt}/i18n/sv.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/tr.po  |   0
 addons/{base_crypt => auth_crypt}/i18n/vi.po  |   0
 .../{base_crypt => auth_crypt}/i18n/zh_CN.po  |   0
 .../{base_crypt => auth_crypt}/i18n/zh_TW.po  |   0
 addons/base_crypt/crypt.py                    | 295 ------------------
 49 files changed, 154 insertions(+), 320 deletions(-)
 rename addons/{base_crypt => auth_crypt}/__init__.py (95%)
 rename addons/{base_crypt => auth_crypt}/__openerp__.py (57%)
 create mode 100644 addons/auth_crypt/auth_crypt.py
 rename addons/{base_crypt => auth_crypt}/i18n/ar.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/base_crypt.pot (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/bg.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/ca.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/cs.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/da.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/de.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/el.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/en_GB.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es_CL.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es_CR.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es_MX.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es_PY.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/es_VE.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/et.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/fa.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/fi.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/fr.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/gl.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/gu.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/hr.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/id.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/it.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/ja.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/lv.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/mn.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/nb.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/nl.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/nl_BE.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/oc.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/pl.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/pt.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/pt_BR.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/ro.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/ru.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/sk.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/sl.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/sq.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/sr@latin.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/sv.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/tr.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/vi.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/zh_CN.po (100%)
 rename addons/{base_crypt => auth_crypt}/i18n/zh_TW.po (100%)
 delete mode 100644 addons/base_crypt/crypt.py

diff --git a/addons/base_crypt/__init__.py b/addons/auth_crypt/__init__.py
similarity index 95%
rename from addons/base_crypt/__init__.py
rename to addons/auth_crypt/__init__.py
index 2534598a76f..c6086dd9725 100644
--- a/addons/base_crypt/__init__.py
+++ b/addons/auth_crypt/__init__.py
@@ -18,8 +18,7 @@
 #
 ##############################################################################
 
-from openerp.service import security
-import crypt
+import auth_crypt
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/__openerp__.py b/addons/auth_crypt/__openerp__.py
similarity index 57%
rename from addons/base_crypt/__openerp__.py
rename to addons/auth_crypt/__openerp__.py
index 97f6c98aeb8..f8d5c5bdce7 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/auth_crypt/__openerp__.py
@@ -19,35 +19,15 @@
 #
 ##############################################################################
 {
-    'name': 'DB Password Encryption',
+    'name': 'Password Encryption',
     'version': '1.1',
     'author': ['OpenERP SA', 'FS3'],
     'maintainer': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'category': 'Tools',
     'description': """
-Replaces cleartext passwords in the database with a secure hash.
-================================================================
-
-For your existing user base, the removal of the cleartext passwords occurs 
-immediately when you install base_crypt.
-
-All passwords will be replaced by a secure, salted, cryptographic hash, 
-preventing anyone from reading the original password in the database.
-
-After installing this module, it won't be possible to recover a forgotten password 
-for your users, the only solution is for an admin to set a new password.
-
-Security Warning:
------------------
-Installing this module does not mean you can ignore other security measures,
-as the password is still transmitted unencrypted on the network, unless you
-are using a secure protocol such as XML-RPCS or HTTPS.
-
-It also does not protect the rest of the content of the database, which may
-contain critical data. Appropriate security measures need to be implemented
-by the system administrator in all areas, such as: protection of database
-backups, system files, remote shell access, physical server access.
+Ecrypted passwords
+==================
 
 Interaction with LDAP authentication:
 -------------------------------------
diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
new file mode 100644
index 00000000000..87b79931372
--- /dev/null
+++ b/addons/auth_crypt/auth_crypt.py
@@ -0,0 +1,150 @@
+#
+# Implements encrypting functions.
+#
+# Copyright (c) 2008, F S 3 Consulting Inc.
+#
+# Maintainer:
+# Alec Joseph Rivera (agi<at>fs3.ph)
+# refactored by Antony Lesuisse <al<at>openerp.com>
+#
+
+import hashlib
+import logging
+from random import sample
+from string import ascii_letters, digits
+
+import openerp
+from openerp.osv import fields, osv
+
+_logger = logging.getLogger(__name__)
+
+magic_md5 = '$1$'
+
+def gen_salt(length=8, symbols=None):
+    if symbols is None:
+        symbols = ascii_letters + digits
+    return ''.join(sample(symbols, length))
+
+def md5crypt( raw_pw, salt, magic=magic_md5 ):
+    """ md5crypt FreeBSD crypt(3) based on but different from md5
+
+    The md5crypt is based on Mark Johnson's md5crypt.py, which in turn is
+    based on  FreeBSD src/lib/libcrypt/crypt.c (1.2)  by  Poul-Henning Kamp.
+    Mark's port can be found in  ActiveState ASPN Python Cookbook.  Kudos to
+    Poul and Mark. -agi
+
+    Original license:
+
+    * "THE BEER-WARE LICENSE" (Revision 42):
+    *
+    * <phk@login.dknet.dk>  wrote  this file.  As  long as  you retain  this
+    * notice  you can do  whatever you want with this stuff. If we meet some
+    * day,  and you think this stuff is worth it,  you can buy me  a beer in
+    * return.
+    *
+    * Poul-Henning Kamp
+    """
+    raw_pw = raw_pw.encode('utf-8')
+    salt = salt.encode('utf-8')
+    hash = hashlib.md5()
+    hash.update( raw_pw + magic + salt )
+    st = hashlib.md5()
+    st.update( raw_pw + salt + raw_pw)
+    stretch = st.digest()
+
+    for i in range( 0, len( raw_pw ) ):
+        hash.update( stretch[i % 16] )
+
+    i = len( raw_pw )
+
+    while i:
+        if i & 1:
+            hash.update('\x00')
+        else:
+            hash.update( raw_pw[0] )
+        i >>= 1
+
+    saltedmd5 = hash.digest()
+
+    for i in range( 1000 ):
+        hash = hashlib.md5()
+
+        if i & 1:
+            hash.update( raw_pw )
+        else:
+            hash.update( saltedmd5 )
+
+        if i % 3:
+            hash.update( salt )
+        if i % 7:
+            hash.update( raw_pw )
+        if i & 1:
+            hash.update( saltedmd5 )
+        else:
+            hash.update( raw_pw )
+
+        saltedmd5 = hash.digest()
+
+    itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+
+    rearranged = ''
+    for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)):
+        v = ord( saltedmd5[a] ) << 16 | ord( saltedmd5[b] ) << 8 | ord( saltedmd5[c] )
+
+        for i in range(4):
+            rearranged += itoa64[v & 0x3f]
+            v >>= 6
+
+    v = ord( saltedmd5[11] )
+
+    for i in range( 2 ):
+        rearranged += itoa64[v & 0x3f]
+        v >>= 6
+
+    return magic + salt + '$' + rearranged
+
+class res_users(osv.osv):
+    _inherit = "res.users"
+
+    def set_pw(self, cr, uid, id, name, value, args, context):
+        if value:
+            encrypted = md5crypt(value, gen_salt())
+            cr.execute('update res_users set password_crypt=%s where id=%s', (encrypted, int(id)))
+        del value
+
+    def get_pw( self, cr, uid, ids, name, args, context ):
+        cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
+        stored_pws = cr.fetchall()
+        res = {}
+
+        for id, stored_pw in stored_pws:
+            res[id] = stored_pw
+
+        return res
+
+    _columns = {
+        'password': fields.function(get_pw, fnct_inv=set_pw, type='char', string='Password', invisible=True, store=True),
+        'password_crypt': fields.char(string='Encrypted Password', invisible=True),
+    }
+
+    def check_credentials(self, cr, uid, password):
+        # convert to base_crypt if needed
+        cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
+        if cr.rowcount:
+            stored_password, stored_password_crypt = cr.fetchone()
+            if password and not stored_password_crypt:
+                salt = gen_salt()
+                stored_password_crypt = md5crypt(stored_password, salt)
+                cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
+        try:
+            return super(res_users, self).check_credentials(cr, uid, password)
+        except openerp.exceptions.AccessDenied:
+            # check md5crypt
+            if stored_password_crypt[:len(magic_md5)] == "$1$":
+                salt = stored_password_crypt[len(magic_md5):11]
+                if stored_password_crypt == md5crypt(password, salt):
+                    return
+            # Reraise password incorrect
+            raise
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/i18n/ar.po b/addons/auth_crypt/i18n/ar.po
similarity index 100%
rename from addons/base_crypt/i18n/ar.po
rename to addons/auth_crypt/i18n/ar.po
diff --git a/addons/base_crypt/i18n/base_crypt.pot b/addons/auth_crypt/i18n/base_crypt.pot
similarity index 100%
rename from addons/base_crypt/i18n/base_crypt.pot
rename to addons/auth_crypt/i18n/base_crypt.pot
diff --git a/addons/base_crypt/i18n/bg.po b/addons/auth_crypt/i18n/bg.po
similarity index 100%
rename from addons/base_crypt/i18n/bg.po
rename to addons/auth_crypt/i18n/bg.po
diff --git a/addons/base_crypt/i18n/ca.po b/addons/auth_crypt/i18n/ca.po
similarity index 100%
rename from addons/base_crypt/i18n/ca.po
rename to addons/auth_crypt/i18n/ca.po
diff --git a/addons/base_crypt/i18n/cs.po b/addons/auth_crypt/i18n/cs.po
similarity index 100%
rename from addons/base_crypt/i18n/cs.po
rename to addons/auth_crypt/i18n/cs.po
diff --git a/addons/base_crypt/i18n/da.po b/addons/auth_crypt/i18n/da.po
similarity index 100%
rename from addons/base_crypt/i18n/da.po
rename to addons/auth_crypt/i18n/da.po
diff --git a/addons/base_crypt/i18n/de.po b/addons/auth_crypt/i18n/de.po
similarity index 100%
rename from addons/base_crypt/i18n/de.po
rename to addons/auth_crypt/i18n/de.po
diff --git a/addons/base_crypt/i18n/el.po b/addons/auth_crypt/i18n/el.po
similarity index 100%
rename from addons/base_crypt/i18n/el.po
rename to addons/auth_crypt/i18n/el.po
diff --git a/addons/base_crypt/i18n/en_GB.po b/addons/auth_crypt/i18n/en_GB.po
similarity index 100%
rename from addons/base_crypt/i18n/en_GB.po
rename to addons/auth_crypt/i18n/en_GB.po
diff --git a/addons/base_crypt/i18n/es.po b/addons/auth_crypt/i18n/es.po
similarity index 100%
rename from addons/base_crypt/i18n/es.po
rename to addons/auth_crypt/i18n/es.po
diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/auth_crypt/i18n/es_CL.po
similarity index 100%
rename from addons/base_crypt/i18n/es_CL.po
rename to addons/auth_crypt/i18n/es_CL.po
diff --git a/addons/base_crypt/i18n/es_CR.po b/addons/auth_crypt/i18n/es_CR.po
similarity index 100%
rename from addons/base_crypt/i18n/es_CR.po
rename to addons/auth_crypt/i18n/es_CR.po
diff --git a/addons/base_crypt/i18n/es_MX.po b/addons/auth_crypt/i18n/es_MX.po
similarity index 100%
rename from addons/base_crypt/i18n/es_MX.po
rename to addons/auth_crypt/i18n/es_MX.po
diff --git a/addons/base_crypt/i18n/es_PY.po b/addons/auth_crypt/i18n/es_PY.po
similarity index 100%
rename from addons/base_crypt/i18n/es_PY.po
rename to addons/auth_crypt/i18n/es_PY.po
diff --git a/addons/base_crypt/i18n/es_VE.po b/addons/auth_crypt/i18n/es_VE.po
similarity index 100%
rename from addons/base_crypt/i18n/es_VE.po
rename to addons/auth_crypt/i18n/es_VE.po
diff --git a/addons/base_crypt/i18n/et.po b/addons/auth_crypt/i18n/et.po
similarity index 100%
rename from addons/base_crypt/i18n/et.po
rename to addons/auth_crypt/i18n/et.po
diff --git a/addons/base_crypt/i18n/fa.po b/addons/auth_crypt/i18n/fa.po
similarity index 100%
rename from addons/base_crypt/i18n/fa.po
rename to addons/auth_crypt/i18n/fa.po
diff --git a/addons/base_crypt/i18n/fi.po b/addons/auth_crypt/i18n/fi.po
similarity index 100%
rename from addons/base_crypt/i18n/fi.po
rename to addons/auth_crypt/i18n/fi.po
diff --git a/addons/base_crypt/i18n/fr.po b/addons/auth_crypt/i18n/fr.po
similarity index 100%
rename from addons/base_crypt/i18n/fr.po
rename to addons/auth_crypt/i18n/fr.po
diff --git a/addons/base_crypt/i18n/gl.po b/addons/auth_crypt/i18n/gl.po
similarity index 100%
rename from addons/base_crypt/i18n/gl.po
rename to addons/auth_crypt/i18n/gl.po
diff --git a/addons/base_crypt/i18n/gu.po b/addons/auth_crypt/i18n/gu.po
similarity index 100%
rename from addons/base_crypt/i18n/gu.po
rename to addons/auth_crypt/i18n/gu.po
diff --git a/addons/base_crypt/i18n/hr.po b/addons/auth_crypt/i18n/hr.po
similarity index 100%
rename from addons/base_crypt/i18n/hr.po
rename to addons/auth_crypt/i18n/hr.po
diff --git a/addons/base_crypt/i18n/id.po b/addons/auth_crypt/i18n/id.po
similarity index 100%
rename from addons/base_crypt/i18n/id.po
rename to addons/auth_crypt/i18n/id.po
diff --git a/addons/base_crypt/i18n/it.po b/addons/auth_crypt/i18n/it.po
similarity index 100%
rename from addons/base_crypt/i18n/it.po
rename to addons/auth_crypt/i18n/it.po
diff --git a/addons/base_crypt/i18n/ja.po b/addons/auth_crypt/i18n/ja.po
similarity index 100%
rename from addons/base_crypt/i18n/ja.po
rename to addons/auth_crypt/i18n/ja.po
diff --git a/addons/base_crypt/i18n/lv.po b/addons/auth_crypt/i18n/lv.po
similarity index 100%
rename from addons/base_crypt/i18n/lv.po
rename to addons/auth_crypt/i18n/lv.po
diff --git a/addons/base_crypt/i18n/mn.po b/addons/auth_crypt/i18n/mn.po
similarity index 100%
rename from addons/base_crypt/i18n/mn.po
rename to addons/auth_crypt/i18n/mn.po
diff --git a/addons/base_crypt/i18n/nb.po b/addons/auth_crypt/i18n/nb.po
similarity index 100%
rename from addons/base_crypt/i18n/nb.po
rename to addons/auth_crypt/i18n/nb.po
diff --git a/addons/base_crypt/i18n/nl.po b/addons/auth_crypt/i18n/nl.po
similarity index 100%
rename from addons/base_crypt/i18n/nl.po
rename to addons/auth_crypt/i18n/nl.po
diff --git a/addons/base_crypt/i18n/nl_BE.po b/addons/auth_crypt/i18n/nl_BE.po
similarity index 100%
rename from addons/base_crypt/i18n/nl_BE.po
rename to addons/auth_crypt/i18n/nl_BE.po
diff --git a/addons/base_crypt/i18n/oc.po b/addons/auth_crypt/i18n/oc.po
similarity index 100%
rename from addons/base_crypt/i18n/oc.po
rename to addons/auth_crypt/i18n/oc.po
diff --git a/addons/base_crypt/i18n/pl.po b/addons/auth_crypt/i18n/pl.po
similarity index 100%
rename from addons/base_crypt/i18n/pl.po
rename to addons/auth_crypt/i18n/pl.po
diff --git a/addons/base_crypt/i18n/pt.po b/addons/auth_crypt/i18n/pt.po
similarity index 100%
rename from addons/base_crypt/i18n/pt.po
rename to addons/auth_crypt/i18n/pt.po
diff --git a/addons/base_crypt/i18n/pt_BR.po b/addons/auth_crypt/i18n/pt_BR.po
similarity index 100%
rename from addons/base_crypt/i18n/pt_BR.po
rename to addons/auth_crypt/i18n/pt_BR.po
diff --git a/addons/base_crypt/i18n/ro.po b/addons/auth_crypt/i18n/ro.po
similarity index 100%
rename from addons/base_crypt/i18n/ro.po
rename to addons/auth_crypt/i18n/ro.po
diff --git a/addons/base_crypt/i18n/ru.po b/addons/auth_crypt/i18n/ru.po
similarity index 100%
rename from addons/base_crypt/i18n/ru.po
rename to addons/auth_crypt/i18n/ru.po
diff --git a/addons/base_crypt/i18n/sk.po b/addons/auth_crypt/i18n/sk.po
similarity index 100%
rename from addons/base_crypt/i18n/sk.po
rename to addons/auth_crypt/i18n/sk.po
diff --git a/addons/base_crypt/i18n/sl.po b/addons/auth_crypt/i18n/sl.po
similarity index 100%
rename from addons/base_crypt/i18n/sl.po
rename to addons/auth_crypt/i18n/sl.po
diff --git a/addons/base_crypt/i18n/sq.po b/addons/auth_crypt/i18n/sq.po
similarity index 100%
rename from addons/base_crypt/i18n/sq.po
rename to addons/auth_crypt/i18n/sq.po
diff --git a/addons/base_crypt/i18n/sr@latin.po b/addons/auth_crypt/i18n/sr@latin.po
similarity index 100%
rename from addons/base_crypt/i18n/sr@latin.po
rename to addons/auth_crypt/i18n/sr@latin.po
diff --git a/addons/base_crypt/i18n/sv.po b/addons/auth_crypt/i18n/sv.po
similarity index 100%
rename from addons/base_crypt/i18n/sv.po
rename to addons/auth_crypt/i18n/sv.po
diff --git a/addons/base_crypt/i18n/tr.po b/addons/auth_crypt/i18n/tr.po
similarity index 100%
rename from addons/base_crypt/i18n/tr.po
rename to addons/auth_crypt/i18n/tr.po
diff --git a/addons/base_crypt/i18n/vi.po b/addons/auth_crypt/i18n/vi.po
similarity index 100%
rename from addons/base_crypt/i18n/vi.po
rename to addons/auth_crypt/i18n/vi.po
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/auth_crypt/i18n/zh_CN.po
similarity index 100%
rename from addons/base_crypt/i18n/zh_CN.po
rename to addons/auth_crypt/i18n/zh_CN.po
diff --git a/addons/base_crypt/i18n/zh_TW.po b/addons/auth_crypt/i18n/zh_TW.po
similarity index 100%
rename from addons/base_crypt/i18n/zh_TW.po
rename to addons/auth_crypt/i18n/zh_TW.po
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
deleted file mode 100644
index 0cc218ed575..00000000000
--- a/addons/base_crypt/crypt.py
+++ /dev/null
@@ -1,295 +0,0 @@
-#
-# Implements encrypting functions.
-#
-# Copyright (c) 2008, F S 3 Consulting Inc.
-#
-# Maintainer:
-# Alec Joseph Rivera (agi<at>fs3.ph)
-#
-#
-# Warning:
-# -------
-#
-# This program as  such is intended to be used by  professional programmers
-# who take the whole responsibility of assessing all potential consequences
-# resulting  from its eventual  inadequacies and  bugs.  End users  who are
-# looking  for a  ready-to-use  solution  with  commercial  guarantees  and
-# support are strongly adviced to contract a Free Software Service Company.
-#
-# This program  is Free Software; you can  redistribute it and/or modify it
-# under  the terms of the  GNU General  Public License  as published by the
-# Free Software  Foundation;  either version 2 of the  License, or (at your
-# option) any later version.
-#
-# This  program is  distributed in  the hope that  it will  be useful,  but
-# WITHOUT   ANY   WARRANTY;   without   even   the   implied   warranty  of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.
-#
-# You should  have received a copy of the GNU General  Public License along
-# with this program; if not, write to the:
-#
-# Free Software Foundation, Inc.
-# 59 Temple Place - Suite 330
-# Boston, MA  02111-1307
-# USA.
-
-import hashlib
-import logging
-from random import sample
-from string import ascii_letters, digits
-
-from openerp import pooler
-from openerp.osv import fields,osv
-from openerp.tools.translate import _
-from openerp.service import security
-
-magic_md5 = '$1$'
-_logger = logging.getLogger(__name__)
-
-def gen_salt(length=8, symbols=None):
-    if symbols is None:
-        symbols = ascii_letters + digits
-    return ''.join(sample(symbols, length))
-
-
-def md5crypt( raw_pw, salt, magic=magic_md5 ):
-    """ md5crypt FreeBSD crypt(3) based on but different from md5
-
-    The md5crypt is based on Mark Johnson's md5crypt.py, which in turn is
-    based on  FreeBSD src/lib/libcrypt/crypt.c (1.2)  by  Poul-Henning Kamp.
-    Mark's port can be found in  ActiveState ASPN Python Cookbook.  Kudos to
-    Poul and Mark. -agi
-
-    Original license:
-
-    * "THE BEER-WARE LICENSE" (Revision 42):
-    *
-    * <phk@login.dknet.dk>  wrote  this file.  As  long as  you retain  this
-    * notice  you can do  whatever you want with this stuff. If we meet some
-    * day,  and you think this stuff is worth it,  you can buy me  a beer in
-    * return.
-    *
-    * Poul-Henning Kamp
-    """
-    raw_pw = raw_pw.encode('utf-8')
-    salt = salt.encode('utf-8')
-    hash = hashlib.md5()
-    hash.update( raw_pw + magic + salt )
-    st = hashlib.md5()
-    st.update( raw_pw + salt + raw_pw)
-    stretch = st.digest()
-
-    for i in range( 0, len( raw_pw ) ):
-        hash.update( stretch[i % 16] )
-
-    i = len( raw_pw )
-
-    while i:
-        if i & 1:
-            hash.update('\x00')
-        else:
-            hash.update( raw_pw[0] )
-        i >>= 1
-
-    saltedmd5 = hash.digest()
-
-    for i in range( 1000 ):
-        hash = hashlib.md5()
-
-        if i & 1:
-            hash.update( raw_pw )
-        else:
-            hash.update( saltedmd5 )
-
-        if i % 3:
-            hash.update( salt )
-        if i % 7:
-            hash.update( raw_pw )
-        if i & 1:
-            hash.update( saltedmd5 )
-        else:
-            hash.update( raw_pw )
-
-        saltedmd5 = hash.digest()
-
-    itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-
-    rearranged = ''
-    for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)):
-        v = ord( saltedmd5[a] ) << 16 | ord( saltedmd5[b] ) << 8 | ord( saltedmd5[c] )
-
-        for i in range(4):
-            rearranged += itoa64[v & 0x3f]
-            v >>= 6
-
-    v = ord( saltedmd5[11] )
-
-    for i in range( 2 ):
-        rearranged += itoa64[v & 0x3f]
-        v >>= 6
-
-    return magic + salt + '$' + rearranged
-
-
-class users(osv.osv):
-    _name="res.users"
-    _inherit="res.users"
-    # agi - 022108
-    # Add handlers for 'input_pw' field.
-
-    def set_pw(self, cr, uid, id, name, value, args, context):
-        if value:
-            obj = pooler.get_pool(cr.dbname).get('res.users')
-            if not hasattr(obj, "_salt_cache"):
-                obj._salt_cache = {}
-
-            salt = obj._salt_cache[id] = gen_salt()
-            encrypted = md5crypt(value, salt)
-
-        else:
-            #setting a password to '' is allowed. It can be used to inactivate the classic log-in of the user
-            #while the access can still be granted by another login method (openid...)
-            encrypted = ''
-        cr.execute('update res_users set password=%s where id=%s',
-            (encrypted.encode('utf-8'), int(id)))
-        del value
-
-    def get_pw( self, cr, uid, ids, name, args, context ):
-        cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
-        stored_pws = cr.fetchall()
-        res = {}
-
-        for id, stored_pw in stored_pws:
-            res[id] = stored_pw
-
-        return res
-
-    _columns = {
-        'password': fields.function(get_pw, fnct_inv=set_pw, type='char', string='Password', invisible=True, store=True),
-    }
-
-    def login(self, db, login, password):
-        if not password:
-            return False
-        if db is False:
-            raise RuntimeError("Cannot authenticate to False db!")
-        cr = None
-        try:
-            cr = pooler.get_db(db).cursor()
-            return self._login(cr, db, login, password)
-        except Exception:
-            _logger.exception('Cannot authenticate.')
-            return Exception('Access denied.')
-        finally:
-            if cr is not None:
-                cr.close()
-
-    def _login(self, cr, db, login, password):
-        cr.execute( 'SELECT password, id FROM res_users WHERE login=%s AND active',
-            (login.encode('utf-8'),))
-
-        if cr.rowcount:
-            stored_pw, id = cr.fetchone()
-        else:
-            # Return early if no one has a login name like that.
-            return False
-
-        stored_pw = self.maybe_encrypt(cr, stored_pw, id)
-
-        if not stored_pw:
-            # means couldn't encrypt or user is not active!
-            return False
-
-        # Calculate an encrypted password from the user-provided
-        # password.
-        obj = pooler.get_pool(db).get('res.users')
-        if not hasattr(obj, "_salt_cache"):
-            obj._salt_cache = {}
-        salt = obj._salt_cache[id] = stored_pw[len(magic_md5):11]
-        encrypted_pw = md5crypt(password, salt)
-
-        # Check if the encrypted password matches against the one in the db.
-        cr.execute("""UPDATE res_users
-                        SET login_date=now() AT TIME ZONE 'UTC'
-                        WHERE id=%s AND password=%s AND active
-                        RETURNING id""",
-                   (int(id), encrypted_pw.encode('utf-8')))
-        res = cr.fetchone()
-        cr.commit()
-
-        if res:
-            return res[0]
-        else:
-            return False
-
-    def check(self, db, uid, passwd):
-        if not passwd:
-            # empty passwords disallowed for obvious security reasons
-            raise security.ExceptionNoTb('AccessDenied')
-
-        # Get a chance to hash all passwords in db before using the uid_cache.
-        obj = pooler.get_pool(db).get('res.users')
-        if not hasattr(obj, "_salt_cache"):
-            obj._salt_cache = {}
-            self._uid_cache.get(db, {}).clear()
-
-        cached_pass = self._uid_cache.get(db, {}).get(uid)
-        if (cached_pass is not None) and cached_pass == passwd:
-            return True
-
-        cr = pooler.get_db(db).cursor()
-        try:
-            if uid not in self._salt_cache.get(db, {}):
-                # If we don't have cache, we have to repeat the procedure
-                # through the login function.
-                cr.execute( 'SELECT login FROM res_users WHERE id=%s', (uid,) )
-                stored_login = cr.fetchone()
-                if stored_login:
-                    stored_login = stored_login[0]
-
-                res = self._login(cr, db, stored_login, passwd)
-                if not res:
-                    raise security.ExceptionNoTb('AccessDenied')
-            else:
-                salt = self._salt_cache[db][uid]
-                cr.execute('SELECT COUNT(*) FROM res_users WHERE id=%s AND password=%s AND active',
-                    (int(uid), md5crypt(passwd, salt)))
-                res = cr.fetchone()[0]
-        finally:
-            cr.close()
-
-        if not bool(res):
-            raise security.ExceptionNoTb('AccessDenied')
-
-        if res:
-            if self._uid_cache.has_key(db):
-                ulist = self._uid_cache[db]
-                ulist[uid] = passwd
-            else:
-                self._uid_cache[db] = {uid: passwd}
-        return bool(res)
-
-    def maybe_encrypt(self, cr, pw, id):
-        """ Return the password 'pw', making sure it is encrypted.
-
-        If the password 'pw' is not encrypted, then encrypt all active passwords
-        in the db. Returns the (possibly newly) encrypted password for 'id'.
-        """
-
-        if not pw.startswith(magic_md5):
-            cr.execute("SELECT id, password FROM res_users WHERE active=true AND password NOT LIKE '$%'")
-            # Note that we skip all passwords like $.., in anticipation for
-            # more than md5 magic prefixes.
-            res = cr.fetchall()
-            for i, p in res:
-                encrypted = md5crypt(p, gen_salt())
-                cr.execute('UPDATE res_users SET password=%s where id=%s', (encrypted, i))
-                if i == id:
-                    encrypted_res = encrypted
-            cr.commit()
-            return encrypted_res
-        return pw
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e131d4693218c760b8f610cf3b7a45ac80603d7d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 19 Dec 2012 12:33:39 +0100
Subject: [PATCH 21/22] [IMP] auth_crypt add sha256 from
 enhance_base_crypt_trunk (not enabled by default)

bzr revid: al@openerp.com-20121219113339-vhstwyo51jw0znqw
---
 addons/auth_crypt/auth_crypt.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 87b79931372..d0a4fda9632 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -9,6 +9,7 @@
 #
 
 import hashlib
+import hmac
 import logging
 from random import sample
 from string import ascii_letters, digits
@@ -19,6 +20,7 @@ from openerp.osv import fields, osv
 _logger = logging.getLogger(__name__)
 
 magic_md5 = '$1$'
+magic_sha256 = '$5$'
 
 def gen_salt(length=8, symbols=None):
     if symbols is None:
@@ -103,6 +105,15 @@ def md5crypt( raw_pw, salt, magic=magic_md5 ):
 
     return magic + salt + '$' + rearranged
 
+def sh256crypt(cls, password, salt, magic=magic_sha256):
+    iterations = 1000
+    # see http://en.wikipedia.org/wiki/PBKDF2
+    result = password.encode('utf8')
+    for i in xrange(cls.iterations):
+        result = hmac.HMAC(result, salt, hashlib.sha256).digest() # uses HMAC (RFC 2104) to apply salt
+    result = result.encode('base64') # doesnt seem to be crypt(3) compatible
+    return '%s%s$%s' % (magic_sha256, salt, result)
+
 class res_users(osv.osv):
     _inherit = "res.users"
 
@@ -140,11 +151,16 @@ class res_users(osv.osv):
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
             # check md5crypt
-            if stored_password_crypt[:len(magic_md5)] == "$1$":
+            if stored_password_crypt[:len(magic_md5)] == magic_md5:
+                salt = stored_password_crypt[len(magic_md5):11]
+                if stored_password_crypt == md5crypt(password, salt):
+                    return
+            elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
                 salt = stored_password_crypt[len(magic_md5):11]
                 if stored_password_crypt == md5crypt(password, salt):
                     return
             # Reraise password incorrect
             raise
 
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From f078db001bf79a13b175b1f84299e3e031c62c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 19 Dec 2012 14:15:01 +0100
Subject: [PATCH 22/22] [FIX] for mail action icons in IE

bzr revid: fva@openerp.com-20121219131501-vqst77eys5f65864
---
 addons/mail/static/src/css/mail.css | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index cd389560319..e154e285f39 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -167,9 +167,6 @@
     line-height:24px;
     text-align: center;
 }
-.openerp_ie .oe_mail .oe_msg .oe_msg_icons span {
-    -ms-filter: "progid:DXImageTransform.Microsoft.shadow(color=#aaaaaa,strength=2)";
-}
 .openerp .oe_mail .oe_msg .oe_msg_icons a {
     text-decoration: none;
     color: #FFF;
@@ -224,6 +221,29 @@
     width: 100%;
 }
 
+/* d) I.E. tweaks for Message action icons */
+
+.openerp.openerp_ie .oe_mail .oe_msg .oe_msg_icons a {
+    color: #C8BFDA;
+    text-shadow: none;
+}
+.openerp.openerp_ie .oe_mail .oe_msg .oe_msg_icons .oe_star:hover a{
+    color: #FFB700;
+    text-shadow: none;
+}
+.openerp.openerp_ie .oe_mail .oe_msg .oe_msg_icons .oe_starred a{
+    color: #FFB700;
+    text-shadow:none;
+}
+.openerp.openerp_ie .oe_mail .oe_msg .oe_msg_icons .oe_read:hover a{
+    color: #7C7BAD;
+    text-shadow: none;
+}
+.openerp.openerp_ie .oe_mail .oe_msg .oe_msg_icons .oe_unread:hover a{
+    color: #7C7BAD;
+    text-shadow: none;
+}
+
 /* --------------------- ATTACHMENTS --------------------- */
 
 .openerp .oe_mail .oe_msg_attachment_list{