[MERGE] forward port of branch saas-7 up to 4022493

17 files changed, 245 insertions, 222 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 3d68c05c2e0..09fff9244cd 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -33,7 +33,7 @@ except ImportError:
 import openerp
 import openerp.modules.registry
 from openerp.addons.base.ir.ir_qweb import AssetsBundle, QWebTemplateNotFound
-from openerp.modules import get_module_resource
+from openerp.modules import get_module_path, get_resource_path
 from openerp.tools import topological_sort
 from openerp.tools.translate import _
 from openerp.tools import ustr
@@ -469,12 +469,40 @@ def binary_content(xmlid=None, model='ir.attachment', id=None, field='datas', un
         last_update = obj['__last_update']
     except AccessError:
         return (403, [], None)
-    status = 200
+
+    status, headers, content = None, [], None
+
+    # attachment by url check
+    module_resource_path = None
+    if model == 'ir.attachment' and obj.type == 'url' and obj.url:
+        url_match = re.match("^/(\w+)/(.+)$", obj.url)
+        if url_match:
+            module = url_match.group(1)
+            module_path = get_module_path(module)
+            module_resource_path = get_resource_path(module, url_match.group(2))
+            if module_path and module_resource_path:
+                module_path = os.path.join(os.path.normpath(module_path), '') # join ensures the path ends with '/'
+                module_resource_path = os.path.normpath(module_resource_path)
+                if module_resource_path.startswith(module_path):
+                    with open(module_resource_path, 'r') as f:
+                        content = base64.b64encode(f.read())
+                    last_update = str(os.path.getmtime(module_resource_path))
+        
+        if not module_resource_path:
+            module_resource_path = obj.url
+
+        if not content:
+            status = 301
+            content = module_resource_path 
+    else:
+        content = obj[field] or ''
 
     # filename
     if not filename:
         if filename_field in obj:
             filename = obj[filename_field]
+        elif module_resource_path:
+            filename = os.path.basename(module_resource_path)
         else:
             filename = "%s-%s-%s" % (obj._model._name, obj.id, field)
 
@@ -486,31 +514,19 @@ def binary_content(xmlid=None, model='ir.attachment', id=None, field='datas', un
             mimetype = mimetypes.guess_type(filename)[0]
         if not mimetype:
             mimetype = default_mimetype
-    headers = [('Content-Type', mimetype)]
+    headers.append(('Content-Type', mimetype))
 
     # cache
     etag = hasattr(request, 'httprequest') and request.httprequest.headers.get('If-None-Match')
     retag = hashlib.md5(last_update).hexdigest()
-    if etag == retag:
-        status = 304
+    status = status or (304 if etag == retag else 200)
     headers.append(('ETag', retag))
-
-    if unique:
-        headers.append(('Cache-Control', 'max-age=%s' % STATIC_CACHE))
-    else:
-        headers.append(('Cache-Control', 'max-age=0'))
+    headers.append(('Cache-Control', 'max-age=%s' % (STATIC_CACHE if unique else 0)))
 
     # content-disposition default name
     if download:
         headers.append(('Content-Disposition', content_disposition(filename)))
 
-    # get content after cache control
-    if model == 'ir.attachment' and obj.type == 'url' and obj.url:
-        status = 301
-        content = obj.url
-    else:
-        content = obj[field] or ''
-
     return (status, headers, content)
 
 def db_info():
@@ -1164,7 +1180,7 @@ class Binary(http.Controller):
     ], type='http', auth="none", cors="*")
     def company_logo(self, dbname=None, **kw):
         imgname = 'logo.png'
-        placeholder = functools.partial(get_module_resource, 'web', 'static', 'src', 'img')
+        placeholder = functools.partial(get_resource_path, 'web', 'static', 'src', 'img')
         uid = None
         if request.session.db:
             dbname = request.session.db
diff --git a/addons/web/i18n/af.po b/addons/web/i18n/af.po
index bf759618647..ec4778c9dab 100644
--- a/addons/web/i18n/af.po
+++ b/addons/web/i18n/af.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-16 09:06+0000\n"
+"PO-Revision-Date: 2015-11-26 08:08+0000\n"
 "Last-Translator: Andre de Kock <adekock11@gmail.com>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/odoo/odoo-9/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -2283,7 +2283,7 @@ msgstr "Jaar"
 #: code:addons/web/static/src/xml/base_common.xml:71
 #, python-format
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po
index f2f9f4d6ea7..f2fca004304 100644
--- a/addons/web/i18n/ca.po
+++ b/addons/web/i18n/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-12 17:33+0000\n"
+"PO-Revision-Date: 2015-12-05 23:17+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -118,7 +118,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:web.layout
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.webclient_bootstrap
@@ -403,7 +403,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:97
 #, python-format
 msgid "Button"
-msgstr ""
+msgstr "Botó "
 
 #. module: web
 #. openerp-web
@@ -455,7 +455,7 @@ msgstr "Cancel·la"
 #: code:addons/web/static/src/xml/base.xml:59
 #, python-format
 msgid "Change Password"
-msgstr ""
+msgstr "Canvia contrasenya"
 
 #. module: web
 #. openerp-web
@@ -1105,7 +1105,7 @@ msgstr ""
 #: code:addons/web/static/src/js/widgets/loading.js:46
 #, python-format
 msgid "Loading"
-msgstr ""
+msgstr "Carregant "
 
 #. module: web
 #. openerp-web
@@ -1301,7 +1301,7 @@ msgstr "Nom"
 #: code:addons/web/static/src/xml/base.xml:1381
 #, python-format
 msgid "Name:"
-msgstr ""
+msgstr "Nom:"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/el.po b/addons/web/i18n/el.po
index 549fd558d58..ff2ddb4e2b8 100644
--- a/addons/web/i18n/el.po
+++ b/addons/web/i18n/el.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-21 23:14+0000\n"
+"PO-Revision-Date: 2015-12-05 18:30+0000\n"
 "Last-Translator: Goutoudis Kostas <goutoudis@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -31,28 +31,28 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:290
 #, python-format
 msgid "%(field)s %(operator)s"
-msgstr ""
+msgstr "%(field)s %(operator)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:116
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr ""
+msgstr "%(field)s %(operator)s \"%(value)s\""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:1579
 #, python-format
 msgid "%(page)d/%(page_count)d"
