[UPD] Update fdate from Principal Branch

bzr revid: ytello@cubicerp.com-20120216165726-i6jahgmrn4y2w0eq

51 files changed, 2313 insertions, 2303 deletions

diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index bb3ca084be7..c2dcc3cc91b 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -21,9 +21,9 @@
 
 
 {
-    'name': 'Human Resources',
+    'name': 'Jobs on Contracts',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Sales Management',
     'description': """
 This module allows you to define what is the default function of a specific user on a given account.
 ====================================================================================================
@@ -41,7 +41,7 @@ Obviously if no data has been recorded for the current account, the default valu
     'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
     'demo_xml': [],
     'installable': True,
-    'active': False,
+    'auto_install': False,
     'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 030a45db393..cfb1aba10d1 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -143,3 +143,5 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 3a8e9b34445..0bb3a2947b8 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
-"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
+"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-02-08 00:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,24 +16,22 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -45,50 +43,36 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! The currency has to be the same as the currency of the selected company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid "\n"
-"\n"
-"    This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index d9b49f53f6e..677df907237 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -6,97 +6,81 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "المنتج"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr ""
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "جدول العلاقة بين المنتجات والمستخدمين في الحساب التحليلي"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "حساب تحليلي"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "علاقةالمنتجات/المستخدمين."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
-msgstr ""
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
+msgstr "المستخدم"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr ""
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "خطأ !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "خط سجل الدوام"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "منتج المستخدم للحساب التحليلي هذا"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "خطأ! العملة لابد و أن تكون مثل العملة للشركة المختارة"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "وظيفة المستخدم التحليلية"
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index a5e6608f7b8..aea375bbf71 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-02-03 09:18+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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Грешка!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Свързваща таблица между потребители и продукти по аналитична сметка"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ред в график"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Аналитична сметка"
@@ -46,64 +44,23 @@ msgid "Users/Products Rel."
 msgstr "Потребители/Продукти Връзка."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Потребител"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Няма определена разходна сметка за този продукт: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Свързваща таблица между потребители и продукти по аналитична сметка"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Този модул дава възможност да се определи какво е стандартната функция "
-"на даден потребител по дадена сметка. Това се използва предимно, когато "
-"потребителят си кодира график: стойностите са възстановени и областта се "
-"попълва автоматично ... но и възможноста за промяна на тези стойности е в "
-"наличност.\n"
-"\n"
-"Очевидно, ако няма данни е регистриран по текущата сметка, стойността по "
-"подразбиране е дадена, както обикновено от служебни данни, така че този "
-"модул е напълно съвместим с по-големи конфигурации.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Аналитична потребителска сметка"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Грешка!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -111,7 +68,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Грешка! Не можете да създадете рекурсивни аналитични сметки."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Ред в график"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Продукт на потребителя за аналитична сметка"
 
@@ -123,3 +85,40 @@ msgstr "Продукт на потребителя за аналитична с�
 #~ msgstr ""
 #~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 #~ "символи!"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Грешка! Валутата трябва да бъде същата като валутата на избраната компания"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Аналитична потребителска сметка"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Този модул дава възможност да се определи какво е стандартната функция "
+#~ "на даден потребител по дадена сметка. Това се използва предимно, когато "
+#~ "потребителят си кодира график: стойностите са възстановени и областта се "
+#~ "попълва автоматично ... но и възможноста за промяна на тези стойности е в "
+#~ "наличност.\n"
+#~ "\n"
+#~ "Очевидно, ако няма данни е регистриран по текущата сметка, стойността по "
+#~ "подразбиране е дадена, както обикновено от служебни данни, така че този "
+#~ "модул е напълно съвместим с по-големи конфигурации.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 3eab5db3d1f..56b60cc528f 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 9bc82f76e13..27019abb279 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-10-30 14:54+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,28 +14,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producte"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Error!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Taula de relació entre usuaris i productes d'un compte analític"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línia del full de serveis"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Compte analític"
@@ -47,65 +45,24 @@ msgid "Users/Products Rel."
 msgstr "Rel. usuaris/productes"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuari"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Error! La moneda ha de ser la mateixa que la moneda de la companyia "
-"seleccionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "No s'ha definit un compte de despeses per a aquest producte: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Taula de relació entre usuaris i productes d'un compte analític"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Aquest mòdul us permet definir la funció per defecte per a un cert "
-"usuari en un compte donat. S'utilitza principalment quan un usuari codifica "
-"el seu full de serveis: els valors són recuperats i els camps són auto "
-"emplenats tot i que la possibilitat de canviar-los està encara disponible.\n"
-"\n"
-"Òbviament si no s'ha guardat dades per al compte actual, es proporciona el "
-"valor per defecte per a les dades de l'empleat com sempre, pel que aquest "
-"mòdul és perfectament compatible amb configuracions anteriors.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Funció analítica d'usuari"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Error!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -113,7 +70,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Error! No podeu crear comptes analítics recursius."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línia del full de serveis"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producte de l'usuari per aquesta compte analític"
 
@@ -125,3 +87,40 @@ msgstr "Producte de l'usuari per aquesta compte analític"
 #~ msgstr ""
 #~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 #~ "especial!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Funció analítica d'usuari"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Error! La moneda ha de ser la mateixa que la moneda de la companyia "
+#~ "seleccionada"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Aquest mòdul us permet definir la funció per defecte per a un cert "
+#~ "usuari en un compte donat. S'utilitza principalment quan un usuari codifica "
+#~ "el seu full de serveis: els valors són recuperats i els camps són auto "
+#~ "emplenats tot i que la possibilitat de canviar-los està encara disponible.\n"
+#~ "\n"
+#~ "Òbviament si no s'ha guardat dades per al compte actual, es proporciona el "
+#~ "valor per defecte per a les dades de l'empleat com sempre, pel que aquest "
+#~ "mòdul és perfectament compatible amb configuracions anteriors.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index ae3a641a2fa..8ab8a8ac7de 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-10-30 10:06+0000\n"
 "Last-Translator: Konki <pavel.konkol@seznam.cz>\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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Chyba !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Vztah mezi uživateli a tabulkou produktů na analytickém účtu"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytický účet"
@@ -46,64 +44,45 @@ msgid "Users/Products Rel."
 msgstr "Uživatelé/Produktové vztahy"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Uživatel"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Vztah mezi uživateli a tabulkou produktů na analytickém účtu"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Chyba !"
 
 #. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analytická uživatelská funkce"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Uživatelský produkt pro tento Analytický Účet"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "Analytická uživatelská funkce"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po
new file mode 100644
index 00000000000..e93e5cf93b7
--- /dev/null
+++ b/addons/analytic_user_function/i18n/da.po
@@ -0,0 +1,79 @@
+# Danish 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-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-01-27 08:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@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-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr ""
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 270d583b0d1..7dc87c19dfa 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -6,36 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-12 16:14+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-01-13 19:15+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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relation zwischen Benutzern und Produkten"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Zeiterfassung Positionen"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"Bestätigte und abgerechnete Zeitaufzeichungen können nicht geändert werden"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytisches Konto"
@@ -47,66 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Benutzer / Produkte Relation"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Benutzer"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Fehler! Die Währung muss der Währung der gewählten Firma entsprechen"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Es ist kein Aufwandskonto definiert für:\"%s\"(id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relation zwischen Benutzern und Produkten"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Dieses Modul ermöglicht die Definition einer benutzerbezogenen Zuordnung "
-"von  Dienstleistungsprodukten zu analytischen Konten. Die Funktion dieses "
-"Moduls wird vor allem dann eingesetzt, wenn ein Benutzer seine "
-"Arbeitszeiterfassung vornimmt: Die Konten werden automatisch durch das "
-"System ermittelt, damit die entsprechenden Felder bei der Erfassung "
-"automatisch ausgefüllt werden ... dennoch besteht jederzeit die Möglichkeit, "
-"diese Werte bei Bedarf abzuändern.\n"
-"\n"
-"     Wenn offensichtlich keine besondere Zuordnung für diese Konten "
-"hinterlegt wurde , wird der Standardwert wie gewohnt über die "
-"Kontenzuordnung beim Mitarbeiter ermittelt, so dass dieses Modul auch "
-"weiterhin kompatibel mit älteren Konfigurationen ist.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analytische Benutzer Funktion"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Fehler !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -114,7 +69,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Zeiterfassung Positionen"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produkte des Benutzers"
 
@@ -126,3 +86,42 @@ msgstr "Produkte des Benutzers"
 #~ msgstr ""
 #~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 #~ "beinhalten"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analytische Benutzer Funktion"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Dieses Modul ermöglicht die Definition einer benutzerbezogenen Zuordnung "
+#~ "von  Dienstleistungsprodukten zu analytischen Konten. Die Funktion dieses "
+#~ "Moduls wird vor allem dann eingesetzt, wenn ein Benutzer seine "
+#~ "Arbeitszeiterfassung vornimmt: Die Konten werden automatisch durch das "
+#~ "System ermittelt, damit die entsprechenden Felder bei der Erfassung "
+#~ "automatisch ausgefüllt werden ... dennoch besteht jederzeit die Möglichkeit, "
+#~ "diese Werte bei Bedarf abzuändern.\n"
+#~ "\n"
+#~ "     Wenn offensichtlich keine besondere Zuordnung für diese Konten "
+#~ "hinterlegt wurde , wird der Standardwert wie gewohnt über die "
+#~ "Kontenzuordnung beim Mitarbeiter ermittelt, so dass dieses Modul auch "
+#~ "weiterhin kompatibel mit älteren Konfigurationen ist.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Fehler! Die Währung muss der Währung der gewählten Firma entsprechen"
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 3363345ce28..c4167f0068c 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -7,35 +7,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-12-29 13:04+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Προϊόν"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Σφάλμα!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+"Πίνακας Σχέσεων μεταξύ χρηστών και προϊόντων στον αναλυτικό λογαριασμό"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Αναλυτική Λογαριασμού"
@@ -47,52 +46,24 @@ msgid "Users/Products Rel."
 msgstr "Χρήστες/σχ. Προϊόντα"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Χρήστης"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Δεν έχει οριστεί λογαριασμός εξόδων για αυτό το προϊόν: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-"Πίνακας Σχέσεων μεταξύ χρηστών και προϊόντων στον αναλυτικό λογαριασμό"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Αναλυτική Λειτουργία Χρήστη"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Σφάλμα!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -100,7 +71,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αναλυτικό Λογαριασμό"
 
@@ -112,3 +88,6 @@ msgstr "Τα Προϊόντα του Χρήστη για αυτόν τον Αν�
 #~ msgstr ""
 #~ "Το όνομα του αντικειμένου θα πρέπει να ξεκινάει με x_ και να μην περιέχει "
 #~ "ειδικούς χαρακτήρες!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Αναλυτική Λειτουργία Χρήστη"
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index feeaf489878..d6c757ba977 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-08-25 17:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-01-23 13:22+0000\n"
+"Last-Translator: mrx5682 <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Product"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relation table between users and products on a analytic account"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytic Account"
@@ -47,63 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Users/Products Rel."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "User"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Error! The currency has to be the same as that of the selected company"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "There is no expense account define for this product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relation table between users and products on a analytic account"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    This module allows you to define the default function of a specific user "
-"on a given account. This is mostly used when a user encodes his timesheet: "
-"the values are retrieved and the fields are auto-filled... but the "
-"possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analytic User Function"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Error !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -111,10 +69,51 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Error! You can not create recursive analytic accounts."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timesheet Line"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "User's Product for this Analytic Account"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define the default function of a specific user "
+#~ "on a given account. This is mostly used when a user encodes his timesheet: "
+#~ "the values are retrieved and the fields are auto-filled... but the "
+#~ "possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Error! The currency has to be the same as that of the selected company"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analytic User Function"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 5c9e1b3fd8d..5ff1699f2f1 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-16 18:03+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,28 +14,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea de la hoja de servicios"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -47,67 +45,24 @@ msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir la función por defecto para un cierto "
-"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
-"codifica su hoja de servicios: los valores son recuperados y los campos son "
-"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
-"disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos del empleado como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Función analítica de usuario"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -115,7 +70,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
 
@@ -127,3 +87,42 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función analítica de usuario"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo le permite definir la función por defecto para un cierto "
+#~ "usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+#~ "codifica su hoja de servicios: los valores son recuperados y los campos son "
+#~ "auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+#~ "disponible.\n"
+#~ "\n"
+#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
+#~ "proporciona el valor por defecto para los datos del empleado como siempre "
+#~ "por lo que este módulo es perfectamente compatible con configuraciones "
+#~ "anteriores.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+#~ "seleccionada"
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index 2fe01868e22..6eef431b507 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-09-16 17:44+0000\n"
 "Last-Translator: Silvana Herrera <sherrera@thymbra.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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos en una cuenta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr "Relación usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos en una cuenta analítica"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Función de usuario analítico"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
 
@@ -109,3 +85,6 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
 #~ "especial!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función de usuario analítico"
diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po
new file mode 100644
index 00000000000..5fa5633e21a
--- /dev/null
+++ b/addons/analytic_user_function/i18n/es_CR.po
@@ -0,0 +1,130 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* analytic_user_function
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-02-15 15:53+0000\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\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-02-16 05:06+0000\n"
+"X-Generator: Launchpad (build 14781)\n"
+"Language: \n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"No se puede modificar una entrada en un parte de horas Confirmado / ¡Ya "
+"está!."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Rel. usuarios/productos"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función analítica de usuario"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo le permite definir la función por defecto para un cierto "
+#~ "usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+#~ "codifica su hoja de servicios: los valores son recuperados y los campos son "
+#~ "auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+#~ "disponible.\n"
+#~ "\n"
+#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
+#~ "proporciona el valor por defecto para los datos del empleado como siempre "
+#~ "por lo que este módulo es perfectamente compatible con configuraciones "
+#~ "anteriores.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+#~ "seleccionada"
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index 71224955cc6..59ab0310382 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-13 03:54+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -46,67 +44,24 @@ msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir la función por defecto para un cierto "
-"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
-"codifica su hoja de servicios: los valores son recuperados y los campos son "
-"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
-"disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos del empleado como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Función analítica de usuario"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Error !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -114,7 +69,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
 
@@ -126,3 +86,42 @@ msgstr "Producto del usuario para esta cuenta analítica"
 #~ msgstr ""
 #~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 #~ "especial!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función analítica de usuario"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo le permite definir la función por defecto para un cierto "
+#~ "usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+#~ "codifica su hoja de servicios: los valores son recuperados y los campos son "
+#~ "auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+#~ "disponible.\n"
+#~ "\n"
+#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
+#~ "proporciona el valor por defecto para los datos del empleado como siempre "
+#~ "por lo que este módulo es perfectamente compatible con configuraciones "
+#~ "anteriores.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+#~ "seleccionada"
diff --git a/addons/analytic_user_function/i18n/es_MX.po b/addons/analytic_user_function/i18n/es_MX.po
new file mode 100644
index 00000000000..fbe16517d0d
--- /dev/null
+++ b/addons/analytic_user_function/i18n/es_MX.po
@@ -0,0 +1,129 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_user_function
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-16 18:03+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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: 2011-09-05 05:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Rel. usuarios/productos"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default function of a "
+"specific user on a given account. This is mostly used when a user encodes "
+"his timesheet: the values are retrieved and the fields are auto-filled... "
+"but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir la función por defecto para un cierto "
+"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+"codifica su hoja de servicios: los valores son recuperados y los campos son "
+"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+"disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos del empleado como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Función analítica de usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index 9e69303bfd4..bfb8eb78ccb 100644
--- a/addons/analytic_user_function/i18n/es_PY.po
+++ b/addons/analytic_user_function/i18n/es_PY.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-03-07 23:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <es_PY@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Línea hoja de servicios"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cuenta Analítica"
@@ -47,66 +45,24 @@ msgid "Users/Products Rel."
 msgstr "Rel. usuarios/productos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo le permite definir la función por defecto para un cierto "
-"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
-"codifica su hoja de servicios: los valores son recuperados y los campos son "
-"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
-"disponible.\n"
-"\n"
-"    Obviamente si no se ha guardado datos para la cuenta actual, se "
-"proporciona el valor por defecto para los datos del empleado como siempre "
-"por lo que este módulo es perfectamente compatible con configuraciones "
-"anteriores.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Función analítica de usuario"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -114,6 +70,49 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea hoja de servicios"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo le permite definir la función por defecto para un cierto "
+#~ "usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+#~ "codifica su hoja de servicios: los valores son recuperados y los campos son "
+#~ "auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+#~ "disponible.\n"
+#~ "\n"
+#~ "    Obviamente si no se ha guardado datos para la cuenta actual, se "
+#~ "proporciona el valor por defecto para los datos del empleado como siempre "
+#~ "por lo que este módulo es perfectamente compatible con configuraciones "
+#~ "anteriores.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "¡Error! La moneda debe ser la misma que la moneda de la compañía seleccionada"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función analítica de usuario"
diff --git a/addons/analytic_user_function/i18n/es_VE.po b/addons/analytic_user_function/i18n/es_VE.po
new file mode 100644
index 00000000000..fbe16517d0d
--- /dev/null
+++ b/addons/analytic_user_function/i18n/es_VE.po
@@ -0,0 +1,129 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* analytic_user_function
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"PO-Revision-Date: 2011-01-16 18:03+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.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: 2011-09-05 05:39+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Línea de la hoja de servicios"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Rel. usuarios/productos"
+
+#. module: analytic_user_function
+#: field:analytic_user_funct_grid,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
+"seleccionada"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabla de relación entre usuarios y productos de una cuenta analítica"
+
+#. module: analytic_user_function
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid ""
+"\n"
+"\n"
+"    This module allows you to define what is the default function of a "
+"specific user on a given account. This is mostly used when a user encodes "
+"his timesheet: the values are retrieved and the fields are auto-filled... "
+"but the possibility to change these values is still available.\n"
+"\n"
+"    Obviously if no data has been recorded for the current account, the "
+"default value is given as usual by the employee data so that this module is "
+"perfectly compatible with older configurations.\n"
+"\n"
+"    "
+msgstr ""
+"\n"
+"\n"
+"    Este módulo le permite definir la función por defecto para un cierto "
+"usuario en una cuenta dada. Se utiliza principalmente cuando un usuario "
+"codifica su hoja de servicios: los valores son recuperados y los campos son "
+"auto rellenados aunque la posibilidad de cambiar estos valores está todavía "
+"disponible.\n"
+"\n"
+"    Obviamente si no se ha guardado datos para la cuenta actual, se "
+"proporciona el valor por defecto para los datos del empleado como siempre "
+"por lo que este módulo es perfectamente compatible con configuraciones "
+"anteriores.\n"
+"\n"
+"    "
+
+#. module: analytic_user_function
+#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
+msgid "Analytic User Function"
+msgstr "Función analítica de usuario"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: analytic_user_function
+#: view:analytic_user_funct_grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Producto del usuario para esta cuenta analítica"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 873332508a4..d13d23464c4 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-10-30 15:57+0000\n"
 "Last-Translator: Ahti Hinnov <sipelgas@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Toode"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Viga !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Seose tabel kasutajate ja toodete vahel analüütilisel kontol"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analüütiline konto"
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr "Kasutajate/Toodete seosed"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Kasutaja"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Seose tabel kasutajate ja toodete vahel analüütilisel kontol"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Viga !"
 
 #. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analüüsi kasutaj funktsioone"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Kasutaja tooted sellel analüütilisel kontol"
 
@@ -108,3 +84,6 @@ msgstr "Kasutaja tooted sellel analüütilisel kontol"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analüüsi kasutaj funktsioone"
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
new file mode 100644
index 00000000000..1d72ced83dd
--- /dev/null
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -0,0 +1,79 @@
+# Persian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2011-12-18 17:03+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Persian <fa@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-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr ""
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr ""
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
index 6009391e665..428e8f9d152 100644
--- a/addons/analytic_user_function/i18n/fi.po
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-06-29 05:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish <fi@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Tuote"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Virhe !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Tuntilistan rivi"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analyyttinen tili"
@@ -47,50 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Käyttäjän/Tuotteen suhde"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Käyttäjä"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analyyttinen käyttäjätoiminto"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Virhe !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -98,6 +69,19 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Tuntilistan rivi"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Käyttäjän tuote tälle analyyttiselle tilille"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta."
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analyyttinen käyttäjätoiminto"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 990d9d820b1..1a6f5864592 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -6,35 +6,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-18 16:43+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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produit"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+"Tableau de relation entre les utilisateurs et les produits sur un compte "
+"analytique"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Ligne de prestation"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Compte analytique"
@@ -46,69 +46,24 @@ msgid "Users/Products Rel."
 msgstr "Relation Utilisateurs/Produits"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Utilisateur"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Erreur ! La monnaie doit être la même que la monnaie de la société "
-"sélectionnée"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Il n'y a pas de compte de frais défini pour ce produit : \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-"Tableau de relation entre les utilisateurs et les produits sur un compte "
-"analytique"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Ce module vous permet de définir quelle est la fonction par défaut d'un "
-"utilisateur spécifique sur un compte donné. Ceci est surtout utilisé quand "
-"l'utilisateur encode sa feuille de temps : les valeurs sont récupérées et "
-"les champs sont auto-complétés... mais il est toujours possible de changer "
-"ces valeurs.\n"
-"\n"
-"    Évidemment, si aucune donnée n'a été enregistré pour le compte actuel, "
-"la valeur par défaut est donnée comme d'habitude par les données de "
-"l'utilisateur, ainsi le module est parfaitement compatible avec les "
-"anciennes configurations.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Fonction utilisateur analytique"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Erreur !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -116,9 +71,53 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Ligne de prestation"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Fonction utilisateur analytique"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Erreur ! La monnaie doit être la même que la monnaie de la société "
+#~ "sélectionnée"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Ce module vous permet de définir quelle est la fonction par défaut d'un "
+#~ "utilisateur spécifique sur un compte donné. Ceci est surtout utilisé quand "
+#~ "l'utilisateur encode sa feuille de temps : les valeurs sont récupérées et "
+#~ "les champs sont auto-complétés... mais il est toujours possible de changer "
+#~ "ces valeurs.\n"
+#~ "\n"
+#~ "    Évidemment, si aucune donnée n'a été enregistré pour le compte actuel, "
+#~ "la valeur par défaut est donnée comme d'habitude par les données de "
+#~ "l'utilisateur, ainsi le module est parfaitement compatible avec les "
+#~ "anciennes configurations.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 627f1629b0c..f5d9f76eb09 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -8,35 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: analytic-user-function-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-02-11 13:07+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "¡Erro!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Táboa de relación entre usuarios e produtos nunha conta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Liña de parte de horas"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Conta analítica"
@@ -48,63 +46,23 @@ msgid "Users/Products Rel."
 msgstr "Rel. Usuarios/Produtos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuario"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "¡Erro! A divisa ten que sela mesma ca da compañía seleccionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Non hai conta de gastos definida pra este produto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Táboa de relación entre usuarios e produtos nunha conta analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo permítelle definir cal é a función por defecto dun usuario "
-"específico nunha conta dada. Isto é usado maiormente cando un usuario "
-"codifica o seu parte de horas: os valores son recuperados e os campos son "
-"auto-enchidos... pero a posibilidade para cambiar estes valores está ainda "
-"dispoñible.\n"
-"\n"
-"    Obviamente se ningún dato foi gardado para a conta actual, o valor por "
-"defecto está dado como de costume polos datos do empregado así que este "
-"módulo é perfectamente compatible con configuracións máis antigas.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Función Analítica de Usuario"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "¡Erro!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -112,7 +70,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "¡Erro! Non pode crear contas analíticas recorrentes."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Liña de parte de horas"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produto do usuario para esta Conta Analítica"
 
@@ -124,3 +87,39 @@ msgstr "Produto do usuario para esta Conta Analítica"
 #~ msgstr ""
 #~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
 #~ "especial!"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo permítelle definir cal é a función por defecto dun usuario "
+#~ "específico nunha conta dada. Isto é usado maiormente cando un usuario "
+#~ "codifica o seu parte de horas: os valores son recuperados e os campos son "
+#~ "auto-enchidos... pero a posibilidade para cambiar estes valores está ainda "
+#~ "dispoñible.\n"
+#~ "\n"
+#~ "    Obviamente se ningún dato foi gardado para a conta actual, o valor por "
+#~ "defecto está dado como de costume polos datos do empregado así que este "
+#~ "módulo é perfectamente compatible con configuracións máis antigas.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Función Analítica de Usuario"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "¡Erro! A divisa ten que sela mesma ca da compañía seleccionada"
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 69890805944..2a6adb56809 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -6,36 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-08-03 02:55+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2011-12-08 15:51+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr ""
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Veza između korisnika i proizvoda na  analitičkom kontu."
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički Konto"
@@ -47,60 +45,38 @@ msgid "Users/Products Rel."
 msgstr "veza Korisnici/Proizvodi"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "nije definiran konto troška za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Vza između korisnika i proizvoda kod Analitičkog konta."
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Funkcija Analitičkog Korisnika"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr "Korisnikov Proizvod za ovaj Analitički konto."
+msgstr "Proizvod  rada"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nepravilan XML format za View Architecture!"
@@ -109,3 +85,11 @@ msgstr "Korisnikov Proizvod za ovaj Analitički konto."
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Funkcija Analitičkog Korisnika"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Greška! Valuta ne odgovara valuti organizacije."
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 62e5f7416a9..0b1079ce89c 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-02-09 13:28+0000\n"
 "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
 "<openerp@novotrade.hu>\n"
@@ -14,28 +14,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Termék"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Hiba!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "A gyűjtőkód felhasználók és termékek közötti kapcsolati táblája"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Munkaidő-kimutatás sora"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Gyűjtőkód"
@@ -47,63 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Felhasználó/termék kapcsolat"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Felhasználó"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "%s (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "A gyűjtőkód felhasználók és termékek közötti kapcsolati táblája"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Ez a modul lehetővé teszi annak meghatározását, hogy mi a felhasználó "
-"alapértelmezett funkciója a gyűjtőkódon. Leginkább akkor használják, amikor "
-"a felhasználó berögzíti a munkaidő-kimutatását: az értékek feljönnek és a "
-"mezők automatikusan kitöltődnek... De ezeket az értékeket meg lehet "
-"változtatni.\n"
-"\n"
-"    Nyilvánvalóan, ha az aktuális gyűjtőkódra nem vittek be adatot, az "
-"alapértelmezett érték a munkavállalói adatokból kerül meghatározásra.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Felhasználó funkciója"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Hiba!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -111,6 +69,47 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Hiba! Nem hozhat létre rekurzív gyűjtőkódokat."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Munkaidő-kimutatás sora"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "A gyűjtőkódhoz kapcsolódó felhasználó és termék"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Hiba! A pénznemnek meg kell egyeznie a kiválasztott vállalat pénznemével."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Ez a modul lehetővé teszi annak meghatározását, hogy mi a felhasználó "
+#~ "alapértelmezett funkciója a gyűjtőkódon. Leginkább akkor használják, amikor "
+#~ "a felhasználó berögzíti a munkaidő-kimutatását: az értékek feljönnek és a "
+#~ "mezők automatikusan kitöltődnek... De ezeket az értékeket meg lehet "
+#~ "változtatni.\n"
+#~ "\n"
+#~ "    Nyilvánvalóan, ha az aktuális gyűjtőkódra nem vittek be adatot, az "
+#~ "alapértelmezett érték a munkavállalói adatokból kerül meghatározásra.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Felhasználó funkciója"
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index 069f9f082ce..eb4a470dc02 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Mantavya Gajjar (Open ERP) <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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produk"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr ""
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Akun Analisis"
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr "Pengguna/Products Rel"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Pengguna"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabel hubungan antara pengguna dengan produk pada akun analitik"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Fungsi Pengguna Analitik"
-
-#. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produk Pengguna untuk Akun Analitik ini"
 
@@ -105,5 +81,8 @@ msgstr "Produk Pengguna untuk Akun Analitik ini"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Nama Obyek harus berawalan _x dan tidak mengandung karakter khusus !"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "Fungsi Pengguna Analitik"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Salah dalam penyusunan format XML"
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index a60be96d07b..1d006112526 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-12 16:48+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Prodotto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Errore !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabella di collegamento tra utenti e prodotti su un conto analitico"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linea del Timesheet"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Conto Analitico"
@@ -46,67 +44,24 @@ msgid "Users/Products Rel."
 msgstr "Utenti/Prodotti Rel."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Nome utente"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Errore! La valuta deve essere uguale a quella impostata per l'azienda "
-"selezionata"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Non è stato definito alcun conto spese per questo prodotto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabella di collegamento tra utenti e prodotti su un conto analitico"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Questo modulo vi permette di definire qual'è la funzione default di uno "
-"specifico utente su un dato conto. Questo è molto utile quando un utente "
-"codifica il suo timesheet: i valori sono recuperati e i campi sono compilati "
-"automaticamente... ma la possibilità di cambiare questi valori è ancora "
-"disponibile.\n"
-"\n"
-"    Ovviamente se nessun dato è stato impostato per il conto attuale, è "
-"fornito il valore di default, come al solito, prelevato dai dati impiegato "
-"in modo che, questo modulo, risulti perfettamente compatibile con vecchie "
-"configurazioni.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Funzione di utente analitico"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Errore !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -114,7 +69,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linea del Timesheet"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Prodotto di utente per questo conto analitico"
 
@@ -126,3 +86,42 @@ msgstr "Prodotto di utente per questo conto analitico"
 #~ msgstr ""
 #~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 #~ "speciali!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Funzione di utente analitico"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Questo modulo vi permette di definire qual'è la funzione default di uno "
+#~ "specifico utente su un dato conto. Questo è molto utile quando un utente "
+#~ "codifica il suo timesheet: i valori sono recuperati e i campi sono compilati "
+#~ "automaticamente... ma la possibilità di cambiare questi valori è ancora "
+#~ "disponibile.\n"
+#~ "\n"
+#~ "    Ovviamente se nessun dato è stato impostato per il conto attuale, è "
+#~ "fornito il valore di default, come al solito, prelevato dai dati impiegato "
+#~ "in modo che, questo modulo, risulti perfettamente compatibile con vecchie "
+#~ "configurazioni.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Errore! La valuta deve essere uguale a quella impostata per l'azienda "
+#~ "selezionata"
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index f55ab1e7fa1..ecaf7afcf89 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Bundo <bundo@bundo.biz>\n"
 "Language-Team: Korean <ko@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "상품"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr ""
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "분석 계정 상의 사용자와 상품 간의 관계 테이블"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "분석 계정"
@@ -47,58 +45,36 @@ msgid "Users/Products Rel."
 msgstr "사용자/상품 관계"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "사용자"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "분석 계정 상의 사용자와 상품 간의 관계 테이블"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "사용자 함수 분석"
-
-#. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "이 분석 계정을 위한 사용자의 상품"
 
@@ -108,3 +84,6 @@ msgstr "이 분석 계정을 위한 사용자의 상품"
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "사용자 함수 분석"
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index 8e093ced7d0..188c09e28da 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-09-08 16:50+0000\n"
 "Last-Translator: Giedrius Slavinskas - inovera.lt "
 "<giedrius.slavinskas@gmail.com>\n"
@@ -14,28 +14,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -47,57 +45,35 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index f5a3f1c5483..355518cc745 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-11 03:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Бараа"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Алдаа !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Хэрэглэгч болон барааны аналитик дансны хамаарлын хүснэгт"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Цаг бүртгэлийн мөр"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Аналитик данс"
@@ -47,51 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Хэрэглэгч/Бүтээгдэхүүн"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Хэрэглэгч"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Алдаа! Мөнгөн тэмдэгт сонгогдсон компанийн мөнгөн тэмдэгттэй ижил байх ёстой."
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Энэ бараанд зардлын тооцоо тодорхойлогдоогүй байна:  \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Хэрэглэгч болон барааны аналитик дансны хамаарлын хүснэгт"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Аналитик хэрэглэгчийн үүрэг"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Алдаа !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -99,7 +69,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Алдаа! Та цикл хэлбэрийн аналитик данс үүсгэх боломжгүй."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Цаг бүртгэлийн мөр"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик данс"
 
@@ -111,3 +86,12 @@ msgstr "Хэрэглэгчийн бүтээгдэхүүний аналитик �
 #~ msgstr ""
 #~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
 #~ "болохгүй!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Аналитик хэрэглэгчийн үүрэг"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Алдаа! Мөнгөн тэмдэгт сонгогдсон компанийн мөнгөн тэмдэгттэй ижил байх ёстой."
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 48e1548a149..1105b900b51 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -6,35 +6,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-13 19:46+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-02-10 09:35+0000\n"
+"Last-Translator: Erwin <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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-11 05:09+0000\n"
+"X-Generator: Launchpad (build 14771)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Product"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Urenstaatregel"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"Het is niet mogelijk een bevestigde/Gereed zijnde boeking van een urenstaat "
+"te wijzigen!"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Kostenplaats"
@@ -46,53 +46,24 @@ msgid "Users/Products Rel."
 msgstr "Gebruikers/Producten rel."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Gebruiker"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"Fout! De munteenheid moet hetzelfde zijn als de munteenheid van het "
-"geselecteerde bedrijf"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Koppeltabel tussen gebruikers en producten op een kostenplaats"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analytische gebruikers funktie"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Fout !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -100,7 +71,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Fout! U kunt geen recursieve kostenplaatsen maken."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Urenstaatregel"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Product van gebruiker voor deze kostenplaats"
 
@@ -111,3 +87,13 @@ msgstr "Product van gebruiker voor deze kostenplaats"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analytische gebruikers funktie"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Fout! De munteenheid moet hetzelfde zijn als de munteenheid van het "
+#~ "geselecteerde bedrijf"
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 1eda0c37110..1c3e775bfa0 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-03 02:55+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produch"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Compte Analitic"
@@ -47,58 +45,36 @@ msgid "Users/Products Rel."
 msgstr "Relacion Utilizaires/Produches"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Utilizaire"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produch de l'Utilizaire per aqueste Compte Analitic"
 
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index b3f784c0d2e..dedc08db4a5 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-01-02 01:26+0000\n"
 "Last-Translator: Jarosław Ogrodnik <nobodythere@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Konto analityczne"
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Użytkownik"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 79aae2a70be..860bd64f7c8 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -6,35 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-12-04 09:29+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
+"Tabela da Relação entre utilizadores e produtos em uma Conta Analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linha de folha de horas"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Conta Analítica"
@@ -46,52 +45,24 @@ msgid "Users/Products Rel."
 msgstr "Utilizadores/Relação de Produtos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Utilizador"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 "Não há qualquer conta de despesas definida para o produto: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-"Tabela da Relação entre utilizadores e produtos em uma Conta Analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Função do Utilizador Analítico"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Erro !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -99,7 +70,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erro! Não pode criar contas analíticas recursivamente"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linha de folha de horas"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produto do Utilizador para esta Conta Analítica"
 
@@ -111,3 +87,6 @@ msgstr "Produto do Utilizador para esta Conta Analítica"
 #~ msgstr ""
 #~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
 #~ "especial !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Função do Utilizador Analítico"
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index 23bcd94062c..405617cc8eb 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2011-01-13 21:15+0000\n"
 "Last-Translator: Joe Pimentel <joe.b.pimentel@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produto"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabela da relação entre usuários e produtos em uma conta analítica"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Linha de Apontamento de Horas"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Conta Analítica"
@@ -46,63 +44,23 @@ msgid "Users/Products Rel."
 msgstr "Rel. Usuários/Produtos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Usuário"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Não há conta de despesa definida para este produto:%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabela da relação entre usuários e produtos em uma conta analítica"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Este módulo permite que você defina qual é a função padrão de um usuário "
-"específico em uma determinada conta. Isto é mais usado quando um usuário "
-"preenche a sua folha de horas? os valores são recuperados e os campos são "
-"auto-preenchidos... porém a possibilidade de alterar estes valores ainda "
-"está presente.\n"
-"\n"
-"    Obviamente, se nenhum dado foi registrado para a conta corrente, o valor "
-"padrão é dado como de costume pelos dados do funcionário, então este módulo "
-"é perfeitamente compatível com as configurações antigas.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Função do Usuário Analista"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Erro!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -110,7 +68,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Erro! Você não pode criar contas analíticas recursivas"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linha de Apontamento de Horas"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produto de Usuário para esta Conta Analítica"
 
@@ -122,3 +85,39 @@ msgstr "Produto de Usuário para esta Conta Analítica"
 #~ msgstr ""
 #~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 #~ "especial!"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Erro! A moeda deve ser a mesma da empresa selecionada"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Função do Usuário Analista"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Este módulo permite que você defina qual é a função padrão de um usuário "
+#~ "específico em uma determinada conta. Isto é mais usado quando um usuário "
+#~ "preenche a sua folha de horas? os valores são recuperados e os campos são "
+#~ "auto-preenchidos... porém a possibilidade de alterar estes valores ainda "
+#~ "está presente.\n"
+#~ "\n"
+#~ "    Obviamente, se nenhum dado foi registrado para a conta corrente, o valor "
+#~ "padrão é dado como de costume pelos dados do funcionário, então este módulo "
+#~ "é perfeitamente compatível com as configurações antigas.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index 7f9ff2700a3..3a7c4495f45 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -6,35 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-03 02:56+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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produs"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
+"Tabel de relaţii între utilizatori  şi produsele dintrun cont analitic"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Cont analitic"
@@ -46,67 +45,82 @@ msgid "Users/Products Rel."
 msgstr "Rel. utilizatori/produse"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Utilizator"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Nu exista un cont de cheltuieli definit pentru acest produs: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-"Tabel de relaţii între utilizatori  şi produsele dintrun cont analitic"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Funcţie analitică de utilizator"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Eroare !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Eroare! Nu puteti crea conturi analitice recursive."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Linie foaie de pontaj"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produsul utilizatorului pentru acest cont analitic"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "Funcţie analitică de utilizator"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
 #~ "special !"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Acest modul va permite sa definiti care este functia predefinita pentru "
+#~ "un anumit utilizator intr-un cont dat. Acesta este folosit mai ales atunci "
+#~ "cand un utilizator isi codeaza propria foaie de pontaj: valorile sunt "
+#~ "recuperate, iar campurile sunt completate automat... dar aveti inca "
+#~ "posibilitatea de a modifica aceste valori. \n"
+#~ "\n"
+#~ "Este evident faptul ca, daca datele pentru contul curent nu au fost "
+#~ "inregistrate, valoarea default este data de obicei de datele angajatului, "
+#~ "astfel ca acest modul este perfect compatibil cu configurari mai vechi.\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr ""
+#~ "Eroare! Moneda trebuie sa fie aceeasi ca si moneda companiei selectate"
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index cd3116b8b3a..b6373a8f1a4 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-04-16 13:24+0000\n"
 "Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Ошибка !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Строка табеля"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Счет аналитического учета"
@@ -46,62 +44,23 @@ msgid "Users/Products Rel."
 msgstr "Пользователь/Свяь в продукцией"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Пользователь"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Таблица связи между пользователем и продуктом для счёта аналитики"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Этот модуль позволяет определить функцию пользователя по-умолчанию для "
-"данной учётной записи. Чаще всего это используется при заполнении "
-"пользователем табеля: значения получаются и поля заполняются "
-"автоматически... но сохраняется возможность изменить эти значения.\n"
-"\n"
-"    Очевидно, если для данной учётной записи никаких данных записано не "
-"было, значение по-умолчанию предоставляется данными сотрудника, так что этот "
-"модуль прекрасно совместим с более старыми конфигурациями.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Пользовательская функция аналитики"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Ошибка !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -109,7 +68,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Ошибка! Вы не можете создавать рекурсивные аналитический счета."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Строка табеля"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Продуктв пользователей для счета аналитики"
 
@@ -121,3 +85,38 @@ msgstr "Продуктв пользователей для счета анали
 #~ msgstr ""
 #~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
 #~ "символов !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Пользовательская функция аналитики"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Ошибка! Валюта должна совпадать с валютой выбранной компании"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Этот модуль позволяет определить функцию пользователя по-умолчанию для "
+#~ "данной учётной записи. Чаще всего это используется при заполнении "
+#~ "пользователем табеля: значения получаются и поля заполняются "
+#~ "автоматически... но сохраняется возможность изменить эти значения.\n"
+#~ "\n"
+#~ "    Очевидно, если для данной учётной записи никаких данных записано не "
+#~ "было, значение по-умолчанию предоставляется данными сотрудника, так что этот "
+#~ "модуль прекрасно совместим с более старыми конфигурациями.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 4a39b114c4e..42cb5e1fd5d 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-03 02:57+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analytický účet"
@@ -47,58 +45,36 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Užívateľ"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index c44e848418d..99e0e564187 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-12-16 18:01+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Izdelek"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Napaka!"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Postavka časovnice"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitični konto"
@@ -46,62 +44,23 @@ msgid "Users/Products Rel."
 msgstr "Odnos Uporabniki/Produkti"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Uporabnik"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Ni definiranega konta stroškov za ta izdelek: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Ta modul vam omogoča, da določite, kaj je privzeta funkcija določenega "
-"uporabnika za določen račun. To se večinoma uporablja, ko uporabnik definira "
-"svoje opravljene ure: vrednosti so pridobljene in polja so avtomatsko "
-"vnešena ... ampak možnost spremembe teh vrednosti so še vedno na voljo.\n"
-"\n"
-"Seveda, če podatki niso bili  zapisani za trenutni račun, je privzeta "
-"vrednost, ki je ponavadi pridobljena iz podatkov zaposlenih, tako da je ta "
-"modul popolnoma združljiv s starejšimi konfiguracijami.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analitična uporabniška funkcija"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Napaka!"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -109,7 +68,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Postavka časovnice"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Uporabniški proizvodi za ta analitični konto"
 
@@ -120,3 +84,38 @@ msgstr "Uporabniški proizvodi za ta analitični konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analitična uporabniška funkcija"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Napaka! Valuta mora biti enaka kot valuta izbranega podjetja"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Ta modul vam omogoča, da določite, kaj je privzeta funkcija določenega "
+#~ "uporabnika za določen račun. To se večinoma uporablja, ko uporabnik definira "
+#~ "svoje opravljene ure: vrednosti so pridobljene in polja so avtomatsko "
+#~ "vnešena ... ampak možnost spremembe teh vrednosti so še vedno na voljo.\n"
+#~ "\n"
+#~ "Seveda, če podatki niso bili  zapisani za trenutni račun, je privzeta "
+#~ "vrednost, ki je ponavadi pridobljena iz podatkov zaposlenih, tako da je ta "
+#~ "modul popolnoma združljiv s starejšimi konfiguracijami.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index 9a0555d3c98..29b16c64a8e 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@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: 2011-10-19 05:31+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -47,57 +45,35 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index 1b167cfd40e..a919f617f8a 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-10-27 08:09+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Serbian <sr@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Greška !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Niz Kontrolne kartice"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički konto"
@@ -47,50 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Korisnik/Proizvod Relac."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Korisnicka Funkcija Analitike"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -98,13 +69,21 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Niz Kontrolne kartice"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "Korisnicka Funkcija Analitike"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index 42279dece83..e0226c171af 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -7,35 +7,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-12-23 14:19+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2011-12-27 15:49+0000\n"
+"Last-Translator: Milan Milosevic <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Greška !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Relaciona tabela između korisnika i proizvoda u analitičkom kontu"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Niz Kontrolne kartice"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"Ne možete izmeniti unos u tabelama obeleženim kao Potvrđenim/Završenim"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analitički konto"
@@ -44,63 +43,42 @@ msgstr "Analitički konto"
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Korisnik/Proizvod Relac."
+msgstr "Korisnik/Proizvod Odnos"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Korisnik"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Nema dodatnih troškova za nalog određenog za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "Relaciona tabela izmedju korisnika i proizvoda u analitickom kontu"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Korisnicka Funkcija Analitike"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Greška! Ne možete praviti rekurzivne analitičke naloge."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Niz kontrolne kartice"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
+msgstr "Korisnički proizvod za ovaj Analitički Konto"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
@@ -109,3 +87,11 @@ msgstr "Korisnicki Proizvod za ovaj Analiticki Konto"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Korisnicka Funkcija Analitike"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Greška! Valuta mora biti ista kao i valuta izabranog preduzeća"
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index 65618950d63..69486b21c7f 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-11-23 09:44+0000\n"
 "Last-Translator: OpenERP Administrators <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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Produkt"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Objekt"
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr "Användare/produkt relation"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Användare"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analytic User Function"
-
-#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Användarens produkt för detta objekt"
 
@@ -105,3 +81,6 @@ msgstr "Användarens produkt för detta objekt"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Analytic User Function"
+#~ msgstr "Analytic User Function"
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index 9bc2b2e59f6..1e523eb5863 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-02-03 06:24+0000\n"
 "Last-Translator: <>\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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -46,57 +44,35 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 606e87ab98c..fa360c75d5a 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -6,35 +6,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-05-08 17:12+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-01-10 23:17+0000\n"
+"Last-Translator: Ahmet Altınışık <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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Ürün"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Hata !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "İlişkili tablo analitik hesapta kullanıcılar ve ürün arasında"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Mesai Kartı Satırı"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+"Onaylandı/Tamanlandı durumundaki zaman çizelgesini değiştiremezsiniz !."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Analiz Hesabı"
@@ -46,62 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Kullanıcı/Ürün İlşk."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Kullanıcı"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "Hata! Para birim seçilen şirketin para birimiyle aynı olmalı"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "Bu ürün için tanımlı gider hesabı yok: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "İlişkili tablo analitik hesapta kullanıcılar ve ürün arasında"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    Bu modül, belirli bir kullanıcının varsayılan işlevinin ne olduğunu "
-"tanımlamanızı sağlar. Bu çoğunlukla bir kullanıcı zaman çizelgesi kodlaması "
-"yaparken kullanılır: değerler alınır ve alanlar otomatik doldurulur ... "
-"ancak bu değerleri değiştirme olasılığı hala mevcuttur.\n"
-"\n"
-"    Mevcut hesap için hiçbir veri kaydedilmemişse, varsayılan değer genel "
-"olarak personel bilgisi olarak verilir ki; bu modülün eski yapılandırmalarla "
-"ne mükemmel bir uyum içinde olduğunu gösterir.\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "Analitik Kullanıcı Fonksiyonu"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Hata !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -109,13 +69,53 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Hata! Yinelenen çözümleme hesabı oluşturamazsınız."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Mesai Kartı Satırı"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Bu Analitik Hesap İçin Kullanıcının Ürünü"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "Analitik Kullanıcı Fonksiyonu"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Nesne adı x_ ile başlamalı ve özel karakter içermemelidir!"
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "Hata! Para birim seçilen şirketin para birimiyle aynı olmalı"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    Bu modül, belirli bir kullanıcının varsayılan işlevinin ne olduğunu "
+#~ "tanımlamanızı sağlar. Bu çoğunlukla bir kullanıcı zaman çizelgesi kodlaması "
+#~ "yaparken kullanılır: değerler alınır ve alanlar otomatik doldurulur ... "
+#~ "ancak bu değerleri değiştirme olasılığı hala mevcuttur.\n"
+#~ "\n"
+#~ "    Mevcut hesap için hiçbir veri kaydedilmemişse, varsayılan değer genel "
+#~ "olarak personel bilgisi olarak verilir ki; bu modülün eski yapılandırmalarla "
+#~ "ne mükemmel bir uyum içinde olduğunu gösterir.\n"
+#~ "\n"
+#~ "    "
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 45d624f7723..3af37f3a3ca 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-02-03 08:33+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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -46,58 +44,36 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
 
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index a87f69ff8cf..d23f9a1d1e8 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -7,35 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2010-08-02 14:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Vietnamese <vi@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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "Sản phẩm"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "Lỗi !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "Dòng chấm công"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "Tài khoản KTQT"
@@ -47,50 +45,23 @@ msgid "Users/Products Rel."
 msgstr "Liên kết Người sử dụng/Sản phẩm"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "Người sử dụng"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr ""
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Lỗi !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -98,6 +69,11 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "Lỗi! Bạn không thể tạo các tài khoản phân tích đệ quy."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Dòng chấm công"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 53599a6975e..82e41abc584 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2010-09-29 09:18+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-02-08 03:46+0000\n"
+"Last-Translator: Jeff Wang <wjfonhand@hotmail.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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr "产品"
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
-msgstr "错误！"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "用在有关系的用户和产品的辅助核算项"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr "计工单明细"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "已经确认和完成的计工单行不能修改！"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr "辅助核算项"
@@ -46,56 +44,23 @@ msgid "Users/Products Rel."
 msgstr "用户/相关产品"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr "用户"
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr "错误！此币别必须是选定公司的默认币别。"
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr "用在有关系的用户和产品的辅助核算项"
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"\n"
-"    此模块允许你定义给定的用户默认的职能。常用于用户输入计工单：这些预定义的值默认填充了字段，当然可以修改。\n"
-"当然，如果当前用户没有默认的数据，这些默认值会从员工记录去取。所以此模块与之前的配置是兼容的。\n"
-"\n"
-"    "
-
-#. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr "辅助核算用的函数"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "错误！"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
@@ -103,13 +68,47 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr "错误! 你不能创建递归的辅助核算项"
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "计工单明细"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "用户产品的辅助核算项"
 
+#~ msgid "Analytic User Function"
+#~ msgstr "辅助核算用的函数"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效XML视图结构!"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "    This module allows you to define what is the default function of a "
+#~ "specific user on a given account. This is mostly used when a user encodes "
+#~ "his timesheet: the values are retrieved and the fields are auto-filled... "
+#~ "but the possibility to change these values is still available.\n"
+#~ "\n"
+#~ "    Obviously if no data has been recorded for the current account, the "
+#~ "default value is given as usual by the employee data so that this module is "
+#~ "perfectly compatible with older configurations.\n"
+#~ "\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "    此模块允许你定义给定的用户默认的职能。常用于用户输入计工单：这些预定义的值默认填充了字段，当然可以修改。\n"
+#~ "当然，如果当前用户没有默认的数据，这些默认值会从员工记录去取。所以此模块与之前的配置是兼容的。\n"
+#~ "\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Error! The currency has to be the same as the currency of the selected "
+#~ "company"
+#~ msgstr "错误！此币别必须是选定公司的默认币别。"
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 60e4e16b071..d0300e2ff7b 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -6,35 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2009-01-23 16:16+0000\n"
 "Last-Translator: <>\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: 2011-10-19 05:32+0000\n"
-"X-Generator: Launchpad (build 14157)\n"
+"X-Launchpad-Export-Date: 2012-02-09 06:47+0000\n"
+"X-Generator: Launchpad (build 14763)\n"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
+#: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:96
-#: code:addons/analytic_user_function/analytic_user_function.py:131
-#, python-format
-msgid "Error !"
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
-msgid "Timesheet Line"
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
 msgstr ""
@@ -46,57 +44,35 @@ msgid "Users/Products Rel."
 msgstr ""
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-
-#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:97
-#: code:addons/analytic_user_function/analytic_user_function.py:132
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
-msgid "Relation table between users and products on a analytic account"
-msgstr ""
-
-#. module: analytic_user_function
-#: model:ir.module.module,description:analytic_user_function.module_meta_information
-msgid ""
-"\n"
-"\n"
-"    This module allows you to define what is the default function of a "
-"specific user on a given account. This is mostly used when a user encodes "
-"his timesheet: the values are retrieved and the fields are auto-filled... "
-"but the possibility to change these values is still available.\n"
-"\n"
-"    Obviously if no data has been recorded for the current account, the "
-"default value is given as usual by the employee data so that this module is "
-"perfectly compatible with older configurations.\n"
-"\n"
-"    "
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
 msgstr ""
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
 msgstr ""
diff --git a/addons/analytic_user_function/security/ir.model.access.csv b/addons/analytic_user_function/security/ir.model.access.csv
index d8f2f0d2116..fe48e329aea 100644
--- a/addons/analytic_user_function/security/ir.model.access.csv
+++ b/addons/analytic_user_function/security/ir.model.access.csv
@@ -1,6 +1,6 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_analytic_user_funct_user","analytic user funct user","model_analytic_user_funct_grid","account.group_account_manager",1,0,0,0
-"access_analytic_user_funct_manager","analytic user funct manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_account_manager","analytic user funct account manager","model_analytic_user_funct_grid","account.group_account_manager",1,1,1,1
-"access_analytic_user_funct_grid_hr_user","analytic user funct grid hr user","model_analytic_user_funct_grid","base.group_hr_user",1,0,0,0
-"access_analytic_user_funct_grid_hr_manager","analytic user funct grid hr manager","model_analytic_user_funct_grid","base.group_hr_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_analytic_user_funct_user,analytic user funct user,model_analytic_user_funct_grid,account.group_account_manager,1,0,0,0

+access_analytic_user_funct_manager,analytic user funct manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1

+access_analytic_user_funct_account_manager,analytic user funct account manager,model_analytic_user_funct_grid,account.group_account_manager,1,1,1,1

+access_analytic_user_funct_grid_hr_user,analytic user funct grid hr user,model_analytic_user_funct_grid,base.group_hr_user,1,0,0,0

+access_analytic_user_funct_grid_hr_manager,analytic user funct grid hr manager,model_analytic_user_funct_grid,base.group_hr_manager,1,1,1,1