[MERGE]Merge with openobject-addons

bzr revid: mma@tinyerp.com-20110823100049-w8ur10wapzm2xzf7

diff --cc addons/base_tools/i18n/ar.po
index 0000000,6f57e89..e8ed5b1
mode 000000,100644..100644
--- /dev/null
--- 2/addons/base_tools/i18n/ar.po
+++ b/addons/base_tools/i18n/ar.po
@@@ -1,0 -1,32 +1,32 @@@
+ # Arabic 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-23 01:58+0000\n"
+ "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+ "Language-Team: Arabic <ar@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-08-24 04:37+0000\n"
++"X-Launchpad-Export-Date: 2011-08-23 05:05+0000\n"
+ "X-Generator: Launchpad (build 13697)\n"
+ 
+ #. module: base_tools
+ #: model:ir.module.module,shortdesc:base_tools.module_meta_information
+ msgid "Common base for tools modules"
+ msgstr "قاعدة أساسية لأدوات البرامج"
+ 
+ #. module: base_tools
+ #: model:ir.module.module,description:base_tools.module_meta_information
+ msgid ""
+ "\n"
+ "    "
+ msgstr ""
+ "\n"
+ "    "