-msgstr ""
+msgstr "%(page)d/%(page_count)d"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/view_manager.js:66
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "%(view_type)s view"
 
 #. module: web
 #. openerp-web
@@ -180,21 +180,21 @@ msgstr "'%s' δεν μπορεί να μετατραπεί σε ημερομην
 #: code:addons/web/static/src/js/framework/formats.js:77
 #, python-format
 msgid "(%d records)"
-msgstr ""
+msgstr "(%d records)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:100
 #, python-format
 msgid "(no string)"
-msgstr ""
+msgstr "(no string)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:34
 #, python-format
 msgid "(nolabel)"
-msgstr ""
+msgstr "(nolabel)"
 
 #. module: web
 #. openerp-web
@@ -692,14 +692,14 @@ msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετ�
 #: code:addons/web/static/src/js/views/form_view.js:780
 #, python-format
 msgid "Do you really want to delete this record?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη καταγραφή;"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την εγγραφή;"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:630
 #, python-format
 msgid "Do you really want to remove these records?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτές τη καταγραφές;"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε αυτές τις εγγραφές;"
 
 #. module: web
 #. openerp-web
@@ -1178,7 +1178,7 @@ msgstr "Διαχείριση Φίλτρων"
 #: code:addons/web/static/src/js/framework/misc.js:20
 #, python-format
 msgid "Maybe you should consider reloading the application by pressing F5..."
-msgstr ""
+msgstr "Ίσως θα πρέπει να εξετάσετε την επαναφόρτωση της εφαρμογής πατώντας F5 ..."
 
 #. module: web
 #. openerp-web
@@ -1281,7 +1281,7 @@ msgstr ""
 #: code:addons/web/static/src/js/tour.js:181
 #, python-format
 msgid "Move your mouse here to open the insert block"
-msgstr ""
+msgstr "Μετακινήστε εδώ το ποντίκι σας για να εισάγετε πλαίσιο"
 
 #. module: web
 #. openerp-web
@@ -1369,7 +1369,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:641
 #, python-format
 msgid "No data to display."
-msgstr ""
+msgstr "Δεν υπάρχουν δεδομένα προς εμφάνιση."
 
 #. module: web
 #. openerp-web
@@ -1440,7 +1440,7 @@ msgstr "Odoo"
 #: code:addons/web/static/src/js/apps.js:189
 #, python-format
 msgid "Odoo Apps will be available soon"
-msgstr ""
+msgstr "Οι Εφαρμογές Odoo θα είναι σύντομα διαθέσιμες"
 
 #. module: web
 #. openerp-web
@@ -1565,7 +1565,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1316
 #, python-format
 msgid "Please note that only the selected ids will be exported."
-msgstr ""
+msgstr "Παρακαλώ σημειώστε ότι μόνο τα επιλεγμένα ids θα εξαχθούν."
 
 #. module: web
 #. openerp-web
@@ -1837,7 +1837,7 @@ msgstr "Κοινό με όλους τους χρήστες"
 #: code:addons/web/static/src/js/apps.js:189
 #, python-format
 msgid "Showing locally available modules"
-msgstr ""
+msgstr "Προβολή τοπικά διαθέσιμων εφαρμογών"
 
 #. module: web
 #. openerp-web
@@ -1851,7 +1851,7 @@ msgstr "Μέγεθος:"
 #: code:addons/web/static/src/xml/base_common.xml:107
 #, python-format
 msgid "Special:"
-msgstr ""
+msgstr "Ειδικά:"
 
 #. module: web
 #. openerp-web
@@ -1944,7 +1944,7 @@ msgstr "Ο παλιός κωδικός που δώσατε είναι λάθος
 #: code:addons/web/static/src/js/views/form_view.js:357
 #, python-format
 msgid "The record could not be found in the database."
-msgstr "Η καταγραφή δεν εντοπίστηκε στην βάση δεδομένων"
+msgstr "Η εγγραφή δεν εντοπίστηκε στην βάση δεδομένων"
 
 #. module: web
 #. openerp-web
@@ -2268,7 +2268,7 @@ msgstr "Έχει εισαχθεί λάθος τιμή!"
 #: code:addons/web/static/src/xml/base.xml:188
 #, python-format
 msgid "XML ID:"
-msgstr ""
+msgstr "XML ID:"
 
 #. module: web
 #. openerp-web
@@ -2311,7 +2311,7 @@ msgstr "Δεν μπορείτε να αφήσετε κανένα συνθημα�
 #, python-format
 msgid ""
 "You may not believe it,<br />but the application is actually loading..."
-msgstr ""
+msgstr "Μπορεί να μην το πιστεύετε,<br/>αλλά η εφαρμογή φορτώνει..."
 
 #. module: web
 #. openerp-web
@@ -2332,21 +2332,21 @@ msgstr "Πρέπει να επιλέξετε τουλάχιστον μία εγ�
 #: code:addons/web/static/src/js/framework/crash_manager.js:69
 #, python-format
 msgid "Your Odoo session expired. Please refresh the current web page."
-msgstr ""
+msgstr "Έληξε η Odoo συνεδρία σας. Παρακαλούμε ανανεώστε την τρέχουσα ιστοσελίδα."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/core.js:133
 #, python-format
 msgid "a day ago"
-msgstr ""
+msgstr "Μια ημέρα πριν"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/core.js:129
 #, python-format
 msgid "about a minute ago"
-msgstr ""
+msgstr "Πριν από περίπου ένα λεπτό"
 
 #. module: web
 #. openerp-web
@@ -2360,7 +2360,7 @@ msgstr "περίπου πριν από ένα μήνα"
 #: code:addons/web/static/src/js/framework/core.js:137
 #, python-format
 msgid "about a year ago"
-msgstr ""
+msgstr "Πριν από περίπου ένα χρόνο"
 
 #. module: web
 #. openerp-web
@@ -2381,7 +2381,7 @@ msgstr "περιέχει"
 #: code:addons/web/static/src/js/views/search_filters.js:161
 #, python-format
 msgid "doesn't contain"
-msgstr ""
+msgstr "δεν περιέχει"
 
 #. module: web
 #. openerp-web
@@ -2390,7 +2390,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:240
 #, python-format
 msgid "greater than"
-msgstr ""
+msgstr "μεγαλύτερη από"
 
 #. module: web
 #. openerp-web
@@ -2417,14 +2417,14 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:238
 #, python-format
 msgid "is equal to"
