summaryrefslogtreecommitdiff
path: root/addons/base_module_merge
diff options
context:
space:
mode:
authorStephane Wirtel <stephane@tinyerp.com>2009-01-19 21:01:34 +0100
committerStephane Wirtel <stephane@tinyerp.com>2009-01-19 21:01:34 +0100
commit90b4b4e98dd7f2b74766dca30bdfde65c8168912 (patch)
tree6eefbd5ed81ca098226cfbaeafa8031bd8cd51c1 /addons/base_module_merge
parente61c5f97a8feb46ea9d0af0c46a43d3cc055faa1 (diff)
[IMP] Update the translations
bzr revid: stephane@tinyerp.com-20090119200134-c6ib06xzwc8oa3w8
Diffstat (limited to 'addons/base_module_merge')
-rw-r--r--addons/base_module_merge/i18n/ar_AR.po26
-rw-r--r--addons/base_module_merge/i18n/base_module_merge.pot26
-rw-r--r--addons/base_module_merge/i18n/bg_BG.po26
-rw-r--r--addons/base_module_merge/i18n/bs_BS.po26
-rw-r--r--addons/base_module_merge/i18n/ca_ES.po26
-rw-r--r--addons/base_module_merge/i18n/cs_CZ.po26
-rw-r--r--addons/base_module_merge/i18n/de_DE.po26
-rw-r--r--addons/base_module_merge/i18n/es_AR.po26
-rw-r--r--addons/base_module_merge/i18n/es_ES.po26
-rw-r--r--addons/base_module_merge/i18n/et_EE.po26
-rw-r--r--addons/base_module_merge/i18n/fr_FR.po26
-rw-r--r--addons/base_module_merge/i18n/hr_HR.po26
-rw-r--r--addons/base_module_merge/i18n/hu_HU.po26
-rw-r--r--addons/base_module_merge/i18n/it_IT.po26
-rw-r--r--addons/base_module_merge/i18n/lt_LT.po26
-rw-r--r--addons/base_module_merge/i18n/nl_NL.po26
-rw-r--r--addons/base_module_merge/i18n/pl_PL.po26
-rw-r--r--addons/base_module_merge/i18n/pt_BR.po26
-rw-r--r--addons/base_module_merge/i18n/pt_PT.po26
-rw-r--r--addons/base_module_merge/i18n/ro_RO.po26
-rw-r--r--addons/base_module_merge/i18n/ru_RU.po26
-rw-r--r--addons/base_module_merge/i18n/sl_SL.po26
-rw-r--r--addons/base_module_merge/i18n/sv_SE.po26
-rw-r--r--addons/base_module_merge/i18n/tlh_TLH.po153
-rw-r--r--addons/base_module_merge/i18n/tr_TR.po26
-rw-r--r--addons/base_module_merge/i18n/uk_UK.po26
-rw-r--r--addons/base_module_merge/i18n/zh_CN.po26
-rw-r--r--addons/base_module_merge/i18n/zh_TW.po26
28 files changed, 666 insertions, 189 deletions
diff --git a/addons/base_module_merge/i18n/ar_AR.po b/addons/base_module_merge/i18n/ar_AR.po
index 68359d8801a..152e92952a1 100644
--- a/addons/base_module_merge/i18n/ar_AR.po
+++ b/addons/base_module_merge/i18n/ar_AR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:00:15+0000\n"
-"PO-Revision-Date: 2009-01-03 02:00:15+0000\n"
+"POT-Creation-Date: 2009-01-19 19:27:21+0000\n"
+"PO-Revision-Date: 2009-01-19 19:27:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/base_module_merge.pot b/addons/base_module_merge/i18n/base_module_merge.pot
index 0d6ee6d5ed1..8b18edc7216 100644
--- a/addons/base_module_merge/i18n/base_module_merge.pot
+++ b/addons/base_module_merge/i18n/base_module_merge.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:18:25+0000\n"
-"PO-Revision-Date: 2009-01-03 02:18:25+0000\n"
+"POT-Creation-Date: 2009-01-19 19:46:38+0000\n"
+"PO-Revision-Date: 2009-01-19 19:46:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/bg_BG.po b/addons/base_module_merge/i18n/bg_BG.po
index 40600c08a8e..ccbc8bc26d9 100644
--- a/addons/base_module_merge/i18n/bg_BG.po
+++ b/addons/base_module_merge/i18n/bg_BG.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:00:56+0000\n"
-"PO-Revision-Date: 2009-01-03 02:00:56+0000\n"
+"POT-Creation-Date: 2009-01-19 19:28:41+0000\n"
+"PO-Revision-Date: 2009-01-19 19:28:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/bs_BS.po b/addons/base_module_merge/i18n/bs_BS.po
index 8604f9b350e..35cce3d7499 100644
--- a/addons/base_module_merge/i18n/bs_BS.po
+++ b/addons/base_module_merge/i18n/bs_BS.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:17:41+0000\n"
-"PO-Revision-Date: 2009-01-03 02:17:41+0000\n"
+"POT-Creation-Date: 2009-01-19 19:28:02+0000\n"
+"PO-Revision-Date: 2009-01-19 19:28:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/ca_ES.po b/addons/base_module_merge/i18n/ca_ES.po
index f50836766ff..7786ddc595e 100644
--- a/addons/base_module_merge/i18n/ca_ES.po
+++ b/addons/base_module_merge/i18n/ca_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:01:35+0000\n"
-"PO-Revision-Date: 2009-01-03 02:01:35+0000\n"
+"POT-Creation-Date: 2009-01-19 19:29:21+0000\n"
+"PO-Revision-Date: 2009-01-19 19:29:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/cs_CZ.po b/addons/base_module_merge/i18n/cs_CZ.po
index 076b03908d9..f2c73788690 100644
--- a/addons/base_module_merge/i18n/cs_CZ.po
+++ b/addons/base_module_merge/i18n/cs_CZ.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:04:15+0000\n"
-"PO-Revision-Date: 2009-01-03 02:04:15+0000\n"
+"POT-Creation-Date: 2009-01-19 19:32:05+0000\n"
+"PO-Revision-Date: 2009-01-19 19:32:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/de_DE.po b/addons/base_module_merge/i18n/de_DE.po
index 2165c9fb936..44705229484 100644
--- a/addons/base_module_merge/i18n/de_DE.po
+++ b/addons/base_module_merge/i18n/de_DE.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:06:58+0000\n"
-"PO-Revision-Date: 2009-01-03 02:06:58+0000\n"
+"POT-Creation-Date: 2009-01-19 19:34:53+0000\n"
+"PO-Revision-Date: 2009-01-19 19:34:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/es_AR.po b/addons/base_module_merge/i18n/es_AR.po
index 63781e36be2..f842f35f533 100644
--- a/addons/base_module_merge/i18n/es_AR.po
+++ b/addons/base_module_merge/i18n/es_AR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:14:00+0000\n"
-"PO-Revision-Date: 2009-01-03 02:14:00+0000\n"
+"POT-Creation-Date: 2009-01-19 19:42:06+0000\n"
+"PO-Revision-Date: 2009-01-19 19:42:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/es_ES.po b/addons/base_module_merge/i18n/es_ES.po
index 60633058a0b..c00b9541025 100644
--- a/addons/base_module_merge/i18n/es_ES.po
+++ b/addons/base_module_merge/i18n/es_ES.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:14:45+0000\n"
-"PO-Revision-Date: 2009-01-03 02:14:45+0000\n"
+"POT-Creation-Date: 2009-01-19 19:42:51+0000\n"
+"PO-Revision-Date: 2009-01-19 19:42:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/et_EE.po b/addons/base_module_merge/i18n/et_EE.po
index f322317de7f..eb6343fdf6f 100644
--- a/addons/base_module_merge/i18n/et_EE.po
+++ b/addons/base_module_merge/i18n/et_EE.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:05:36+0000\n"
-"PO-Revision-Date: 2009-01-03 02:05:36+0000\n"
+"POT-Creation-Date: 2009-01-19 19:33:29+0000\n"
+"PO-Revision-Date: 2009-01-19 19:33:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/fr_FR.po b/addons/base_module_merge/i18n/fr_FR.po
index 88f15a6c1e5..81df6ba753f 100644
--- a/addons/base_module_merge/i18n/fr_FR.po
+++ b/addons/base_module_merge/i18n/fr_FR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:06:17+0000\n"
-"PO-Revision-Date: 2009-01-03 02:06:17+0000\n"
+"POT-Creation-Date: 2009-01-19 19:34:11+0000\n"
+"PO-Revision-Date: 2009-01-19 19:34:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/hr_HR.po b/addons/base_module_merge/i18n/hr_HR.po
index 30d9b22c390..6630f3abdd6 100644
--- a/addons/base_module_merge/i18n/hr_HR.po
+++ b/addons/base_module_merge/i18n/hr_HR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:03:35+0000\n"
-"PO-Revision-Date: 2009-01-03 02:03:35+0000\n"
+"POT-Creation-Date: 2009-01-19 19:31:24+0000\n"
+"PO-Revision-Date: 2009-01-19 19:31:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/hu_HU.po b/addons/base_module_merge/i18n/hu_HU.po
index 4035a0105eb..470d7cf0b07 100644
--- a/addons/base_module_merge/i18n/hu_HU.po
+++ b/addons/base_module_merge/i18n/hu_HU.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:07:39+0000\n"
-"PO-Revision-Date: 2009-01-03 02:07:39+0000\n"
+"POT-Creation-Date: 2009-01-19 19:35:34+0000\n"
+"PO-Revision-Date: 2009-01-19 19:35:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/it_IT.po b/addons/base_module_merge/i18n/it_IT.po
index 14c298fd128..644b092f236 100644
--- a/addons/base_module_merge/i18n/it_IT.po
+++ b/addons/base_module_merge/i18n/it_IT.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:08:21+0000\n"
-"PO-Revision-Date: 2009-01-03 02:08:21+0000\n"
+"POT-Creation-Date: 2009-01-19 19:36:17+0000\n"
+"PO-Revision-Date: 2009-01-19 19:36:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/lt_LT.po b/addons/base_module_merge/i18n/lt_LT.po
index 1fffa146baa..80c3604abca 100644
--- a/addons/base_module_merge/i18n/lt_LT.po
+++ b/addons/base_module_merge/i18n/lt_LT.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:09:02+0000\n"
-"PO-Revision-Date: 2009-01-03 02:09:02+0000\n"
+"POT-Creation-Date: 2009-01-19 19:37:00+0000\n"
+"PO-Revision-Date: 2009-01-19 19:37:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/nl_NL.po b/addons/base_module_merge/i18n/nl_NL.po
index 9bc00c08c25..7405b2a8b70 100644
--- a/addons/base_module_merge/i18n/nl_NL.po
+++ b/addons/base_module_merge/i18n/nl_NL.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:04:56+0000\n"
-"PO-Revision-Date: 2009-01-03 02:04:56+0000\n"
+"POT-Creation-Date: 2009-01-19 19:32:47+0000\n"
+"PO-Revision-Date: 2009-01-19 19:32:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/pl_PL.po b/addons/base_module_merge/i18n/pl_PL.po
index 12ba5034384..ac0943c4ebc 100644
--- a/addons/base_module_merge/i18n/pl_PL.po
+++ b/addons/base_module_merge/i18n/pl_PL.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:09:43+0000\n"
-"PO-Revision-Date: 2009-01-03 02:09:43+0000\n"
+"POT-Creation-Date: 2009-01-19 19:37:44+0000\n"
+"PO-Revision-Date: 2009-01-19 19:37:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/pt_BR.po b/addons/base_module_merge/i18n/pt_BR.po
index b3896516c6f..56e581bc500 100644
--- a/addons/base_module_merge/i18n/pt_BR.po
+++ b/addons/base_module_merge/i18n/pt_BR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:10:25+0000\n"
-"PO-Revision-Date: 2009-01-03 02:10:25+0000\n"
+"POT-Creation-Date: 2009-01-19 19:38:27+0000\n"
+"PO-Revision-Date: 2009-01-19 19:38:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/pt_PT.po b/addons/base_module_merge/i18n/pt_PT.po
index f01e7c58b7e..cf36ddaf43e 100644
--- a/addons/base_module_merge/i18n/pt_PT.po
+++ b/addons/base_module_merge/i18n/pt_PT.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:11:07+0000\n"
-"PO-Revision-Date: 2009-01-03 02:11:07+0000\n"
+"POT-Creation-Date: 2009-01-19 19:39:11+0000\n"
+"PO-Revision-Date: 2009-01-19 19:39:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/ro_RO.po b/addons/base_module_merge/i18n/ro_RO.po
index 72b4b13b132..e2504fdb2d0 100644
--- a/addons/base_module_merge/i18n/ro_RO.po
+++ b/addons/base_module_merge/i18n/ro_RO.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:11:49+0000\n"
-"PO-Revision-Date: 2009-01-03 02:11:49+0000\n"
+"POT-Creation-Date: 2009-01-19 19:39:53+0000\n"
+"PO-Revision-Date: 2009-01-19 19:39:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/ru_RU.po b/addons/base_module_merge/i18n/ru_RU.po
index ec4f651af35..9c2c12bf679 100644
--- a/addons/base_module_merge/i18n/ru_RU.po
+++ b/addons/base_module_merge/i18n/ru_RU.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:12:32+0000\n"
-"PO-Revision-Date: 2009-01-03 02:12:32+0000\n"
+"POT-Creation-Date: 2009-01-19 19:40:38+0000\n"
+"PO-Revision-Date: 2009-01-19 19:40:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/sl_SL.po b/addons/base_module_merge/i18n/sl_SL.po
index 16abb6aee94..7de7fdb0ceb 100644
--- a/addons/base_module_merge/i18n/sl_SL.po
+++ b/addons/base_module_merge/i18n/sl_SL.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:13:15+0000\n"
-"PO-Revision-Date: 2009-01-03 02:13:15+0000\n"
+"POT-Creation-Date: 2009-01-19 19:41:22+0000\n"
+"PO-Revision-Date: 2009-01-19 19:41:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/sv_SE.po b/addons/base_module_merge/i18n/sv_SE.po
index 0a6f06751da..e31455a1c29 100644
--- a/addons/base_module_merge/i18n/sv_SE.po
+++ b/addons/base_module_merge/i18n/sv_SE.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:15:28+0000\n"
-"PO-Revision-Date: 2009-01-03 02:15:28+0000\n"
+"POT-Creation-Date: 2009-01-19 19:43:36+0000\n"
+"PO-Revision-Date: 2009-01-19 19:43:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/tlh_TLH.po b/addons/base_module_merge/i18n/tlh_TLH.po
new file mode 100644
index 00000000000..c49ec531828
--- /dev/null
+++ b/addons/base_module_merge/i18n/tlh_TLH.po
@@ -0,0 +1,153 @@
+# Translation of OpenERP Server.
+# This file containt the translation of the following modules:
+# * base_module_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-01-19 19:45:52+0000\n"
+"PO-Revision-Date: 2009-01-19 19:45:52+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Information"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,init:0
+msgid "Module Merging"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,directory_name:0
+msgid "Directory Name"
+msgstr ""
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Demo Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_filename:0
+msgid "Filename"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,version:0
+msgid "Version"
+msgstr ""
+
+#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module Recording"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Thanks in advance for your contribution."
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,description:0
+msgid "Full Description"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,name:0
+msgid "Module Name"
+msgstr ""
+
+#. module: base_module_merge
+#: model:ir.actions.wizard,name:base_module_merge.wizard_base_module_merger
+#: model:ir.ui.menu,name:base_module_merge.menu_wizard_base_module_merger
+msgid "Merge module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,save,module_file:0
+msgid "Module .zip File"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "Module successfully created !"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,website:0
+msgid "Documentation URL"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,init,modules_list:0
+msgid "Modules"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,save:0
+#: wizard_button:base_module_merge.module_merge,init,info:0
+msgid "Continue"
+msgstr ""
+
+#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
+#: selection:base_module_merge.module_merge,info,data_kind:0
+msgid "Normal Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,save:0
+msgid "If you think your module could interrest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module."
+msgstr ""
+
+#. module: base_module_merge
+#: help:base_module_merge.module_merge,init,modules_list:0
+msgid "Select Modules which you want to merge in single module"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,data_kind:0
+msgid "Type of Data"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_view:base_module_merge.module_merge,info:0
+msgid "Module Information"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,info,end:0
+#: wizard_button:base_module_merge.module_merge,init,end:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_module_merge
+#: wizard_button:base_module_merge.module_merge,save,end:0
+msgid "Close"
+msgstr ""
+
diff --git a/addons/base_module_merge/i18n/tr_TR.po b/addons/base_module_merge/i18n/tr_TR.po
index 2ed98c8a4e1..72891bf4bc7 100644
--- a/addons/base_module_merge/i18n/tr_TR.po
+++ b/addons/base_module_merge/i18n/tr_TR.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:16:12+0000\n"
-"PO-Revision-Date: 2009-01-03 02:16:12+0000\n"
+"POT-Creation-Date: 2009-01-19 19:44:21+0000\n"
+"PO-Revision-Date: 2009-01-19 19:44:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/uk_UK.po b/addons/base_module_merge/i18n/uk_UK.po
index a05168287fb..82374e1837f 100644
--- a/addons/base_module_merge/i18n/uk_UK.po
+++ b/addons/base_module_merge/i18n/uk_UK.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:16:57+0000\n"
-"PO-Revision-Date: 2009-01-03 02:16:57+0000\n"
+"POT-Creation-Date: 2009-01-19 19:45:06+0000\n"
+"PO-Revision-Date: 2009-01-19 19:45:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/zh_CN.po b/addons/base_module_merge/i18n/zh_CN.po
index d1b65ce90c7..fd645635d46 100644
--- a/addons/base_module_merge/i18n/zh_CN.po
+++ b/addons/base_module_merge/i18n/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:02:15+0000\n"
-"PO-Revision-Date: 2009-01-03 02:02:15+0000\n"
+"POT-Creation-Date: 2009-01-19 19:30:02+0000\n"
+"PO-Revision-Date: 2009-01-19 19:30:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""
diff --git a/addons/base_module_merge/i18n/zh_TW.po b/addons/base_module_merge/i18n/zh_TW.po
index 6ceada9ab8a..1d8063e4597 100644
--- a/addons/base_module_merge/i18n/zh_TW.po
+++ b/addons/base_module_merge/i18n/zh_TW.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-03 02:02:55+0000\n"
-"PO-Revision-Date: 2009-01-03 02:02:55+0000\n"
+"POT-Creation-Date: 2009-01-19 19:30:42+0000\n"
+"PO-Revision-Date: 2009-01-19 19:30:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,6 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_merge
+#: wizard_field:base_module_merge.module_merge,info,category:0
+msgid "Category"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Information"
msgstr ""
@@ -26,11 +31,6 @@ msgid "Module Merging"
msgstr ""
#. module: base_module_merge
-#: wizard_field:base_module_merge.module_merge,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_merge
#: wizard_field:base_module_merge.module_merge,info,directory_name:0
msgid "Directory Name"
msgstr ""
@@ -51,6 +51,12 @@ msgid "Version"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Recursion error in modules dependencies !"
+msgstr ""
+
+#. module: base_module_merge
#: wizard_view:base_module_merge.module_merge,info:0
#: wizard_view:base_module_merge.module_merge,save:0
msgid "Module Recording"
@@ -104,6 +110,12 @@ msgid "Continue"
msgstr ""
#. module: base_module_merge
+#: code:addons/base_module_merge/wizard/base_module_merge.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_module_merge
#: selection:base_module_merge.module_merge,info,data_kind:0
msgid "Normal Data"
msgstr ""