summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>2012-01-25 17:22:46 +0530
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>2012-01-25 17:22:46 +0530
commitbe6cddfb9912c4f3ef2a53143a644cf7770244de (patch)
tree0e89ca6b2dc8ebb3f6c4ade604cb8847bf3ff766 /addons/analytic_user_function
parent45d3b74350743bcaa8ba0a2dd148d741b599ef75 (diff)
parent1f8536a33459d732a9ad372f0da78d0606bbc053 (diff)
[MERGE]: Merge with lp:openobject-addons
bzr revid: mma@tinyerp.com-20120125115246-xi9v4m85ik0gilsm
Diffstat (limited to 'addons/analytic_user_function')
-rw-r--r--addons/analytic_user_function/i18n/de.po10
-rw-r--r--addons/analytic_user_function/i18n/en_GB.po10
2 files changed, 10 insertions, 10 deletions
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index bfe71506e7c..594de847ecb 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -7,15 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-01-12 16:14+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\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-12-23 07:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-14 05:12+0000\n"
+"X-Generator: Launchpad (build 14664)\n"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,product_id:0
@@ -31,6 +30,7 @@ msgstr "Relation zwischen Benutzern und Produkten"
#: 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
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index a6aebc896e1..5912cd3c1fb 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-12-22 18:44+0000\n"
-"PO-Revision-Date: 2011-08-25 17:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-12-23 07:09+0000\n"
-"X-Generator: Launchpad (build 14560)\n"
+"X-Launchpad-Export-Date: 2012-01-24 05:30+0000\n"
+"X-Generator: Launchpad (build 14713)\n"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,product_id:0
@@ -30,7 +30,7 @@ msgstr "Relation table between users and products on a analytic account"
#. module: analytic_user_function
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "You cannot modify an entry in a Confirmed/Done timesheet !."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0