-msgstr ""
+msgstr "είναι ίσο με"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:286
 #, python-format
 msgid "is false"
-msgstr ""
+msgstr "είναι ψευδής"
 
 #. module: web
 #. openerp-web
@@ -2441,7 +2441,7 @@ msgstr "δεν είναι"
 #: code:addons/web/static/src/js/views/search_filters.js:239
 #, python-format
 msgid "is not equal to"
-msgstr ""
+msgstr "δεν είναι ίσο με"
 
 #. module: web
 #. openerp-web
@@ -2452,7 +2452,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:270
 #, python-format
 msgid "is not set"
-msgstr ""
+msgstr "δεν έχει οριστεί"
 
 #. module: web
 #. openerp-web
@@ -2463,14 +2463,14 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:269
 #, python-format
 msgid "is set"
-msgstr ""
+msgstr "έχει οριστεί"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:285
 #, python-format
 msgid "is true"
-msgstr ""
+msgstr "είναι αληθές"
 
 #. module: web
 #. openerp-web
@@ -2479,7 +2479,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:241
 #, python-format
 msgid "less than"
-msgstr ""
+msgstr "μικρότερο από"
 
 #. module: web
 #. openerp-web
@@ -2502,7 +2502,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_inputs.js:229
 #, python-format
 msgid "not a valid integer"
-msgstr ""
+msgstr "δεν είναι έγκυρος ακέραιος"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/es_CO.po b/addons/web/i18n/es_CO.po
index 8e4c2c66050..d8b585192ed 100644
--- a/addons/web/i18n/es_CO.po
+++ b/addons/web/i18n/es_CO.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-12 04:23+0000\n"
+"PO-Revision-Date: 2015-11-28 07:15+0000\n"
 "Last-Translator: Mateo Tibaquirá <nestormateo@gmail.com>\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
@@ -31,14 +31,14 @@ msgstr "y Cerrar"
 #: code:addons/web/static/src/js/views/search_filters.js:290
 #, python-format
 msgid "%(field)s %(operator)s"
-msgstr ""
+msgstr "%(field)s %(operator)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:116
 #, python-format
 msgid "%(field)s %(operator)s \"%(value)s\""
-msgstr ""
+msgstr "%(field)s %(operator)s \"%(value)s\""
 
 #. module: web
 #. openerp-web
@@ -52,7 +52,7 @@ msgstr ""
 #: code:addons/web/static/src/js/view_manager.js:66
 #, python-format
 msgid "%(view_type)s view"
-msgstr ""
+msgstr "vista %(view_type)s"
 
 #. module: web
 #. openerp-web
@@ -131,7 +131,7 @@ msgstr "&lt;![endif]--&gt;"
 #: code:addons/web/static/src/js/framework/formats.js:171
 #, python-format
 msgid "'%s' is not a correct date"
-msgstr ""
+msgstr "'%s' no es una fecha correcta"
 
 #. module: web
 #. openerp-web
@@ -145,7 +145,7 @@ msgstr ""
 #: code:addons/web/static/src/js/framework/formats.js:166
 #, python-format
 msgid "'%s' is not a correct datetime"
-msgstr ""
+msgstr "'%s' no es una correcta fecha y hora"
 
 #. module: web
 #. openerp-web
@@ -598,7 +598,7 @@ msgstr "Crear:"
 #: code:addons/web/static/src/xml/base.xml:249
 #, python-format
 msgid "Created by :"
-msgstr ""
+msgstr "Creado por:"
 
 #. module: web
 #. openerp-web
@@ -662,7 +662,7 @@ msgstr "Eliminar"
 #: code:addons/web/static/src/xml/base.xml:260
 #, python-format
 msgid "Delete this attachment"
-msgstr ""
+msgstr "Borrar este adjunto"
 
 #. module: web
 #. openerp-web
@@ -1688,7 +1688,7 @@ msgstr "Guardar"
 #: code:addons/web/static/src/js/views/form_common.js:881
 #, python-format
 msgid "Save & New"
-msgstr ""
+msgstr "Grabar y Nuevo"
 
 #. module: web
 #. openerp-web
@@ -1696,21 +1696,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:965
 #, python-format
 msgid "Save As"
-msgstr ""
+msgstr "Guardar Como"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:1208
 #, python-format
 msgid "Save As..."
-msgstr ""
+msgstr "Guardar Como..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1354
 #, python-format
 msgid "Save as:"
-msgstr ""
+msgstr "Guardar como:"
 
 #. module: web
 #. openerp-web
@@ -1783,7 +1783,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:957
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "Seleccionar"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login
@@ -1901,7 +1901,7 @@ msgstr "Traducción Técnica"
 #: code:addons/web/static/src/js/views/form_widgets.js:1208
 #, python-format
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "Este campo está vacío, no hay nada para guardar!"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po
index 676475bede0..94828786f4b 100644
--- a/addons/web/i18n/id.po
+++ b/addons/web/i18n/id.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-17 12:24+0000\n"
+"PO-Revision-Date: 2015-12-03 00:46+0000\n"
 "Last-Translator: William Surya Permana <zarambie_game@yahoo.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/odoo/odoo-9/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -620,7 +620,7 @@ msgstr "Pengguna Dibuat:"
 #: code:addons/web/static/src/js/views/search_menus.js:175
 #, python-format
 msgid "Custom Filter"
-msgstr ""
+msgstr "Kustom Filter"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login
@@ -749,7 +749,7 @@ msgstr "Gandakan"
 #: code:addons/web/static/src/js/views/form_widgets.js:352
 #, python-format
 msgid "E-mail Error"
-msgstr ""
+msgstr "E-mail Kesalahan"
 
 #. module: web
 #. openerp-web
@@ -772,7 +772,7 @@ msgstr "Sunting Aksi"
 #: code:addons/web/static/src/xml/base.xml:172
 #, python-format
 msgid "Edit SearchView"
-msgstr ""
+msgstr "Mengedit Pencarian"
 
 #. module: web
 #. openerp-web
@@ -1020,7 +1020,7 @@ msgstr "Tinggi"
 #: code:addons/web/static/src/xml/base.xml:184
 #, python-format
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #. module: web
 #. openerp-web
@@ -1034,7 +1034,7 @@ msgstr "Gambar"
 #: code:addons/web/static/src/xml/base.xml:1273
 #, python-format
 msgid "Import-Compatible Export"
