From ac3f37be8fd77b207baad3ca6978eb576aa8a204 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 3 Jan 2011 18:21:58 +0100 Subject: [PATCH 1/3] [I18N] base: updated translation templates after latest changes (again) bzr revid: odo@openerp.com-20110103172158-j60duhck9fh6lv9x --- bin/addons/base/i18n/base.pot | 49 +++++++++-------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot index 2276ea35711..a5507d852a8 100644 --- a/bin/addons/base/i18n/base.pot +++ b/bin/addons/base/i18n/base.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2011-01-03 09:14:30+0000\n" -"PO-Revision-Date: 2011-01-03 09:14:30+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:13+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:13+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1772,11 +1772,6 @@ msgstr "" msgid "Korean (KR) / 한국어 (KR)" msgstr "" -#. module: base -#: model:res.widget,title:base.matrixise_twitter_widget -msgid "Stéphane Wirtel's tweets" -msgstr "" - #. module: base #: field:ir.actions.server,action_id:0 #: selection:ir.actions.server,state:0 @@ -3132,11 +3127,6 @@ msgstr "" msgid "If set to true, the action will not be displayed on the right toolbar of a form view." msgstr "" -#. module: base -#: model:res.country,name:base.al -msgid "Albania" -msgstr "" - #. module: base #: view:ir.attachment:0 msgid "Attached To" @@ -3696,6 +3686,11 @@ msgstr "" msgid "Workitem" msgstr "" +#. module: base +#: view:ir.actions.todo:0 +msgid "Set as Todo" +msgstr "" + #. module: base #: field:ir.actions.act_window.view,act_window_id:0 #: view:ir.actions.actions:0 @@ -4556,11 +4551,6 @@ msgstr "" msgid "Dutch / Nederlands" msgstr "" -#. module: base -#: model:res.widget,title:base.rvalyi_twitter_widget -msgid "Raphaël Valyi's tweets" -msgstr "" - #. module: base #: code:addons/base/res/res_config.py:384 #, python-format @@ -4867,11 +4857,6 @@ msgstr "" msgid "Choose between the simplified interface and the extended one" msgstr "" -#. module: base -#: model:res.widget,title:base.odony_twitter_widget -msgid "Olivier Dony's tweets" -msgstr "" - #. module: base #: model:res.country,name:base.np msgid "Nepal" @@ -6182,8 +6167,8 @@ msgid "Client Logs" msgstr "" #. module: base -#: view:ir.actions.todo:0 -msgid "Set as Todo" +#: model:res.country,name:base.al +msgid "Albania" msgstr "" #. module: base @@ -6458,7 +6443,7 @@ msgid "Module Update" msgstr "" #. module: base -#: code:addons/base/module/wizard/base_module_upgrade.py:97 +#: code:addons/base/module/wizard/base_module_upgrade.py:95 #, python-format msgid "Following modules are not installed or unknown: %s" msgstr "" @@ -8121,11 +8106,6 @@ msgstr "" msgid "Phone" msgstr "" -#. module: base -#: model:res.widget,title:base.albertnan_twitter_widget -msgid "Albert Cervera Areny's tweets" -msgstr "" - #. module: base #: field:ir.cron,active:0 #: field:ir.sequence,active:0 @@ -8281,7 +8261,7 @@ msgid "View Ordering" msgstr "" #. module: base -#: code:addons/base/module/wizard/base_module_upgrade.py:97 +#: code:addons/base/module/wizard/base_module_upgrade.py:95 #, python-format msgid "Unmet dependency !" msgstr "" @@ -8700,11 +8680,6 @@ msgstr "" msgid "Seychelles" msgstr "" -#. module: base -#: model:res.widget,title:base.nhomar_twitter_widget -msgid "Nhomar Hernandez's tweets" -msgstr "" - #. module: base #: model:ir.model,name:base.model_res_partner_bank #: view:res.partner.bank:0 From afa53f95a26d43b6eb748cd7ac0a027bdbbfd1f0 Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Tue, 4 Jan 2011 12:06:59 +0530 Subject: [PATCH 2/3] [IMP] project_long_term: Add start date and end date in tasks detail view bzr revid: sbh@tinyerp.com-20110104063659-rhwstzc0tch71dsq --- addons/project_long_term/project_long_term_view.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 61e0a7dd7f9..ff4cfd8575b 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -154,6 +154,8 @@ + + @@ -172,6 +174,7 @@ + From 204613eee343951e20c90e2db84c9b96ba33bb7c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 4 Jan 2011 10:36:36 +0100 Subject: [PATCH 3/3] [IMP] testing lp to have two po terms different context, same id: warehouse, fr bzr revid: fp@tinyerp.com-20110104093636-hxvrtkgm16mzj6tv --- addons/stock/i18n/fr.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index e17796027d7..6346aa1af74 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -2806,11 +2806,15 @@ msgstr "Nom de révision" #. module: stock #: model:ir.model,name:stock.model_stock_warehouse -#: model:ir.ui.menu,name:stock.menu_stock_root #: view:stock.warehouse:0 msgid "Warehouse" msgstr "Entrepôt" +#. module: stock +#: model:ir.ui.menu,name:stock.menu_stock_root +msgid "Warehouse" +msgstr "Stocks" + #. module: stock #: view:stock.location.product:0 msgid ""