merge trunk server

bzr revid: ysa@tinyerp.co.in-20100218120711-97tassv4yqrpwi7l
This commit is contained in:
Ysa (Open ERP)
2010-02-18 17:37:11 +05:30
2 changed files with 494 additions and 427 deletions
+492 -425
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-02-16 06:09+0000\n"
"PO-Revision-Date: 2010-02-17 06:04+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: Japanese <ja@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: 2010-02-17 04:54+0000\n"
"X-Launchpad-Export-Date: 2010-02-18 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base