-msgstr ""
+msgstr "Ekspor impor-Kompatibel"
 
 #. module: web
 #. openerp-web
@@ -1057,13 +1057,13 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:165
 #, python-format
 msgid "JS Tests"
-msgstr ""
+msgstr "JS Tes"
 
 #. module: web
 #: code:addons/web/controllers/main.py:845
 #, python-format
 msgid "Languages"
-msgstr ""
+msgstr "Bahasa"
 
 #. module: web
 #. openerp-web
@@ -1077,7 +1077,7 @@ msgstr "Tanggal modifikasi terakhir:"
 #: code:addons/web/static/src/xml/base.xml:204
 #, python-format
 msgid "Latest Modification by:"
-msgstr ""
+msgstr "Modifikasi terakhir dengan:"
 
 #. module: web
 #. openerp-web
@@ -1091,14 +1091,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:566
 #, python-format
 msgid "Line Chart"
-msgstr ""
+msgstr "Grafik garis"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:39
 #, python-format
 msgid "List"
-msgstr ""
+msgstr "Daftar"
 
 #. module: web
 #. openerp-web
@@ -1121,7 +1121,7 @@ msgstr "sedang diproses (%d)"
 #: code:addons/web/static/src/xml/base.xml:5
 #, python-format
 msgid "Loading..."
-msgstr ""
+msgstr "Loading..."
 
 #. module: web
 #. openerp-web
@@ -1132,7 +1132,7 @@ msgid ""
 "%s\n"
 "\n"
 "%s"
-msgstr ""
+msgstr "Kegagalan evaluasi lokal%s%s"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login
@@ -1144,7 +1144,7 @@ msgstr "Log masuk"
 #: code:addons/web/static/src/xml/base.xml:84
 #, python-format
 msgid "Log out"
-msgstr ""
+msgstr "Keluar"
 
 #. module: web
 #. openerp-web
@@ -1158,12 +1158,12 @@ msgstr "Rendah"
 #: code:addons/web/static/src/js/views/search_inputs.js:440
 #, python-format
 msgid "M2O search fields do not currently handle multiple default values"
-msgstr ""
+msgstr "Bidang pencarian M2O tidak saat ini menangani beberapa nilai default"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login_layout
 msgid "Manage Databases"
-msgstr ""
+msgstr "Mengelola Database"
 
 #. module: web
 #. openerp-web
@@ -1171,14 +1171,14 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:168
 #, python-format
 msgid "Manage Filters"
-msgstr ""
+msgstr "Mengelola Filter"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/misc.js:20
 #, python-format
 msgid "Maybe you should consider reloading the application by pressing F5..."
-msgstr ""
+msgstr "Mungkin Anda harus mempertimbangkan reload aplikasi dengan menekan F5 ..."
 
 #. module: web
 #. openerp-web
@@ -1192,21 +1192,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:602
 #, python-format
 msgid "Measures"
-msgstr ""
+msgstr "Langkah-langkah"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/debug_manager.js:89
 #, python-format
 msgid "Metadata (%s)"
-msgstr ""
+msgstr "Metadata (%s)"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:116
 #, python-format
 msgid "Method:"
-msgstr ""
+msgstr "Metode:"
 
 #. module: web
 #. openerp-web
@@ -1220,21 +1220,21 @@ msgstr ""
 #: code:addons/web/static/src/js/widgets/debug_manager.js:129
 #, python-format
 msgid "Model %s fields"
-msgstr ""
+msgstr "Bidang Model%s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:254
 #, python-format
 msgid "Modified by :"
-msgstr ""
+msgstr "Diubah oleh:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:67
 #, python-format
 msgid "Modifiers:"
-msgstr ""
+msgstr "Pengubah:"
 
 #. module: web
 #. openerp-web
@@ -1248,7 +1248,7 @@ msgstr "Bulan"
 #: code:addons/web/static/src/xml/base.xml:900
 #, python-format
 msgid "More"
-msgstr ""
+msgstr "Selengkapnya"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu
@@ -1288,7 +1288,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:83
 #, python-format
 msgid "My Odoo.com account"
-msgstr ""
+msgstr "Akun Odoo.com saya"
 
 #. module: web
 #. openerp-web
@@ -1355,7 +1355,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_view.js:123
 #, python-format
 msgid "No data provided."
-msgstr ""
+msgstr "Tidak ada data yang tersedia."
 
 #. module: web
 #. openerp-web
@@ -1369,28 +1369,28 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:641
 #, python-format
 msgid "No data to display."
-msgstr ""
+msgstr "Tidak ada data untuk menampilkan."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_common.js:243
 #, python-format
 msgid "No results to show..."
-msgstr ""
+msgstr "Tidak ada hasil untuk menunjukkan ..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:328
 #, python-format
 msgid "No value found for the field  for value "
-msgstr ""
+msgstr "Tidak ada nilai yang ditemukan untuk bidang untuk nilai"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/utils.js:144
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
-msgstr ""
+msgstr "Node [%s] tidak JSONified XML simpul"
 
 #. module: web
 #. openerp-web
@@ -1425,7 +1425,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:43
 #, python-format
 msgid "Object:"
-msgstr ""
+msgstr "Obyek:"
 
 #. module: web
 #. openerp-web
@@ -1433,7 +1433,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:web.layout
 #, python-format
 msgid "Odoo"
-msgstr ""
+msgstr "Odoo"
 
 #. module: web
 #. openerp-web
@@ -1452,7 +1452,7 @@ msgstr ""
 #. module: web
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "Odoo Web Tests"
-msgstr ""
+msgstr "Odoo Web Pengujian"
 
 #. module: web
 #. openerp-web
@@ -1476,7 +1476,7 @@ msgstr "Ok"
 #: code:addons/web/static/src/xml/base.xml:43
 #, python-format
 msgid "Old Password:"
-msgstr ""
+msgstr "Kata Sandi yang lama"
 
 #. module: web
 #. openerp-web
@@ -1490,7 +1490,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:75
 #, python-format
 msgid "On change:"
-msgstr ""
+msgstr "Tentang perubahan:"
 
 #. module: web
 #. openerp-web
@@ -1504,7 +1504,7 @@ msgstr "Hanya Integer Nilai seharusnya masih berlaku."
 #: code:addons/web/static/src/xml/base.xml:506
 #, python-format
 msgid "Only you"
-msgstr ""
+msgstr "Only You"
 
 #. module: web
 #. openerp-web
