[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

25 files changed, 81 insertions, 49 deletions

diff --git a/addons/base_tools/i18n/ar.po b/addons/base_tools/i18n/ar.po
index 6f57e891a4f..c76ce189f0c 100644
--- a/addons/base_tools/i18n/ar.po
+++ b/addons/base_tools/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-08-24 04:37+0000\n"
-"X-Generator: Launchpad (build 13697)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/bg.po b/addons/base_tools/i18n/bg.po
index cade5ea0617..265c2cdbb4f 100644
--- a/addons/base_tools/i18n/bg.po
+++ b/addons/base_tools/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ca.po b/addons/base_tools/i18n/ca.po
index 23af064ab51..9e2da34bc54 100644
--- a/addons/base_tools/i18n/ca.po
+++ b/addons/base_tools/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/de.po b/addons/base_tools/i18n/de.po
index 3783e3eef90..538284a8e96 100644
--- a/addons/base_tools/i18n/de.po
+++ b/addons/base_tools/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/en_GB.po b/addons/base_tools/i18n/en_GB.po
new file mode 100644
index 00000000000..adb4271fe6c
--- /dev/null
+++ b/addons/base_tools/i18n/en_GB.po
@@ -0,0 +1,32 @@
+# English (United Kingdom) 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: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-08-25 11:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: base_tools
+#: model:ir.module.module,shortdesc:base_tools.module_meta_information
+msgid "Common base for tools modules"
+msgstr "Common base for tools modules"
+
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid ""
+"\n"
+"    "
+msgstr ""
+"\n"
+"    "
diff --git a/addons/base_tools/i18n/es.po b/addons/base_tools/i18n/es.po
index a92af3cbd69..fdf326b3f0e 100644
--- a/addons/base_tools/i18n/es.po
+++ b/addons/base_tools/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_PY.po b/addons/base_tools/i18n/es_PY.po
index d92fe6988d3..74ae75c9489 100644
--- a/addons/base_tools/i18n/es_PY.po
+++ b/addons/base_tools/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fi.po b/addons/base_tools/i18n/fi.po
index 938bedff7ec..d8c3c7daffd 100644
--- a/addons/base_tools/i18n/fi.po
+++ b/addons/base_tools/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fr.po b/addons/base_tools/i18n/fr.po
index d16e092fc0b..6aa908fe510 100644
--- a/addons/base_tools/i18n/fr.po
+++ b/addons/base_tools/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/gl.po b/addons/base_tools/i18n/gl.po
index d68bf558fad..a886bacb38e 100644
--- a/addons/base_tools/i18n/gl.po
+++ b/addons/base_tools/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/hi.po b/addons/base_tools/i18n/hi.po
index a33c0c95f72..0cfbc02ca44 100644
--- a/addons/base_tools/i18n/hi.po
+++ b/addons/base_tools/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/id.po b/addons/base_tools/i18n/id.po
index ca40be8ed41..62f0b7dced4 100644
--- a/addons/base_tools/i18n/id.po
+++ b/addons/base_tools/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/it.po b/addons/base_tools/i18n/it.po
index 93fe09d1881..efc991fca1a 100644
--- a/addons/base_tools/i18n/it.po
+++ b/addons/base_tools/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nb.po b/addons/base_tools/i18n/nb.po
index d4fd022017a..df4b1a01473 100644
--- a/addons/base_tools/i18n/nb.po
+++ b/addons/base_tools/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nl.po b/addons/base_tools/i18n/nl.po
index f42bccd8d75..cb24c85be8a 100644
--- a/addons/base_tools/i18n/nl.po
+++ b/addons/base_tools/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 18eeaecfca1..267529ff92a 100644
--- a/addons/base_tools/i18n/pt.po
+++ b/addons/base_tools/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-18 04:37+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt_BR.po b/addons/base_tools/i18n/pt_BR.po
index 70904e2f89d..75ff4449416 100644
--- a/addons/base_tools/i18n/pt_BR.po
+++ b/addons/base_tools/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ru.po b/addons/base_tools/i18n/ru.po
index f793bcb37db..a99175bb99a 100644
--- a/addons/base_tools/i18n/ru.po
+++ b/addons/base_tools/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sk.po b/addons/base_tools/i18n/sk.po
index 0d3cf5a1678..0525f96308d 100644
--- a/addons/base_tools/i18n/sk.po
+++ b/addons/base_tools/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sl.po b/addons/base_tools/i18n/sl.po
index 26344987e1e..04aa642558f 100644
--- a/addons/base_tools/i18n/sl.po
+++ b/addons/base_tools/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-23 04:38+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sq.po b/addons/base_tools/i18n/sq.po
index 03ad1c851b4..fe2155d9c0c 100644
--- a/addons/base_tools/i18n/sq.po
+++ b/addons/base_tools/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sr@latin.po b/addons/base_tools/i18n/sr@latin.po
index f63539dd53f..ef66529a384 100644
--- a/addons/base_tools/i18n/sr@latin.po
+++ b/addons/base_tools/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/tr.po b/addons/base_tools/i18n/tr.po
index f37dc94d0f3..24fd9183925 100644
--- a/addons/base_tools/i18n/tr.po
+++ b/addons/base_tools/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-29 05:55+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/vi.po b/addons/base_tools/i18n/vi.po
index 790e4f9515e..f6753ed710d 100644
--- a/addons/base_tools/i18n/vi.po
+++ b/addons/base_tools/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-05-05 04:40+0000\n"
-"X-Generator: Launchpad (build 12959)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_CN.po b/addons/base_tools/i18n/zh_CN.po
index 4dd9285396e..cbe9295101b 100644
--- a/addons/base_tools/i18n/zh_CN.po
+++ b/addons/base_tools/i18n/zh_CN.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "base_tools"
+msgstr "常见的基础工具模块"
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information