[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20121207093350-kinvhwjzgrmif4d6
This commit is contained in:
Thibault Delavallée
+512
-305
File diff suppressed because it is too large
Load Diff
@@ -7,13 +7,13 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-03 16:01+0000\n"
|
||||
"PO-Revision-Date: 2012-12-05 19:56+0000\n"
|
||||
"PO-Revision-Date: 2012-12-06 10:07+0000\n"
|
||||
"Last-Translator: Quentin THEURET <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-06 04:38+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
|
||||
"X-Generator: Launchpad (build 16341)\n"
|
||||
|
||||
#. module: base
|
||||
@@ -253,8 +253,8 @@ msgid ""
|
||||
"* Opportunities by Stage (graph)\n"
|
||||
msgstr ""
|
||||
"\n"
|
||||
"Le module générique de Gestion de la Relation Client d'OpenERP\n"
|
||||
"==============================================================\n"
|
||||
"Le module générique de Gestion de la Relation Client d'OpenERP (CRM)\n"
|
||||
"====================================================================\n"
|
||||
"Cette application permet à un groupe de personnes de gérer intelligemment et "
|
||||
"efficacement les pistes, les opportunités, les réunions et les appels "
|
||||
"téléphoniques.\n"
|
||||
@@ -277,7 +277,7 @@ msgstr ""
|
||||
"automatiquement à l'équipe appropriée et s'assurer que les correspondances "
|
||||
"futures se fassent au bon endroit.\n"
|
||||
"\n"
|
||||
"Le tableau de bord GRC inclura :\n"
|
||||
"Le tableau de bord CRM inclura :\n"
|
||||
"--------------------------------\n"
|
||||
"* Le revenu planifié par étape et par utilisateur (graphique)\n"
|
||||
"* Les opportunités par étape (graphique)\n"
|
||||
|
||||
@@ -7,13 +7,13 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-03 16:01+0000\n"
|
||||
"PO-Revision-Date: 2012-12-05 15:59+0000\n"
|
||||
"PO-Revision-Date: 2012-12-06 18:17+0000\n"
|
||||
"Last-Translator: ccdos <ccdos@163.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-06 04:39+0000\n"
|
||||
"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
|
||||
"X-Generator: Launchpad (build 16341)\n"
|
||||
|
||||
#. module: base
|
||||
@@ -9873,7 +9873,7 @@ msgstr "将要安装的模块"
|
||||
#: model:ir.module.module,shortdesc:base.module_base
|
||||
#: field:res.currency,base:0
|
||||
msgid "Base"
|
||||
msgstr "本位币"
|
||||
msgstr "base 模块"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.model.data,model:0
|
||||
|
||||
@@ -21,31 +21,29 @@
|
||||
##############################################################################
|
||||
|
||||
import glob, os, re, setuptools, sys
|
||||
from os.path import join, isfile
|
||||
from os.path import join
|
||||
|
||||
# List all data files
|
||||
def data():
|
||||
files = []
|
||||
r = {}
|
||||
for root, dirnames, filenames in os.walk('openerp'):
|
||||
for filename in filenames:
|
||||
if not re.match(r'.*(\.pyc|\.pyo|\~)$',filename):
|
||||
files.append(os.path.join(root, filename))
|
||||
d = {}
|
||||
for v in files:
|
||||
k=os.path.dirname(v)
|
||||
if k in d:
|
||||
d[k].append(v)
|
||||
else:
|
||||
d[k]=[v]
|
||||
r = d.items()
|
||||
if not re.match(r'.*(\.pyc|\.pyo|\~)$', filename):
|
||||
r.setdefault(root, []).append(os.path.join(root, filename))
|
||||
|
||||
if os.name == 'nt':
|
||||
r.append(("Microsoft.VC90.CRT", glob.glob('C:\Microsoft.VC90.CRT\*.*')))
|
||||
r["Microsoft.VC90.CRT"] = glob.glob('C:\Microsoft.VC90.CRT\*.*')
|
||||
|
||||
import babel
|
||||
r.append(("localedata",
|
||||
glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata" , '*'))))
|
||||
import babel
|
||||
r["localedata"] = glob.glob(os.path.join(os.path.dirname(babel.__file__), "localedata", '*'))
|
||||
|
||||
return r
|
||||
import pytz
|
||||
tzdir = os.path.dirname(pytz.__file__)
|
||||
for root, _, filenames in os.walk(os.path.join(tzdir, "zoneinfo")):
|
||||
base = os.path.join('pytz', root[len(tzdir) + 1:])
|
||||
r[base] = [os.path.join(root, f) for f in filenames]
|
||||
|
||||
return r.items()
|
||||
|
||||
def gen_manifest():
|
||||
file_list="\n".join(data())
|
||||
@@ -64,7 +62,7 @@ def py2exe_options():
|
||||
"skip_archive": 1,
|
||||
"optimize": 2,
|
||||
"dist_dir": 'dist',
|
||||
"packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
|
||||
"packages": [ "DAV", "HTMLParser", "PIL", "asynchat", "asyncore", "commands", "dateutil", "decimal", "docutils", "email", "encodings", "imaplib", "lxml", "lxml._elementpath", "lxml.builder", "lxml.etree", "lxml.objectify", "mako", "openerp", "poplib", "pychart", "pydot", "pyparsing", "pytz", "reportlab", "select", "simplejson", "smtplib", "uuid", "vatnumber", "vobject", "xml", "xml.dom", "yaml", ],
|
||||
"excludes" : ["Tkconstants","Tkinter","tcl"],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user