@@ -1551,21 +1551,21 @@ msgstr ""
 #: code:addons/web/static/src/js/views/pivot_view.js:25
 #, python-format
 msgid "Pivot"
-msgstr ""
+msgstr "aku disini akan nunggu kamu, meski itu akan terlalu lama,. :'("
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/data_export.js:165
 #, python-format
 msgid "Please enter save field list name"
-msgstr ""
+msgstr "Masukkan menyimpan nama field daftar"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1316
 #, python-format
 msgid "Please note that only the selected ids will be exported."
-msgstr ""
+msgstr "Harap dicatat bahwa hanya id yang dipilih akan diekspor."
 
 #. module: web
 #. openerp-web
@@ -1574,26 +1574,26 @@ msgstr ""
 msgid ""
 "Please pay attention that all records matching your search filter will be "
 "exported. Not only the selected ids."
-msgstr ""
+msgstr "Harap perhatikan bahwa semua catatan yang cocok filter pencarian Anda akan diekspor. Tidak hanya id yang dipilih."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/data_export.js:414
 #, python-format
 msgid "Please select fields to export..."
-msgstr ""
+msgstr "Silakan pilih bidang ekspor ..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/data_export.js:401
 #, python-format
 msgid "Please select fields to save export list..."
-msgstr ""
+msgstr "Silakan pilih bidang untuk menyimpan daftar ekspor ..."
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.menu_secondary
 msgid "Powered by"
-msgstr ""
+msgstr "Disajikan oleh"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.login_layout
@@ -1636,14 +1636,14 @@ msgstr "Kwantitas"
 #: code:addons/web/static/src/xml/base.xml:627
 #, python-format
 msgid "Quarter"
-msgstr ""
+msgstr "Kuartal"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:79
 #, python-format
 msgid "Relation:"
-msgstr ""
+msgstr "Hubungan:"
 
 #. module: web
 #. openerp-web
@@ -1657,21 +1657,21 @@ msgstr "Hapus"
 #: code:addons/web/static/src/xml/base.xml:1301
 #, python-format
 msgid "Remove All"
-msgstr ""
+msgstr "Menghapus semua"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:328
 #, python-format
 msgid "Render"
-msgstr ""
+msgstr "menyediakan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:382
 #, python-format
 msgid "Resource Error"
-msgstr ""
+msgstr "Sumber Kesalahan"
 
 #. module: web
 #. openerp-web
@@ -1688,7 +1688,7 @@ msgstr "Simpan"
 #: code:addons/web/static/src/js/views/form_common.js:881
 #, python-format
 msgid "Save & New"
-msgstr ""
+msgstr "Save & New"
 
 #. module: web
 #. openerp-web
@@ -1696,21 +1696,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:965
 #, python-format
 msgid "Save As"
-msgstr ""
+msgstr "Simpan sebagai"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:1208
 #, python-format
 msgid "Save As..."
-msgstr ""
+msgstr "Simpan sebagai..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1354
 #, python-format
 msgid "Save as:"
-msgstr ""
+msgstr "Simpan sebagai"
 
 #. module: web
 #. openerp-web
@@ -1724,28 +1724,28 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_view.js:1129
 #, python-format
 msgid "Save default"
-msgstr ""
+msgstr "Simpan bawaan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1287
 #, python-format
 msgid "Save fields list"
-msgstr ""
+msgstr "Simpan daftar bidang"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1360
 #, python-format
 msgid "Saved exports:"
-msgstr ""
+msgstr "Ekspor disimpan:"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_inputs.js:349
 #, python-format
 msgid "Search %(field)s at: %(value)s"
-msgstr ""
+msgstr "Search %(field)s at: %(value)s"
 
 #. module: web
 #. openerp-web
@@ -1754,28 +1754,28 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_inputs.js:391
 #, python-format
 msgid "Search %(field)s for: %(value)s"
-msgstr ""
+msgstr "Cari %(field)s dari: %(value)s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1077
 #, python-format
 msgid "Search Again"
-msgstr ""
+msgstr "Mencari lagi"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_common.js:209
 #, python-format
 msgid "Search More..."
-msgstr ""
+msgstr "Pencarian Lebih ..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_common.js:279
 #, python-format
 msgid "Search: "
-msgstr ""
+msgstr "Pencarian"
 
 #. module: web
 #. openerp-web
@@ -1802,28 +1802,28 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:83
 #, python-format
 msgid "Selection:"
-msgstr ""
+msgstr "Pemilihan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_view.js:1126
 #, python-format
 msgid "Set Default"
-msgstr ""
+msgstr "Set standar"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:163
 #, python-format
 msgid "Set Defaults"
-msgstr ""
+msgstr "Default Set"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:1013
 #, python-format
 msgid "Setting 'id' attribute on existing record %s"
-msgstr ""
+msgstr "Pengaturan 'id' atribut pada catatan yang ada%s"
 
 #. module: web
 #. openerp-web
@@ -1844,21 +1844,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:55
 #, python-format
 msgid "Size:"
-msgstr ""
+msgstr "Ukuran"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:107
 #, python-format
 msgid "Special:"
-msgstr ""
+msgstr "Spesial"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/misc.js:15
 #, python-format
 msgid "Still loading..."
-msgstr ""
+msgstr "Masih memuat..."
 
 #. module: web
 #. openerp-web
@@ -1886,7 +1886,7 @@ msgstr ""
 #: code:addons/web/static/src/js/framework/misc.js:19
 #, python-format
 msgid "Take a minute to get a coffee,<br />because it's loading..."
-msgstr ""
+msgstr "Luangkan waktu sebentar untuk mendapatkan kopi, <br /> karena itu loading ..."
 
 #. module: web
 #. openerp-web
@@ -1894,21 +1894,21 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:170
 #, python-format
 msgid "Technical Translation"
-msgstr ""
+msgstr "Terjemahan Teknis"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:1208
 #, python-format
 msgid "The field is empty, there's nothing to save !"
-msgstr ""
+msgstr "Lapangan kosong, tidak ada untuk menyelamatkan!"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_view.js:939
 #, python-format
 msgid "The following fields are invalid:"
-msgstr ""
+msgstr "Bidang berikut tidak valid:"
 
 #. module: web
 #. openerp-web
@@ -1923,28 +1923,28 @@ msgstr ""
 #: code:addons/web/controllers/main.py:831
 #, python-format
 msgid "The new password and its confirmation must be identical."
-msgstr ""
+msgstr "Password baru dan konfirmasi yang harus identik."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:1107
 #, python-format
 msgid "The o2m record must be saved before an action can be used"
-msgstr ""
+msgstr "Rekor o2m harus disimpan sebelum tindakan dapat digunakan"
 
 #. module: web
 #: code:addons/web/controllers/main.py:837
 #, python-format
 msgid ""
 "The old password you provided is incorrect, your password was not changed."
-msgstr ""
+msgstr "Password lama Anda berikan tidak benar, password Anda tidak berubah."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_view.js:357
 #, python-format
 msgid "The record could not be found in the database."
-msgstr ""
+msgstr "Catatan tidak dapat ditemukan dalam database."
 
 #. module: web
 #. openerp-web
@@ -1960,7 +1960,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_widgets.js:1172
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
-msgstr ""
+msgstr "File yang dipilih melebihi ukuran file maksimum%s."
 
 #. module: web
 #. openerp-web
@@ -1969,14 +1969,14 @@ msgstr ""
 msgid ""
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
-msgstr ""
+msgstr "Jenis bidang '%s' harus menjadi bidang many2many dengan hubungan model 'ir.attachment'."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:1193
 #, python-format
 msgid "There was a problem while uploading your file"
-msgstr ""
+msgstr "Ada masalah saat meng-upload file Anda"
 
 #. module: web
 #. openerp-web
@@ -1984,14 +1984,14 @@ msgstr ""
 #, python-format
 msgid ""
 "This filter is global and will be removed for everybody if you continue."
-msgstr ""
+msgstr "Filter ini adalah global dan akan dihapus untuk semua orang jika Anda terus."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/form_widgets.js:382
 #, python-format
 msgid "This resource is empty"
-msgstr ""
+msgstr "Sumber daya ini kosong"
 
 #. module: web
 #. openerp-web
@@ -2000,7 +2000,7 @@ msgstr ""
 msgid ""
 "This wizard will export all data that matches the current search criteria to a CSV file.\n"
 "            You can export all data or only the fields that can be reimported after modification."
-msgstr ""
+msgstr "Wizard ini akan mengekspor semua data yang cocok dengan kriteria pencarian saat ini ke file CSV. Anda dapat mengekspor semua data atau hanya bidang yang dapat reimported setelah modifikasi."
 
 #. module: web
 #. openerp-web
@@ -2016,7 +2016,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:162
 #, python-format
 msgid "Toggle Form Layout Outline"
-msgstr ""
+msgstr "Beralih Form Layout Outline"
 
 #. module: web
 #. openerp-web
@@ -2037,7 +2037,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/tree_view.js:18
 #, python-format
 msgid "Tree"
-msgstr ""
+msgstr "Pohon"
 
 #. module: web
 #. openerp-web
@@ -2051,7 +2051,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base_common.xml:47
 #, python-format
 msgid "Type:"
-msgstr ""
+msgstr "Tipe:"
 
 #. module: web
 #. openerp-web
@@ -2083,7 +2083,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:650
 #, python-format
 msgid "Unhandled widget"
-msgstr ""
+msgstr "Widget tertangani"
 
 #. module: web
 #. openerp-web
@@ -2097,42 +2097,42 @@ msgstr "Tidak diketahui"
 #: code:addons/web/static/src/js/framework/data.js:1075
 #, python-format
 msgid "Unknown field %s in domain %s"
-msgstr ""
+msgstr "Bidang yang tidak diketahui%s di domain%s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:1163
 #, python-format
 msgid "Unknown m2m command %s"
-msgstr ""
+msgstr "Perintah m2m diketahui%s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/pyeval.js:949
 #, python-format
 msgid "Unknown nonliteral type "
-msgstr ""
+msgstr "Jenis nonliteral diketahui"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/data.js:1067
 #, python-format
 msgid "Unknown operator %s in domain %s"
-msgstr ""
+msgstr "Diketahui Operator %s in domain%s"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/list_view.js:368
 #, python-format
 msgid "Unlimited"
-msgstr ""
+msgstr "Tidak terbatas"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/data.js:1113
 #, python-format
 msgid "Unsupported operator %s in domain %s"
-msgstr ""
+msgstr "Operator%s tidak didukung di domain%s"
 
 #. module: web
 #. openerp-web
@@ -2156,7 +2156,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:980
 #, python-format
 msgid "Uploading ..."
-msgstr ""
+msgstr "Mengunggah..."
 
 #. module: web
 #. openerp-web
@@ -2164,21 +2164,21 @@ msgstr ""
 #: code:addons/web/static/src/js/widgets/sidebar.js:168
 #, python-format
 msgid "Uploading Error"
-msgstr ""
+msgstr "Upload Kesalahan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/sidebar.js:196
 #, python-format
 msgid "Uploading..."
-msgstr ""
+msgstr "Mengunggah..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1204
 #, python-format
 msgid "Use by default"
-msgstr ""
+msgstr "Gunakan Bawaan"
 
 #. module: web
 #. openerp-web
@@ -2207,14 +2207,14 @@ msgstr "Tampilan"
 #: code:addons/web/static/src/xml/base.xml:166
 #, python-format
 msgid "View Fields"
-msgstr ""
+msgstr "Lihat Fields"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:161
 #, python-format
 msgid "View Metadata"
-msgstr ""
+msgstr "Lihat Metadata"
 
 #. module: web
 #. openerp-web
@@ -2247,14 +2247,14 @@ msgstr "Pekan"
 #: code:addons/web/static/src/js/views/form_view.js:1296
 #, python-format
 msgid "Widget type '%s' is not implemented"
-msgstr ""
+msgstr "Jenis widget '%s' tidak diterapkan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base_common.xml:51
 #, python-format
 msgid "Widget:"
-msgstr ""
+msgstr "Widget"
 
 #. module: web
 #. openerp-web
@@ -2268,7 +2268,7 @@ msgstr "Nilai yang salah masuk!"
 #: code:addons/web/static/src/xml/base.xml:188
 #, python-format
 msgid "XML ID:"
-msgstr ""
+msgstr "XML ID:"
 
 #. module: web
 #. openerp-web
@@ -2297,7 +2297,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:49
 #, python-format
 msgid "You are creating a new %s, are you sure it does not exist yet?"
-msgstr ""
+msgstr "Anda membuat%s baru, apakah Anda yakin itu belum ada?"
 
 #. module: web
 #: code:addons/web/controllers/main.py:829
@@ -2311,7 +2311,7 @@ msgstr "Anda tidak dapat mengosongkan kata sandi"
 #, python-format
 msgid ""
 "You may not believe it,<br />but the application is actually loading..."
-msgstr ""
+msgstr "Anda mungkin tidak percaya, <br /> tetapi aplikasi sebenarnya loading ..."
 
 #. module: web
 #. openerp-web
@@ -2325,21 +2325,21 @@ msgstr "Anda harus memilih setidaknya satu data"
 #: code:addons/web/static/src/js/views/list_view.js:756
 #, python-format
 msgid "You must select at least one record."
-msgstr ""
+msgstr "Anda harus memilih setidaknya satu catatan."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/crash_manager.js:69
 #, python-format
 msgid "Your Odoo session expired. Please refresh the current web page."
-msgstr ""
+msgstr "Sesi Odoo Anda berakhir. Silakan refresh halaman web saat ini."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/core.js:133
 #, python-format
 msgid "a day ago"
-msgstr ""
+msgstr "hari yang lalu"
 
 #. module: web
 #. openerp-web
@@ -2360,7 +2360,7 @@ msgstr "Sekitar satu bulan yang lalu"
 #: code:addons/web/static/src/js/framework/core.js:137
 #, python-format
 msgid "about a year ago"
-msgstr ""
+msgstr "sekitar satu tahun yang lalu"
 
 #. module: web
 #. openerp-web
@@ -2374,14 +2374,14 @@ msgstr "Sekitar satu jam yang lalu"
 #: code:addons/web/static/src/js/views/search_filters.js:160
 #, python-format
 msgid "contains"
-msgstr ""
+msgstr "mengandung"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:161
 #, python-format
 msgid "doesn't contain"
-msgstr ""
+msgstr "tidak mengandung"
 
 #. module: web
 #. openerp-web
@@ -2390,7 +2390,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:240
 #, python-format
 msgid "greater than"
-msgstr ""
+msgstr "jauh lebih dari"
 
 #. module: web
 #. openerp-web
@@ -2407,7 +2407,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:267
 #, python-format
 msgid "is"
-msgstr ""
+msgstr "Adalah"
 
 #. module: web
 #. openerp-web
@@ -2417,21 +2417,21 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:238
 #, python-format
 msgid "is equal to"
-msgstr ""
+msgstr "adalah sama dengan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:286
 #, python-format
 msgid "is false"
-msgstr ""
+msgstr "adalah palsu"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:268
 #, python-format
 msgid "is not"
-msgstr ""
+msgstr "tidak"
 
 #. module: web
 #. openerp-web
@@ -2441,7 +2441,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:239
 #, python-format
 msgid "is not equal to"
-msgstr ""
+msgstr "tidak sama dengan"
 
 #. module: web
 #. openerp-web
@@ -2452,7 +2452,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:270
 #, python-format
 msgid "is not set"
-msgstr ""
+msgstr "tidak diatur"
 
 #. module: web
 #. openerp-web
@@ -2463,14 +2463,14 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:269
 #, python-format
 msgid "is set"
-msgstr ""
+msgstr "diatur"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/views/search_filters.js:285
 #, python-format
 msgid "is true"
-msgstr ""
+msgstr "adalah benar"
 
 #. module: web
 #. openerp-web
@@ -2479,14 +2479,14 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_filters.js:241
 #, python-format
 msgid "less than"
-msgstr ""
+msgstr "Pertidaksamaan"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/framework/core.js:128
 #, python-format
 msgid "less than a minute ago"
-msgstr ""
+msgstr "kurang dari satu menit yang lalu"
 
 #. module: web
 #. openerp-web
@@ -2502,7 +2502,7 @@ msgstr ""
 #: code:addons/web/static/src/js/views/search_inputs.js:229
 #, python-format
 msgid "not a valid integer"
-msgstr ""
+msgstr "tidak integer valid"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po
index a7293a1e8d8..dd837331193 100644
--- a/addons/web/i18n/ja.po
+++ b/addons/web/i18n/ja.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-09 05:04+0000\n"
-"Last-Translator: takuan_osho <shimizu.taku@gmail.com>\n"
+"PO-Revision-Date: 2015-12-05 03:28+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>\n"
 "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -434,7 +434,7 @@ msgstr "値 %s をコンテクストに変換できません"
 #: code:addons/web/static/src/js/views/form_widgets.js:352
 #, python-format
 msgid "Can't send email to invalid e-mail address"
-msgstr "有効でないEメールアドレスにメール送信できません"
+msgstr "無効なEメールアドレスにメール送信できません"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/lt.po b/addons/web/i18n/lt.po
index 73010aea369..b84bfc7b1f2 100644
--- a/addons/web/i18n/lt.po
+++ b/addons/web/i18n/lt.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-10-13 09:50+0000\n"
+"PO-Revision-Date: 2015-11-30 08:37+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Lithuanian (http://www.transifex.com/odoo/odoo-9/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -118,7 +118,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:web.layout
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.webclient_bootstrap
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 52deb1b4c97..cb43a04b860 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-10-22 12:10+0000\n"
+"PO-Revision-Date: 2015-11-23 12:13+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -361,7 +361,7 @@ msgstr "Архива"
 #: code:addons/web/static/src/js/views/form_widgets.js:671
 #, python-format
 msgid "Archived"
-msgstr ""
+msgstr "Архивирано"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po
index 3f5aaa2eb8b..6d18341796c 100644
--- a/addons/web/i18n/pt_BR.po
+++ b/addons/web/i18n/pt_BR.po
@@ -3,14 +3,15 @@
 # * web
 # 
 # Translators:
+# Martin Trigaux, 2015
 # Mateus Cerqueira Lopes <mateus1@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-10 16:03+0000\n"
-"Last-Translator: Mateus Cerqueira Lopes <mateus1@gmail.com>\n"
+"PO-Revision-Date: 2015-12-02 13:54+0000\n"
+"Last-Translator: Martin Trigaux\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -119,7 +120,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:web.layout
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr "<!DOCTYPE html>"
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.webclient_bootstrap
diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po
index 09dd1565804..bce117fde6e 100644
--- a/addons/web/i18n/sv.po
+++ b/addons/web/i18n/sv.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-10-16 08:10+0000\n"
+"PO-Revision-Date: 2015-11-24 00:10+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Swedish (http://www.transifex.com/odoo/odoo-9/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgstr "Åtgärd"
 #: code:addons/web/static/src/js/views/form_relational_widgets.js:1106
 #, python-format
 msgid "Action Button"
-msgstr ""
+msgstr "Åtgärdsknapp"
 
 #. module: web
 #. openerp-web
@@ -813,7 +813,7 @@ msgstr "Fel! Lösenord ej ändrat!"
 #: code:addons/web/static/src/js/framework/pyeval.js:981
 #, python-format
 msgid "Evaluation Error"
-msgstr ""
+msgstr "Granskningsfel"
 
 #. module: web
 #. openerp-web
@@ -870,7 +870,7 @@ msgstr "Exportera all data"
 #: code:addons/web/static/src/js/view_manager.js:370
 #, python-format
 msgid "Failed to evaluate search criterions"
-msgstr ""
+msgstr "Misslyckades utvärdera sökkriterier"
 
 #. module: web
 #. openerp-web
@@ -934,7 +934,7 @@ msgstr "Filtrera"
 #: code:addons/web/static/src/js/views/search_menus.js:83
 #, python-format
 msgid "Filter name is required."
-msgstr ""
+msgstr "Filternamn är obligatoriskt."
 
 #. module: web
 #. openerp-web
@@ -1837,7 +1837,7 @@ msgstr "Dela med alla användare"
 #: code:addons/web/static/src/js/apps.js:189
 #, python-format
 msgid "Showing locally available modules"
-msgstr ""
+msgstr "Visar lokalt tillgängliga moduler"
 
 #. module: web
 #. openerp-web
@@ -2332,7 +2332,7 @@ msgstr "Du måste välja åtminstone en post"
 #: code:addons/web/static/src/js/framework/crash_manager.js:69
 #, python-format
 msgid "Your Odoo session expired. Please refresh the current web page."
-msgstr ""
+msgstr "Din Odoo-session har utgått. Vänligen ladda om aktuell webbsida."
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po
index 2ec5b2a09b3..45e334aec40 100644
--- a/addons/web/i18n/tr.po
+++ b/addons/web/i18n/tr.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-10-12 14:29+0000\n"
-"PO-Revision-Date: 2015-11-20 10:11+0000\n"
+"PO-Revision-Date: 2015-12-03 09:32+0000\n"
 "Last-Translator: Doğan Altunbay <doganaltunbay@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/odoo/odoo-9/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -119,7 +119,7 @@ msgstr ""
 #: model:ir.ui.view,arch_db:web.layout
 #: model:ir.ui.view,arch_db:web.qunit_suite
 msgid "&lt;!DOCTYPE html&gt;"
-msgstr ""
+msgstr "&lt;!DOCTYPE html&gt;"
 
 #. module: web
 #: model:ir.ui.view,arch_db:web.webclient_bootstrap
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index 3ae6ddb6649..7eae8b20a65 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -335,6 +335,11 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
         var self = this;
         options = _.clone(options || {});
         var shadow = options.shadow || false;
+        options.headers = _.extend({}, options.headers)
+        if (odoo.debug) {
+            options.headers["X-Debug-Mode"] = true;
+        }
+
         delete options.shadow;
 
         return self.check_session_id().then(function() {
@@ -350,18 +355,14 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
             if (self.origin_server) {
                 fct = ajax.jsonRpc;
                 if (self.override_session) {
-                    options.headers = _.extend({}, options.headers, {
-                        "X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
-                    });
+                    options.headers["X-Openerp-Session-Id"] = self.session_id || '';
                 }
             } else if (self.use_cors) {
                 fct = ajax.jsonRpc;
                 url = self.url(url, null);
                 options.session_id = self.session_id || '';
                 if (self.override_session) {
-                    options.headers = _.extend({}, options.headers, {
-                        "X-Openerp-Session-Id": self.override_session ? self.session_id || '' : ''
-                    });
+                    options.headers["X-Openerp-Session-Id"] = self.session_id || '';
                 }
             } else {
                 fct = ajax.jsonpRpc;
diff --git a/addons/web/static/src/js/views/form_relational_widgets.js b/addons/web/static/src/js/views/form_relational_widgets.js
index 7c3048ee24b..a4e900c6636 100644
--- a/addons/web/static/src/js/views/form_relational_widgets.js
+++ b/addons/web/static/src/js/views/form_relational_widgets.js
@@ -759,6 +759,7 @@ var FieldX2Many = AbstractManyField.extend({
             }
             if(view.view_type === "list") {
                 _.extend(view.options, {
+                    action_buttons: false, // to avoid 'Save' and 'Discard' buttons to appear in X2M fields
                     addable: null,
                     selectable: self.multi_selection,
                     sortable: true,
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js
index 5e32d8578e4..3e8a9b1e10e 100644
--- a/addons/web/static/src/js/views/form_view.js
+++ b/addons/web/static/src/js/views/form_view.js
@@ -400,7 +400,7 @@ var FormView = View.extend(common.FieldManagerMixin, {
         var keys = _.keys(this.fields_view.fields);
         if (keys.length) {
             return this.dataset.default_get(keys).then(function(r) {
-                self.trigger('load_record', r);
+                self.trigger('load_record', _.clone(r));
             });
         }
         return self.trigger('load_record', {});
diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js
index 8a604640fc9..f8f1bba909a 100644
--- a/addons/web/static/src/js/views/graph_view.js
+++ b/addons/web/static/src/js/views/graph_view.js
@@ -19,6 +19,10 @@ var GraphView = View.extend({
     icon: 'fa-bar-chart',
     view_type: 'graph',
 
+    on_detach_callback: function () {
+        $('body > .nvtooltip').remove();
+    },
+
     init: function(parent, dataset, view_id, options) {
         this._super(parent, dataset, view_id, options);
 
diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js
index 72f1ac4bf1d..deb2c16870f 100644
--- a/addons/web/static/src/js/views/pivot_view.js
+++ b/addons/web/static/src/js/views/pivot_view.js
@@ -574,7 +574,7 @@ var PivotView = View.extend({
             i, j, cell, $row, $cell;
 
         var groupby_labels = _.map(this.main_col.groupbys, function (gb) {
-            return self.groupable_fields[gb.split(':')[0]].string;
+            return self.fields[gb.split(':')[0]].string;
         });
 
         for (i = 0; i < headers.length; i++) {