diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 6708d1ef7c0..76b495e58c5 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -244,7 +244,7 @@ class WebClient(openerpweb.Controller):
             transs[addon_name] = transl
             addons_path = openerpweb.addons_manifest[addon_name]['addons_path']
             for l in langs:
-                f_name = os.path.join(addons_path, addon_name, "po", l + ".po")
+                f_name = os.path.join(addons_path, addon_name, "i18n", l + ".po")
                 if not os.path.exists(f_name):
                     continue
                 try:
@@ -253,7 +253,7 @@ class WebClient(openerpweb.Controller):
                 except Exception:
                     continue
                 for x in po:
-                    if x.id and x.string:
+                    if x.id and x.string and "openerp-web" in x.auto_comments:
                         transl["messages"].append({'id': x.id, 'string': x.string})
         return {"modules": transs,
                 "lang_parameters": lang_obj}
diff --git a/addons/web/po/ar.po b/addons/web/i18n/ar.po
similarity index 100%
rename from addons/web/po/ar.po
rename to addons/web/i18n/ar.po
diff --git a/addons/web/po/bn.po b/addons/web/i18n/bn.po
similarity index 100%
rename from addons/web/po/bn.po
rename to addons/web/i18n/bn.po
diff --git a/addons/web/po/da.po b/addons/web/i18n/da.po
similarity index 100%
rename from addons/web/po/da.po
rename to addons/web/i18n/da.po
diff --git a/addons/web/po/de.po b/addons/web/i18n/de.po
similarity index 100%
rename from addons/web/po/de.po
rename to addons/web/i18n/de.po
diff --git a/addons/web/po/es.po b/addons/web/i18n/es.po
similarity index 100%
rename from addons/web/po/es.po
rename to addons/web/i18n/es.po
diff --git a/addons/web/po/es_EC.po b/addons/web/i18n/es_EC.po
similarity index 100%
rename from addons/web/po/es_EC.po
rename to addons/web/i18n/es_EC.po
diff --git a/addons/web/po/et.po b/addons/web/i18n/et.po
similarity index 100%
rename from addons/web/po/et.po
rename to addons/web/i18n/et.po
diff --git a/addons/web/po/fr.po b/addons/web/i18n/fr.po
similarity index 100%
rename from addons/web/po/fr.po
rename to addons/web/i18n/fr.po
diff --git a/addons/web/po/gl.po b/addons/web/i18n/gl.po
similarity index 100%
rename from addons/web/po/gl.po
rename to addons/web/i18n/gl.po
diff --git a/addons/web/po/hr.po b/addons/web/i18n/hr.po
similarity index 100%
rename from addons/web/po/hr.po
rename to addons/web/i18n/hr.po
diff --git a/addons/web/po/it.po b/addons/web/i18n/it.po
similarity index 100%
rename from addons/web/po/it.po
rename to addons/web/i18n/it.po
diff --git a/addons/web/po/nl.po b/addons/web/i18n/nl.po
similarity index 100%
rename from addons/web/po/nl.po
rename to addons/web/i18n/nl.po
diff --git a/addons/web/po/nl_BE.po b/addons/web/i18n/nl_BE.po
similarity index 100%
rename from addons/web/po/nl_BE.po
rename to addons/web/i18n/nl_BE.po
diff --git a/addons/web/po/pl.po b/addons/web/i18n/pl.po
similarity index 100%
rename from addons/web/po/pl.po
rename to addons/web/i18n/pl.po
diff --git a/addons/web/po/pt.po b/addons/web/i18n/pt.po
similarity index 100%
rename from addons/web/po/pt.po
rename to addons/web/i18n/pt.po
diff --git a/addons/web/po/pt_BR.po b/addons/web/i18n/pt_BR.po
similarity index 100%
rename from addons/web/po/pt_BR.po
rename to addons/web/i18n/pt_BR.po
diff --git a/addons/web/po/ru.po b/addons/web/i18n/ru.po
similarity index 100%
rename from addons/web/po/ru.po
rename to addons/web/i18n/ru.po
diff --git a/addons/web/po/sk.po b/addons/web/i18n/sk.po
similarity index 100%
rename from addons/web/po/sk.po
rename to addons/web/i18n/sk.po
diff --git a/addons/web/po/sl.po b/addons/web/i18n/sl.po
similarity index 100%
rename from addons/web/po/sl.po
rename to addons/web/i18n/sl.po
diff --git a/addons/web/po/sq.po b/addons/web/i18n/sq.po
similarity index 100%
rename from addons/web/po/sq.po
rename to addons/web/i18n/sq.po
diff --git a/addons/web/po/tr.po b/addons/web/i18n/tr.po
similarity index 100%
rename from addons/web/po/tr.po
rename to addons/web/i18n/tr.po
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot
new file mode 100644
index 00000000000..c7778d62dcf
--- /dev/null
+++ b/addons/web/i18n/web.pot
@@ -0,0 +1,1365 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:167
+#: addons/web/static/src/js/chrome.js:193
+#: addons/web/static/src/js/chrome.js:409
+#: addons/web/static/src/js/view_form.js:365
+#: addons/web/static/src/js/view_form.js:1097
+#: addons/web/static/src/xml/base.xml:1637
+msgid "Ok"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:175
+msgid "Send OpenERP Enterprise Report"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:189
+msgid "Dont send"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:283
+msgid "Invalid database name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:478
+msgid "Backed"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:479
+msgid "Database backed up successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:522
+msgid "Restored"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:522
+msgid "Database restored successfully"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:699
+msgid "About"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:778
+msgid "Preferences"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:781
+#: addons/web/static/src/js/search.js:237
+#: addons/web/static/src/js/search.js:286
+#: addons/web/static/src/js/view_editor.js:93
+#: addons/web/static/src/js/view_editor.js:769
+#: addons/web/static/src/js/view_editor.js:894
+#: addons/web/static/src/js/view_form.js:1092
+#: addons/web/static/src/xml/base.xml:738
+#: addons/web/static/src/xml/base.xml:1432
+#: addons/web/static/src/xml/base.xml:1442
+#: addons/web/static/src/xml/base.xml:1451
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:782
+msgid "Change password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:783
+#: addons/web/static/src/js/view_editor.js:71
+#: addons/web/static/src/js/views.js:957 addons/web/static/src/xml/base.xml:737
+#: addons/web/static/src/xml/base.xml:1436
+#: addons/web/static/src/xml/base.xml:1450
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:802
+#: addons/web/static/src/xml/base.xml:226
+#: addons/web/static/src/xml/base.xml:1671
+msgid "Change Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/chrome.js:1089
+msgid "OpenERP - Unsupported/Community Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:6
+msgid "Export Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:19
+#: addons/web/static/src/js/data_import.js:69
+#: addons/web/static/src/js/view_editor.js:48
+#: addons/web/static/src/js/view_editor.js:380
+#: addons/web/static/src/js/view_form.js:2901
+#: addons/web/static/src/js/views.js:958
+msgid "Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:20
+msgid "Export To File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:125
+msgid "Please enter save field list name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:360
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_export.js:373
+msgid "Please select fields to export..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:34
+msgid "Import Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:70
+msgid "Import File"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/data_import.js:105
+msgid "External ID"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:290
+#: addons/web/static/src/js/view_page.js:240
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/formats.js:295
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:235
+msgid "Filter Entry"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:240
+#: addons/web/static/src/js/search.js:289
+msgid "OK"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:284
+#: addons/web/static/src/xml/base.xml:1228
+msgid "Add to Dashboard"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:413
+msgid "Invalid Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:413
+msgid "triggered from search view"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:505
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:837
+msgid "not a valid integer"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:851
+msgid "not a valid number"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:913
+msgid "Yes"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:914
+msgid "No"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1267
+msgid "contains"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1268
+msgid "doesn't contain"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1269
+#: addons/web/static/src/js/search.js:1283
+#: addons/web/static/src/js/search.js:1302
+#: addons/web/static/src/js/search.js:1321
+#: addons/web/static/src/js/search.js:1342
+msgid "is equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1270
+#: addons/web/static/src/js/search.js:1284
+#: addons/web/static/src/js/search.js:1303
+#: addons/web/static/src/js/search.js:1322
+#: addons/web/static/src/js/search.js:1343
+msgid "is not equal to"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1271
+#: addons/web/static/src/js/search.js:1285
+#: addons/web/static/src/js/search.js:1304
+#: addons/web/static/src/js/search.js:1323
+#: addons/web/static/src/js/search.js:1344
+msgid "greater than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1272
+#: addons/web/static/src/js/search.js:1286
+#: addons/web/static/src/js/search.js:1305
+#: addons/web/static/src/js/search.js:1324
+#: addons/web/static/src/js/search.js:1345
+msgid "less than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1273
+#: addons/web/static/src/js/search.js:1287
+#: addons/web/static/src/js/search.js:1306
+#: addons/web/static/src/js/search.js:1325
+#: addons/web/static/src/js/search.js:1346
+msgid "greater or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1274
+#: addons/web/static/src/js/search.js:1288
+#: addons/web/static/src/js/search.js:1307
+#: addons/web/static/src/js/search.js:1326
+#: addons/web/static/src/js/search.js:1347
+msgid "less or equal than"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1337
+#: addons/web/static/src/js/search.js:1360
+msgid "is"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1361
+msgid "is not"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1373
+msgid "is true"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/search.js:1374
+msgid "is false"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:20
+#, python-format
+msgid "Manage Views (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:45
+#: addons/web/static/src/js/view_list.js:17
+#: addons/web/static/src/xml/base.xml:100
+#: addons/web/static/src/xml/base.xml:327
+#: addons/web/static/src/xml/base.xml:756
+msgid "Create"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:46
+#: addons/web/static/src/xml/base.xml:483
+#: addons/web/static/src/xml/base.xml:755
+msgid "Edit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:47
+#: addons/web/static/src/xml/base.xml:1589
+msgid "Remove"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:69
+#, python-format
+msgid "Create a view (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:165
+msgid "Do you really want to remove this view?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:361
+#, python-format
+msgid "View Editor %d - %s"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:364
+msgid "Preview"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:435
+msgid "Do you really want to remove this node?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:748
+#: addons/web/static/src/js/view_editor.js:871
+msgid "Properties"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_editor.js:751
+#: addons/web/static/src/js/view_editor.js:874
+msgid "Update"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:16
+msgid "Form"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:415
+msgid "Warning, the record has been modified, your changes will be discarded."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:624
+msgid "Attachments"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:662
+#, python-format
+msgid "Do you really want to delete the attachment %s?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1089
+msgid "Confirm"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1778
+#: addons/web/static/src/js/view_form.js:2435
+#: addons/web/static/src/js/view_form.js:2598
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1906
+msgid "<em>   Search More...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1919
+#, python-format
+msgid "<em>   Create \"<strong>%s</strong>\"</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1925
+msgid "<em>   Create and Edit...</em>"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1958
+#: addons/web/static/src/js/views.js:685
+msgid "Search: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:1958
+#: addons/web/static/src/js/view_form.js:2407
+msgid "Create: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2518
+#: addons/web/static/src/xml/base.xml:750
+#: addons/web/static/src/xml/base.xml:772
+#: addons/web/static/src/xml/base.xml:1588
+msgid "Add"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_form.js:2578
+msgid "Add: "
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:8
+msgid "List"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:269
+msgid "Unlimited"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:305
+#, python-format
+msgid "[%(first_record)d to %(last_record)d] of %(records_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:523
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1229
+msgid "Undefined"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_list.js:1326
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:8
+msgid "Page"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_page.js:52
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/view_tree.js:11
+msgid "Tree"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:565 addons/web/static/src/xml/base.xml:480
+msgid "Fields View Get"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:573
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:600
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:612 addons/web/static/src/xml/base.xml:487
+msgid "Customize Object"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:620 addons/web/static/src/xml/base.xml:482
+msgid "Manage Views"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:621
+msgid "Could not find current view declaration"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:808
+msgid "Customize"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:810
+msgid "Translate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:812
+msgid "Technical translation"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:816
+msgid "Other Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:819
+#: addons/web/static/src/xml/base.xml:1678
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:822
+#: addons/web/static/src/xml/base.xml:1548
+msgid "Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:825
+msgid "View Log"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:834
+msgid "Reports"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:834
+msgid "Actions"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:834
+msgid "Links"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:914
+msgid "You must choose at least one record."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:915
+msgid "Warning"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/js/views.js:952
+msgid "Translations"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:9 addons/web/static/src/xml/base.xml:15
+msgid "#{title}"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:10 addons/web/static/src/xml/base.xml:16
+msgid "#{text}"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315
+#: addons/web/static/src/xml/base.xml:1755
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:52
+msgid "Loading..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:61
+msgid "CREATE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211
+msgid "Master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191
+msgid "New database name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:77
+msgid "Load Demonstration data:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:81
+msgid "Default language:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:91
+msgid "Admin password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:95
+msgid "Confirm password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:109
+msgid "DROP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:116
+#: addons/web/static/src/xml/base.xml:150
+#: addons/web/static/src/xml/base.xml:301
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:128
+#: addons/web/static/src/xml/base.xml:162
+#: addons/web/static/src/xml/base.xml:187
+msgid "Master Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:132
+#: addons/web/static/src/xml/base.xml:328
+msgid "Drop"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:143
+msgid "BACKUP DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:166
+#: addons/web/static/src/xml/base.xml:329
+msgid "Backup"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:175
+msgid "RESTORE DATABASE"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:182
+msgid "File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:195
+#: addons/web/static/src/xml/base.xml:330
+msgid "Restore"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:204
+msgid "CHANGE MASTER PASSWORD"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:216
+msgid "New master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:221
+msgid "Confirm new master password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid ""
+"Your version of OpenERP is unsupported. Support & maintenance services "
+"are available here:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:251
+msgid "OpenERP Entreprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:256
+msgid "OpenERP Enterprise Contract."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:257
+msgid "Your report will be sent to the OpenERP Enterprise team."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:259
+msgid "Summary:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:263
+msgid "Description:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:267
+msgid "What you did:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:297
+msgid "Invalid username or password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:306
+msgid "Username"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:308
+#: addons/web/static/src/xml/base.xml:331
+msgid "Password"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:310
+msgid "Log in"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:314
+msgid "Manage Databases"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:332
+msgid "Back to Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:363
+msgid "LOGOUT"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:388
+msgid "&laquo;"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:389
+msgid "&raquo;"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:393
+msgid "oe_secondary_menu_item"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:408
+msgid "oe_secondary_submenu_item"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:454
+msgid "Hide this tip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:455
+msgid "Disable all tips"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:471
+msgid "More…"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:477
+msgid "Debug View#"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:478
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:479
+msgid "View Fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:483
+msgid "View"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:484
+msgid "Edit SearchView"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:485
+msgid "Edit Action"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:486
+msgid "Edit Workflow"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:492
+msgid "ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:495
+msgid "XML ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:498
+msgid "Creation User:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:501
+msgid "Creation Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:504
+msgid "Latest Modification by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:507
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:543
+msgid "Field"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:632
+#: addons/web/static/src/xml/base.xml:758
+#: addons/web/static/src/xml/base.xml:1650
+msgid "Delete"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:757
+msgid "Duplicate"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:795
+msgid "Unhandled widget"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:844
+msgid "Notebook Page \""
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:849
+#: addons/web/static/src/xml/base.xml:908
+msgid "Modifiers:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:875
+msgid "(nolabel)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:880
+msgid "Field:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:884
+msgid "Object:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:888
+msgid "Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:892
+msgid "Widget:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:896
+msgid "Size:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:900
+msgid "Context:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:904
+msgid "Domain:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:912
+msgid "On change:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:916
+msgid "Relation:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:920
+msgid "Selection:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1030
+msgid "Open..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1031
+msgid "Create..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1032
+msgid "Search..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1035
+msgid "..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1112
+#: addons/web/static/src/xml/base.xml:1163
+msgid "Uploading ..."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1140
+#: addons/web/static/src/xml/base.xml:1431
+msgid "Select"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1149
+msgid "Save As"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1155
+#: addons/web/static/src/xml/base.xml:1212
+msgid "Clear"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1178
+msgid "Button"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1181
+msgid "(no string)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1188
+msgid "Special:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1193
+msgid "Button Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1197
+msgid "Method:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1201
+msgid "Action ID:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1211
+msgid "Search"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1219
+msgid "Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1226
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1227
+msgid "Save Filter"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1229
+msgid "Manage Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1234
+msgid "Filter Name:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1236
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1241
+msgid "Select Dashboard to add this filter to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1245
+msgid "Title of new Dashboard item:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1352
+msgid "Advanced Filters"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1362
+msgid "Any of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1363
+msgid "All the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1364
+msgid "None of the following conditions must match"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1371
+msgid "Add condition"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1372
+msgid "and"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1439
+msgid "Save & New"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1440
+msgid "Save & Close"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1457
+msgid ""
+"adds back padding to row being rendered after edition, if necessary\n"
+"         (if not deletable add back padding), otherwise the row being "
+"added is\n"
+"         missing columns"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1553
+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 ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1560
+msgid "Export Type:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1562
+msgid "Import Compatible Export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1563
+msgid "Export all Data"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1566
+msgid "Export Formats"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1572
+msgid "Available fields"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1574
+msgid "Fields to export"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1576
+msgid "Save fields list"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1587
+msgid "TODO: replace ids by 'oe_*' classes"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1590
+msgid "Remove All"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1602
+msgid "Name"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1613
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1635
+msgid "Save as:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1642
+msgid "Saved exports:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1656
+msgid "Old Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1661
+msgid "New Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1666
+msgid "Confirm Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1684
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1685
+msgid ""
+"Select a .CSV file to import. If you need a sample of file to import,\n"
+"       you should use the export tool with the \"Import Compatible\" "
+"option."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1689
+msgid "CSV File:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1692
+msgid "2. Check your file format"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1695
+msgid "Import Options"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1699
+msgid "Does your file have titles?"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1705
+msgid "Separator:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1707
+msgid "Delimiter:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1711
+msgid "Encoding:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1714
+msgid "UTF-8"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1715
+msgid "Latin 1"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1718
+msgid "Lines to skip"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1745
+msgid "The import failed due to:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1747
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1754
+msgid "Activate the developper mode"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1756
+msgid "Version"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1757
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1758
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1759
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1761
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1762
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1764
+msgid "For more information visit"
+msgstr ""
+
+#. openerp-web
+#: addons/web/static/src/xml/base.xml:1765
+msgid "OpenERP.com"
+msgstr ""
+
diff --git a/addons/web/po/zh_CN.po b/addons/web/i18n/zh_CN.po
similarity index 100%
rename from addons/web/po/zh_CN.po
rename to addons/web/i18n/zh_CN.po
diff --git a/addons/web/po/zh_TW.po b/addons/web/i18n/zh_TW.po
similarity index 100%
rename from addons/web/po/zh_TW.po
rename to addons/web/i18n/zh_TW.po
diff --git a/addons/web/po/web.pot b/addons/web/po/web.pot
deleted file mode 100644
index 176cdd529b7..00000000000
--- a/addons/web/po/web.pot
+++ /dev/null
@@ -1,1050 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/web/static/src/js/chrome.js:162
-#: addons/web/static/src/js/chrome.js:175
-#: addons/web/static/src/js/chrome.js:369
-#: addons/web/static/src/js/view_form.js:358
-#: addons/web/static/src/js/view_form.js:1078
-#: addons/web/static/src/xml/base.xml:0
-msgid "Ok"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:668
-msgid "About"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:748
-msgid "Preferences"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:752
-msgid "Change password"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:753
-#: addons/web/static/src/js/search.js:235
-#: addons/web/static/src/js/search.js:276
-#: addons/web/static/src/js/view_editor.js:97
-#: addons/web/static/src/js/view_editor.js:778
-#: addons/web/static/src/js/view_editor.js:907
-#: addons/web/static/src/js/view_form.js:1085
-#: addons/web/static/src/xml/base.xml:0
-msgid "Cancel"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:754
-#: addons/web/static/src/js/view_editor.js:75
-#: addons/web/static/src/js/views.js:871 addons/web/static/src/xml/base.xml:0
-msgid "Save"
-msgstr ""
-
-#: addons/web/static/src/js/chrome.js:774 addons/web/static/src/xml/base.xml:0
-msgid "Change Password"
-msgstr ""
-
-#: addons/web/static/src/js/data_export.js:6
-msgid "Export Data"
-msgstr ""
-
-#: addons/web/static/src/js/data_export.js:23
-#: addons/web/static/src/js/data_import.js:73
-#: addons/web/static/src/js/view_editor.js:49
-#: addons/web/static/src/js/view_editor.js:387
-#: addons/web/static/src/js/view_form.js:2775
-#: addons/web/static/src/js/views.js:872
-msgid "Close"
-msgstr ""
-
-#: addons/web/static/src/js/data_export.js:24
-msgid "Export To File"
-msgstr ""
-
-#: addons/web/static/src/js/data_import.js:34
-msgid "Import Data"
-msgstr ""
-
-#: addons/web/static/src/js/data_import.js:74
-msgid "Import File"
-msgstr ""
-
-#: addons/web/static/src/js/data_import.js:109
-msgid "External ID"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:233
-msgid "Filter Entry"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:238
-#: addons/web/static/src/js/search.js:279
-msgid "OK"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:274 addons/web/static/src/xml/base.xml:0
-msgid "Add to Dashboard"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:403
-msgid "Invalid Search"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:403
-msgid "triggered from search view"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:490
-#, python-format
-msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:822
-msgid "not a valid integer"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:836
-msgid "not a valid number"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:898
-msgid "Yes"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:899
-msgid "No"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1252
-msgid "contains"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1253
-msgid "doesn't contain"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1254
-#: addons/web/static/src/js/search.js:1269
-#: addons/web/static/src/js/search.js:1289
-#: addons/web/static/src/js/search.js:1309
-#: addons/web/static/src/js/search.js:1331
-msgid "is equal to"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1255
-#: addons/web/static/src/js/search.js:1270
-#: addons/web/static/src/js/search.js:1290
-#: addons/web/static/src/js/search.js:1310
-#: addons/web/static/src/js/search.js:1332
-msgid "is not equal to"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1256
-#: addons/web/static/src/js/search.js:1271
-#: addons/web/static/src/js/search.js:1291
-#: addons/web/static/src/js/search.js:1311
-#: addons/web/static/src/js/search.js:1333
-msgid "greater than"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1257
-#: addons/web/static/src/js/search.js:1272
-#: addons/web/static/src/js/search.js:1292
-#: addons/web/static/src/js/search.js:1312
-#: addons/web/static/src/js/search.js:1334
-msgid "less than"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1258
-#: addons/web/static/src/js/search.js:1273
-#: addons/web/static/src/js/search.js:1293
-#: addons/web/static/src/js/search.js:1313
-#: addons/web/static/src/js/search.js:1335
-msgid "greater or equal than"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1259
-#: addons/web/static/src/js/search.js:1274
-#: addons/web/static/src/js/search.js:1294
-#: addons/web/static/src/js/search.js:1314
-#: addons/web/static/src/js/search.js:1336
-msgid "less or equal than"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1325
-#: addons/web/static/src/js/search.js:1350
-msgid "is"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1351
-msgid "is not"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1364
-msgid "is true"
-msgstr ""
-
-#: addons/web/static/src/js/search.js:1365
-msgid "is false"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:42
-msgid "ViewEditor"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:46
-#: addons/web/static/src/js/view_list.js:17
-#: addons/web/static/src/xml/base.xml:0
-msgid "Create"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:47
-#: addons/web/static/src/xml/base.xml:0
-msgid "Edit"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:48
-#: addons/web/static/src/xml/base.xml:0
-msgid "Remove"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:71
-#, python-format
-msgid "Create a view (%s)"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:170
-msgid "Do you really want to remove this view?"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:367
-#, python-format
-msgid "View Editor %d - %s"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:371
-msgid "Preview"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:442
-msgid "Do you really want to remove this node?"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:756
-#: addons/web/static/src/js/view_editor.js:883
-msgid "Properties"
-msgstr ""
-
-#: addons/web/static/src/js/view_editor.js:760
-#: addons/web/static/src/js/view_editor.js:887
-msgid "Update"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:17
-msgid "Form"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:401
-msgid "Warning, the record has been modified, your changes will be discarded."
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:612
-msgid "Attachments"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:650
-#, python-format
-msgid "Do you really want to delete the attachment %s?"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:1075
-msgid "Confirm"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:1838
-msgid "<em>   Search More...</em>"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:1851
-#, python-format
-msgid "<em>   Create \"<strong>%s</strong>\"</em>"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:1857
-msgid "<em>   Create and Edit...</em>"
-msgstr ""
-
-#: addons/web/static/src/js/view_form.js:2404
-#: addons/web/static/src/xml/base.xml:0
-msgid "Add"
-msgstr ""
-
-#: addons/web/static/src/js/view_list.js:8
-msgid "List"
-msgstr ""
-
-#: addons/web/static/src/js/view_list.js:269
-msgid "Unlimited"
-msgstr ""
-
-#: addons/web/static/src/js/view_list.js:516
-msgid "Do you really want to remove these records?"
-msgstr ""
-
-#: addons/web/static/src/js/view_list.js:1202
-msgid "Undefined"
-msgstr ""
-
-#: addons/web/static/src/js/view_page.js:8
-msgid "Page"
-msgstr ""
-
-#: addons/web/static/src/js/view_page.js:52
-msgid "Do you really want to delete this record?"
-msgstr ""
-
-#: addons/web/static/src/js/view_page.js:227
-msgid "Download"
-msgstr ""
-
-#: addons/web/static/src/js/view_tree.js:11
-msgid "Tree"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:590
-msgid "Search: "
-msgstr ""
-
-#: addons/web/static/src/js/views.js:710
-msgid "Customize"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:713
-msgid "Manage Views"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:715 addons/web/static/src/js/views.js:719
-#: addons/web/static/src/js/views.js:724
-msgid "Manage views of the current object"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:717
-msgid "Edit Workflow"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:722
-msgid "Customize Object"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:726
-msgid "Translate"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:728
-msgid "Technical translation"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:733
-msgid "Other Options"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:736 addons/web/static/src/xml/base.xml:0
-msgid "Import"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:739 addons/web/static/src/xml/base.xml:0
-msgid "Export"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:742
-msgid "View Log"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:751
-msgid "Reports"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:751
-msgid "Actions"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:751
-msgid "Links"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:831
-msgid "You must choose at least one record."
-msgstr ""
-
-#: addons/web/static/src/js/views.js:832
-msgid "Warning"
-msgstr ""
-
-#: addons/web/static/src/js/views.js:866
-msgid "Translations"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "x"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "#{title}"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "#{text}"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Powered by"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "openerp.com"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Loading..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Drop"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Backup"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Restore"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Password"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Back to Login"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "CREATE DATABASE"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Master password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "New database name:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Load Demonstration data:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Default language:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Admin password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Confirm password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "DROP DATABASE"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Database:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Master Password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "BACKUP DATABASE"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "RESTORE DATABASE"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "File:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "CHANGE MASTER PASSWORD"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "New master password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Confirm new master password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "User:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Database"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Login"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Bad username or password"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"We think that daily job activities can be more intuitive, efficient, "
-"automated, .. and even fun."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "OpenERP's vision to be:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Full featured"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"Today's enterprise challenges are multiple. We provide one module for "
-"each need."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Open Source"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"To Build a great product, we rely on the knowledge of thousands of "
-"contributors."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "User Friendly"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "In order to be productive, people need clean and easy to use interface."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "("
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ")"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "LOGOUT"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "&laquo;"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "&raquo;"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "oe_secondary_menu_item"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "oe_secondary_submenu_item"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Hide this tip"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Disable all tips"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "More…"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Debug View#"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "- Fields View Get"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "- Edit"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "View"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "- Edit SearchView"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "- Edit Action"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Field"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ":"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Delete"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "0"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "/"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Duplicate"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Unhandled widget"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Notebook Page \""
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "\""
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Modifiers:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "?"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "(nolabel)"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Field:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Object:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Type:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Widget:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Size:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Context:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Domain:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "On change:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Relation:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Selection:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "["
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "]"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "-"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "#"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Open..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Create..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Search..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Uploading ..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Select"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save As"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Clear"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Button"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "(no string)"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Special:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Button Type:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Method:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Action ID:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Search"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Advanced Filter"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save Filter"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Manage Filters"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Filter Name:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "(Any existing filter with the same name will be replaced)"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Select Dashboard to add this filter to:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Title of new Dashboard item:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Advanced Filters"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Any of the following conditions must match"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "All the following conditions must match"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "None of the following conditions must match"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Add condition"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "and"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save & New"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save & Close"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-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 ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Export Type:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Import Compatible Export"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Export all Data"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Export Formats"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Available fields"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Fields to export"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save fields list"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Remove All"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Name"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "&nbsp;"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Save as:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Saved exports:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Old Password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "New Password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Confirm Password:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "1. Import a .CSV file"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"Select a .CSV file to import. If you need a sample of file to import,\n"
-"       you should use the export tool with the \"Import Compatible\" "
-"option."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "CSV File:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "2. Check your file format"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Import Options"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Does your file have titles?"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Separator:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Delimiter:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Encoding:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "UTF-8"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Latin 1"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Lines to skip"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "The import failed due to:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Here is a preview of the file we could not import:"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "OpenERP Web"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Version"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Copyright © 2011-TODAY OpenERP SA. All Rights Reserved."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "OpenERP is a trademark of the"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "OpenERP SA Company"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "Licenced under the terms of"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "GNU Affero General Public License"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "About OpenERP"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid "OpenERP"
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"is a free enterprise-scale software system that is designed to boost\n"
-"            productivity and profit through data integration. It "
-"connects, improves and\n"
-"            manages business processes in areas such as sales, finance, "
-"supply chain,\n"
-"            project management, production, services, CRM, etc..."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"The system is platform-independent, and can be installed on Windows, Mac "
-"OS X,\n"
-"            and various Linux and other Unix-based distributions. Its "
-"architecture enables\n"
-"            new functionality to be rapidly created, modifications to be "
-"made to a\n"
-"            production system and migration to a new version to be "
-"straightforward."
-msgstr ""
-
-#: addons/web/static/src/xml/base.xml:0
-msgid ""
-"Depending on your needs, OpenERP is available through a web or "
-"application client."
-msgstr ""
-
diff --git a/addons/web_calendar/po/ar.po b/addons/web_calendar/i18n/ar.po
similarity index 100%
rename from addons/web_calendar/po/ar.po
rename to addons/web_calendar/i18n/ar.po
diff --git a/addons/web_calendar/po/bn.po b/addons/web_calendar/i18n/bn.po
similarity index 100%
rename from addons/web_calendar/po/bn.po
rename to addons/web_calendar/i18n/bn.po
diff --git a/addons/web_calendar/po/da.po b/addons/web_calendar/i18n/da.po
similarity index 100%
rename from addons/web_calendar/po/da.po
rename to addons/web_calendar/i18n/da.po
diff --git a/addons/web_calendar/po/de.po b/addons/web_calendar/i18n/de.po
similarity index 100%
rename from addons/web_calendar/po/de.po
rename to addons/web_calendar/i18n/de.po
diff --git a/addons/web_calendar/po/es.po b/addons/web_calendar/i18n/es.po
similarity index 100%
rename from addons/web_calendar/po/es.po
rename to addons/web_calendar/i18n/es.po
diff --git a/addons/web_calendar/po/es_EC.po b/addons/web_calendar/i18n/es_EC.po
similarity index 100%
rename from addons/web_calendar/po/es_EC.po
rename to addons/web_calendar/i18n/es_EC.po
diff --git a/addons/web_calendar/po/et.po b/addons/web_calendar/i18n/et.po
similarity index 100%
rename from addons/web_calendar/po/et.po
rename to addons/web_calendar/i18n/et.po
diff --git a/addons/web_calendar/po/fr.po b/addons/web_calendar/i18n/fr.po
similarity index 100%
rename from addons/web_calendar/po/fr.po
rename to addons/web_calendar/i18n/fr.po
diff --git a/addons/web_calendar/po/gl.po b/addons/web_calendar/i18n/gl.po
similarity index 100%
rename from addons/web_calendar/po/gl.po
rename to addons/web_calendar/i18n/gl.po
diff --git a/addons/web_calendar/po/hr.po b/addons/web_calendar/i18n/hr.po
similarity index 100%
rename from addons/web_calendar/po/hr.po
rename to addons/web_calendar/i18n/hr.po
diff --git a/addons/web_calendar/po/it.po b/addons/web_calendar/i18n/it.po
similarity index 100%
rename from addons/web_calendar/po/it.po
rename to addons/web_calendar/i18n/it.po
diff --git a/addons/web_calendar/po/nl.po b/addons/web_calendar/i18n/nl.po
similarity index 100%
rename from addons/web_calendar/po/nl.po
rename to addons/web_calendar/i18n/nl.po
diff --git a/addons/web_calendar/po/nl_BE.po b/addons/web_calendar/i18n/nl_BE.po
similarity index 100%
rename from addons/web_calendar/po/nl_BE.po
rename to addons/web_calendar/i18n/nl_BE.po
diff --git a/addons/web_calendar/po/pt.po b/addons/web_calendar/i18n/pt.po
similarity index 100%
rename from addons/web_calendar/po/pt.po
rename to addons/web_calendar/i18n/pt.po
diff --git a/addons/web_calendar/po/pt_BR.po b/addons/web_calendar/i18n/pt_BR.po
similarity index 100%
rename from addons/web_calendar/po/pt_BR.po
rename to addons/web_calendar/i18n/pt_BR.po
diff --git a/addons/web_calendar/po/ru.po b/addons/web_calendar/i18n/ru.po
similarity index 100%
rename from addons/web_calendar/po/ru.po
rename to addons/web_calendar/i18n/ru.po
diff --git a/addons/web_calendar/po/sk.po b/addons/web_calendar/i18n/sk.po
similarity index 100%
rename from addons/web_calendar/po/sk.po
rename to addons/web_calendar/i18n/sk.po
diff --git a/addons/web_calendar/po/sl.po b/addons/web_calendar/i18n/sl.po
similarity index 100%
rename from addons/web_calendar/po/sl.po
rename to addons/web_calendar/i18n/sl.po
diff --git a/addons/web_calendar/po/sq.po b/addons/web_calendar/i18n/sq.po
similarity index 100%
rename from addons/web_calendar/po/sq.po
rename to addons/web_calendar/i18n/sq.po
diff --git a/addons/web_calendar/po/tr.po b/addons/web_calendar/i18n/tr.po
similarity index 100%
rename from addons/web_calendar/po/tr.po
rename to addons/web_calendar/i18n/tr.po
diff --git a/addons/web_calendar/po/uk.po b/addons/web_calendar/i18n/uk.po
similarity index 100%
rename from addons/web_calendar/po/uk.po
rename to addons/web_calendar/i18n/uk.po
diff --git a/addons/web_calendar/po/web_calendar.pot b/addons/web_calendar/i18n/web_calendar.pot
similarity index 62%
rename from addons/web_calendar/po/web_calendar.pot
rename to addons/web_calendar/i18n/web_calendar.pot
index f4326cc7fe0..4aecabd4a59 100644
--- a/addons/web_calendar/po/web_calendar.pot
+++ b/addons/web_calendar/i18n/web_calendar.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
+#. openerp-web
 #: addons/web_calendar/static/src/js/calendar.js:11
 msgid "Calendar"
 msgstr ""
 
-#: addons/web_calendar/static/src/js/calendar.js:446
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:466
 msgid "Responsible"
 msgstr ""
 
-#: addons/web_calendar/static/src/js/calendar.js:475
+#. openerp-web
+#: addons/web_calendar/static/src/js/calendar.js:504
 msgid "Navigator"
 msgstr ""
 
-#: addons/web_calendar/static/src/xml/web_calendar.xml:0
+#. openerp-web
+#: addons/web_calendar/static/src/xml/web_calendar.xml:5
+#: addons/web_calendar/static/src/xml/web_calendar.xml:6
 msgid "&nbsp;"
 msgstr ""
 
diff --git a/addons/web_calendar/po/zh_CN.po b/addons/web_calendar/i18n/zh_CN.po
similarity index 100%
rename from addons/web_calendar/po/zh_CN.po
rename to addons/web_calendar/i18n/zh_CN.po
diff --git a/addons/web_chat/po/web_chat.pot b/addons/web_chat/i18n/web_chat.pot
similarity index 80%
rename from addons/web_chat/po/web_chat.pot
rename to addons/web_chat/i18n/web_chat.pot
index 7c2a8136b48..fceb4dad49c 100644
--- a/addons/web_chat/po/web_chat.pot
+++ b/addons/web_chat/i18n/web_chat.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/addons/web_dashboard/po/ar.po b/addons/web_dashboard/i18n/ar.po
similarity index 100%
rename from addons/web_dashboard/po/ar.po
rename to addons/web_dashboard/i18n/ar.po
diff --git a/addons/web_dashboard/po/bn.po b/addons/web_dashboard/i18n/bn.po
similarity index 100%
rename from addons/web_dashboard/po/bn.po
rename to addons/web_dashboard/i18n/bn.po
diff --git a/addons/web_dashboard/po/da.po b/addons/web_dashboard/i18n/da.po
similarity index 100%
rename from addons/web_dashboard/po/da.po
rename to addons/web_dashboard/i18n/da.po
diff --git a/addons/web_dashboard/po/de.po b/addons/web_dashboard/i18n/de.po
similarity index 100%
rename from addons/web_dashboard/po/de.po
rename to addons/web_dashboard/i18n/de.po
diff --git a/addons/web_dashboard/po/es.po b/addons/web_dashboard/i18n/es.po
similarity index 100%
rename from addons/web_dashboard/po/es.po
rename to addons/web_dashboard/i18n/es.po
diff --git a/addons/web_dashboard/po/es_EC.po b/addons/web_dashboard/i18n/es_EC.po
similarity index 100%
rename from addons/web_dashboard/po/es_EC.po
rename to addons/web_dashboard/i18n/es_EC.po
diff --git a/addons/web_dashboard/po/et.po b/addons/web_dashboard/i18n/et.po
similarity index 100%
rename from addons/web_dashboard/po/et.po
rename to addons/web_dashboard/i18n/et.po
diff --git a/addons/web_dashboard/po/fr.po b/addons/web_dashboard/i18n/fr.po
similarity index 100%
rename from addons/web_dashboard/po/fr.po
rename to addons/web_dashboard/i18n/fr.po
diff --git a/addons/web_dashboard/po/gl.po b/addons/web_dashboard/i18n/gl.po
similarity index 100%
rename from addons/web_dashboard/po/gl.po
rename to addons/web_dashboard/i18n/gl.po
diff --git a/addons/web_dashboard/po/hr.po b/addons/web_dashboard/i18n/hr.po
similarity index 100%
rename from addons/web_dashboard/po/hr.po
rename to addons/web_dashboard/i18n/hr.po
diff --git a/addons/web_dashboard/po/it.po b/addons/web_dashboard/i18n/it.po
similarity index 100%
rename from addons/web_dashboard/po/it.po
rename to addons/web_dashboard/i18n/it.po
diff --git a/addons/web_dashboard/po/nl.po b/addons/web_dashboard/i18n/nl.po
similarity index 100%
rename from addons/web_dashboard/po/nl.po
rename to addons/web_dashboard/i18n/nl.po
diff --git a/addons/web_dashboard/po/nl_BE.po b/addons/web_dashboard/i18n/nl_BE.po
similarity index 100%
rename from addons/web_dashboard/po/nl_BE.po
rename to addons/web_dashboard/i18n/nl_BE.po
diff --git a/addons/web_dashboard/po/pl.po b/addons/web_dashboard/i18n/pl.po
similarity index 100%
rename from addons/web_dashboard/po/pl.po
rename to addons/web_dashboard/i18n/pl.po
diff --git a/addons/web_dashboard/po/pt_BR.po b/addons/web_dashboard/i18n/pt_BR.po
similarity index 100%
rename from addons/web_dashboard/po/pt_BR.po
rename to addons/web_dashboard/i18n/pt_BR.po
diff --git a/addons/web_dashboard/po/ru.po b/addons/web_dashboard/i18n/ru.po
similarity index 100%
rename from addons/web_dashboard/po/ru.po
rename to addons/web_dashboard/i18n/ru.po
diff --git a/addons/web_dashboard/po/sk.po b/addons/web_dashboard/i18n/sk.po
similarity index 100%
rename from addons/web_dashboard/po/sk.po
rename to addons/web_dashboard/i18n/sk.po
diff --git a/addons/web_dashboard/po/sl.po b/addons/web_dashboard/i18n/sl.po
similarity index 100%
rename from addons/web_dashboard/po/sl.po
rename to addons/web_dashboard/i18n/sl.po
diff --git a/addons/web_dashboard/po/sq.po b/addons/web_dashboard/i18n/sq.po
similarity index 100%
rename from addons/web_dashboard/po/sq.po
rename to addons/web_dashboard/i18n/sq.po
diff --git a/addons/web_dashboard/po/tr.po b/addons/web_dashboard/i18n/tr.po
similarity index 100%
rename from addons/web_dashboard/po/tr.po
rename to addons/web_dashboard/i18n/tr.po
diff --git a/addons/web_dashboard/i18n/web_dashboard.pot b/addons/web_dashboard/i18n/web_dashboard.pot
new file mode 100644
index 00000000000..976dccc2566
--- /dev/null
+++ b/addons/web_dashboard/i18n/web_dashboard.pot
@@ -0,0 +1,86 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:63
+msgid "Edit Layout"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/js/dashboard.js:109
+msgid "Are you sure you want to remove this item ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:6
+msgid "Reset"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:10
+msgid "Change Layout"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:27
+msgid "&nbsp;"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:28
+msgid "Create"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:39
+msgid "Choose dashboard layout"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:62
+msgid "progress:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:67
+msgid ""
+"Click on the functionalites listed below to launch them and configure "
+"your system"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:110
+msgid "Welcome to OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:118
+msgid "Remember to bookmark"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:119
+msgid "This url"
+msgstr ""
+
+#. openerp-web
+#: addons/web_dashboard/static/src/xml/web_dashboard.xml:121
+msgid "Your login:"
+msgstr ""
+
diff --git a/addons/web_dashboard/po/zh_CN.po b/addons/web_dashboard/i18n/zh_CN.po
similarity index 100%
rename from addons/web_dashboard/po/zh_CN.po
rename to addons/web_dashboard/i18n/zh_CN.po
diff --git a/addons/web_dashboard/po/web_dashboard.pot b/addons/web_dashboard/po/web_dashboard.pot
deleted file mode 100644
index b4d47c28975..00000000000
--- a/addons/web_dashboard/po/web_dashboard.pot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/web_dashboard/static/src/js/dashboard.js:63
-msgid "Edit Layout"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Reset"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Change layout"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "&nbsp;"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Create"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Choose dashboard layout"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "progress:"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "%"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid ""
-"Click on the functionalites listed below to launch them and configure "
-"your system"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Welcome to OpenERP"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Remember to bookmark this page."
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Remember your login:"
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Choose the first OpenERP Application you want to install.."
-msgstr ""
-
-#: addons/web_dashboard/static/src/xml/web_dashboard.xml:0
-msgid "Please choose the first application to install."
-msgstr ""
-
diff --git a/addons/web_diagram/po/ar.po b/addons/web_diagram/i18n/ar.po
similarity index 100%
rename from addons/web_diagram/po/ar.po
rename to addons/web_diagram/i18n/ar.po
diff --git a/addons/web_diagram/po/bn.po b/addons/web_diagram/i18n/bn.po
similarity index 100%
rename from addons/web_diagram/po/bn.po
rename to addons/web_diagram/i18n/bn.po
diff --git a/addons/web_diagram/po/da.po b/addons/web_diagram/i18n/da.po
similarity index 100%
rename from addons/web_diagram/po/da.po
rename to addons/web_diagram/i18n/da.po
diff --git a/addons/web_diagram/po/de.po b/addons/web_diagram/i18n/de.po
similarity index 100%
rename from addons/web_diagram/po/de.po
rename to addons/web_diagram/i18n/de.po
diff --git a/addons/web_diagram/po/es.po b/addons/web_diagram/i18n/es.po
similarity index 100%
rename from addons/web_diagram/po/es.po
rename to addons/web_diagram/i18n/es.po
diff --git a/addons/web_diagram/po/es_EC.po b/addons/web_diagram/i18n/es_EC.po
similarity index 100%
rename from addons/web_diagram/po/es_EC.po
rename to addons/web_diagram/i18n/es_EC.po
diff --git a/addons/web_diagram/po/et.po b/addons/web_diagram/i18n/et.po
similarity index 100%
rename from addons/web_diagram/po/et.po
rename to addons/web_diagram/i18n/et.po
diff --git a/addons/web_diagram/po/gl.po b/addons/web_diagram/i18n/gl.po
similarity index 100%
rename from addons/web_diagram/po/gl.po
rename to addons/web_diagram/i18n/gl.po
diff --git a/addons/web_diagram/po/hr.po b/addons/web_diagram/i18n/hr.po
similarity index 100%
rename from addons/web_diagram/po/hr.po
rename to addons/web_diagram/i18n/hr.po
diff --git a/addons/web_diagram/po/it.po b/addons/web_diagram/i18n/it.po
similarity index 100%
rename from addons/web_diagram/po/it.po
rename to addons/web_diagram/i18n/it.po
diff --git a/addons/web_diagram/po/nl.po b/addons/web_diagram/i18n/nl.po
similarity index 100%
rename from addons/web_diagram/po/nl.po
rename to addons/web_diagram/i18n/nl.po
diff --git a/addons/web_diagram/po/nl_BE.po b/addons/web_diagram/i18n/nl_BE.po
similarity index 100%
rename from addons/web_diagram/po/nl_BE.po
rename to addons/web_diagram/i18n/nl_BE.po
diff --git a/addons/web_diagram/po/pl.po b/addons/web_diagram/i18n/pl.po
similarity index 100%
rename from addons/web_diagram/po/pl.po
rename to addons/web_diagram/i18n/pl.po
diff --git a/addons/web_diagram/po/pt_BR.po b/addons/web_diagram/i18n/pt_BR.po
similarity index 100%
rename from addons/web_diagram/po/pt_BR.po
rename to addons/web_diagram/i18n/pt_BR.po
diff --git a/addons/web_diagram/po/ru.po b/addons/web_diagram/i18n/ru.po
similarity index 100%
rename from addons/web_diagram/po/ru.po
rename to addons/web_diagram/i18n/ru.po
diff --git a/addons/web_diagram/po/sl.po b/addons/web_diagram/i18n/sl.po
similarity index 100%
rename from addons/web_diagram/po/sl.po
rename to addons/web_diagram/i18n/sl.po
diff --git a/addons/web_diagram/po/sq.po b/addons/web_diagram/i18n/sq.po
similarity index 100%
rename from addons/web_diagram/po/sq.po
rename to addons/web_diagram/i18n/sq.po
diff --git a/addons/web_diagram/po/tr.po b/addons/web_diagram/i18n/tr.po
similarity index 100%
rename from addons/web_diagram/po/tr.po
rename to addons/web_diagram/i18n/tr.po
diff --git a/addons/web_diagram/i18n/web_diagram.pot b/addons/web_diagram/i18n/web_diagram.pot
new file mode 100644
index 00000000000..5fdd2680514
--- /dev/null
+++ b/addons/web_diagram/i18n/web_diagram.pot
@@ -0,0 +1,49 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:11
+msgid "Diagram"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+msgid "Activity"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:208
+msgid "Transition"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:214
+msgid "Create:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/js/diagram.js:231
+msgid "Open: "
+msgstr ""
+
+#. openerp-web
+#: addons/web_diagram/static/src/xml/base_diagram.xml:5
+msgid "New Node"
+msgstr ""
+
diff --git a/addons/web_diagram/po/zh_CN.po b/addons/web_diagram/i18n/zh_CN.po
similarity index 100%
rename from addons/web_diagram/po/zh_CN.po
rename to addons/web_diagram/i18n/zh_CN.po
diff --git a/addons/web_diagram/po/web_diagram.pot b/addons/web_diagram/po/web_diagram.pot
deleted file mode 100644
index 2534f43b468..00000000000
--- a/addons/web_diagram/po/web_diagram.pot
+++ /dev/null
@@ -1,59 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/web_diagram/static/src/js/diagram.js:11
-msgid "Diagram"
-msgstr ""
-
-#: addons/web_diagram/static/src/js/diagram.js:210
-msgid "Cancel"
-msgstr ""
-
-#: addons/web_diagram/static/src/js/diagram.js:211
-msgid "Save"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "New Node"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "First"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "<<"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "0"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "/"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid ">>"
-msgstr ""
-
-#: addons/web_diagram/static/src/xml/base_diagram.xml:0
-msgid "Last"
-msgstr ""
-
diff --git a/addons/web_gantt/po/ar.po b/addons/web_gantt/i18n/ar.po
similarity index 100%
rename from addons/web_gantt/po/ar.po
rename to addons/web_gantt/i18n/ar.po
diff --git a/addons/web_gantt/po/de.po b/addons/web_gantt/i18n/de.po
similarity index 100%
rename from addons/web_gantt/po/de.po
rename to addons/web_gantt/i18n/de.po
diff --git a/addons/web_gantt/po/hr.po b/addons/web_gantt/i18n/hr.po
similarity index 100%
rename from addons/web_gantt/po/hr.po
rename to addons/web_gantt/i18n/hr.po
diff --git a/addons/web_gantt/po/pt_BR.po b/addons/web_gantt/i18n/pt_BR.po
similarity index 100%
rename from addons/web_gantt/po/pt_BR.po
rename to addons/web_gantt/i18n/pt_BR.po
diff --git a/addons/web_gantt/po/ru.po b/addons/web_gantt/i18n/ru.po
similarity index 100%
rename from addons/web_gantt/po/ru.po
rename to addons/web_gantt/i18n/ru.po
diff --git a/addons/web_gantt/po/sl.po b/addons/web_gantt/i18n/sl.po
similarity index 100%
rename from addons/web_gantt/po/sl.po
rename to addons/web_gantt/i18n/sl.po
diff --git a/addons/web_gantt/po/sq.po b/addons/web_gantt/i18n/sq.po
similarity index 100%
rename from addons/web_gantt/po/sq.po
rename to addons/web_gantt/i18n/sq.po
diff --git a/addons/web_gantt/po/tr.po b/addons/web_gantt/i18n/tr.po
similarity index 100%
rename from addons/web_gantt/po/tr.po
rename to addons/web_gantt/i18n/tr.po
diff --git a/addons/web_gantt/po/web_gantt.pot b/addons/web_gantt/i18n/web_gantt.pot
similarity index 57%
rename from addons/web_gantt/po/web_gantt.pot
rename to addons/web_gantt/i18n/web_gantt.pot
index 2ec3a5067cc..8bdbf102af7 100644
--- a/addons/web_gantt/po/web_gantt.pot
+++ b/addons/web_gantt/i18n/web_gantt.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: addons/web_gantt/static/src/js/gantt.js:10
+#. openerp-web
+#: addons/web_gantt/static/src/js/gantt.js:11
 msgid "Gantt"
 msgstr ""
 
-#: addons/web_gantt/static/src/js/gantt.js:51
-msgid "date_start is not defined "
-msgstr ""
-
-#: addons/web_gantt/static/src/js/gantt.js:110
-msgid "date_start is not defined"
-msgstr ""
-
-#: addons/web_gantt/static/src/xml/web_gantt.xml:0
+#. openerp-web
+#: addons/web_gantt/static/src/xml/web_gantt.xml:10
 msgid "Create"
 msgstr ""
 
diff --git a/addons/web_gantt/po/zh_CN.po b/addons/web_gantt/i18n/zh_CN.po
similarity index 100%
rename from addons/web_gantt/po/zh_CN.po
rename to addons/web_gantt/i18n/zh_CN.po
diff --git a/addons/web_graph/po/ar.po b/addons/web_graph/i18n/ar.po
similarity index 100%
rename from addons/web_graph/po/ar.po
rename to addons/web_graph/i18n/ar.po
diff --git a/addons/web_graph/po/de.po b/addons/web_graph/i18n/de.po
similarity index 100%
rename from addons/web_graph/po/de.po
rename to addons/web_graph/i18n/de.po
diff --git a/addons/web_graph/po/hr.po b/addons/web_graph/i18n/hr.po
similarity index 100%
rename from addons/web_graph/po/hr.po
rename to addons/web_graph/i18n/hr.po
diff --git a/addons/web_graph/po/pt.po b/addons/web_graph/i18n/pt.po
similarity index 100%
rename from addons/web_graph/po/pt.po
rename to addons/web_graph/i18n/pt.po
diff --git a/addons/web_graph/po/pt_BR.po b/addons/web_graph/i18n/pt_BR.po
similarity index 100%
rename from addons/web_graph/po/pt_BR.po
rename to addons/web_graph/i18n/pt_BR.po
diff --git a/addons/web_graph/po/ru.po b/addons/web_graph/i18n/ru.po
similarity index 100%
rename from addons/web_graph/po/ru.po
rename to addons/web_graph/i18n/ru.po
diff --git a/addons/web_graph/po/sl.po b/addons/web_graph/i18n/sl.po
similarity index 100%
rename from addons/web_graph/po/sl.po
rename to addons/web_graph/i18n/sl.po
diff --git a/addons/web_graph/po/sq.po b/addons/web_graph/i18n/sq.po
similarity index 100%
rename from addons/web_graph/po/sq.po
rename to addons/web_graph/i18n/sq.po
diff --git a/addons/web_graph/po/tr.po b/addons/web_graph/i18n/tr.po
similarity index 100%
rename from addons/web_graph/po/tr.po
rename to addons/web_graph/i18n/tr.po
diff --git a/addons/web_graph/po/web_graph.pot b/addons/web_graph/i18n/web_graph.pot
similarity index 80%
rename from addons/web_graph/po/web_graph.pot
rename to addons/web_graph/i18n/web_graph.pot
index cc5727bdfc4..fbb112a0cf2 100644
--- a/addons/web_graph/po/web_graph.pot
+++ b/addons/web_graph/i18n/web_graph.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
+#. openerp-web
 #: addons/web_graph/static/src/js/graph.js:19
 msgid "Graph"
 msgstr ""
diff --git a/addons/web_graph/po/zh_CN.po b/addons/web_graph/i18n/zh_CN.po
similarity index 100%
rename from addons/web_graph/po/zh_CN.po
rename to addons/web_graph/i18n/zh_CN.po
diff --git a/addons/web_hello/po/fr.po b/addons/web_hello/i18n/fr.po
similarity index 100%
rename from addons/web_hello/po/fr.po
rename to addons/web_hello/i18n/fr.po
diff --git a/addons/web_hello/po/web_hello.pot b/addons/web_hello/i18n/web_hello.pot
similarity index 80%
rename from addons/web_hello/po/web_hello.pot
rename to addons/web_hello/i18n/web_hello.pot
index 7c2a8136b48..fceb4dad49c 100644
--- a/addons/web_hello/po/web_hello.pot
+++ b/addons/web_hello/i18n/web_hello.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/addons/web_kanban/i18n/web_kanban.pot b/addons/web_kanban/i18n/web_kanban.pot
new file mode 100644
index 00000000000..b8b8e1a5cb6
--- /dev/null
+++ b/addons/web_kanban/i18n/web_kanban.pot
@@ -0,0 +1,44 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:10
+msgid "Kanban"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:291
+msgid "Undefined"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/js/kanban.js:450
+msgid "Are you sure you want to delete this record ?"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:5
+msgid "New"
+msgstr ""
+
+#. openerp-web
+#: addons/web_kanban/static/src/xml/web_kanban.xml:55
+msgid "</tr><tr>"
+msgstr ""
+
diff --git a/addons/web_mobile/po/ar.po b/addons/web_mobile/i18n/ar.po
similarity index 100%
rename from addons/web_mobile/po/ar.po
rename to addons/web_mobile/i18n/ar.po
diff --git a/addons/web_mobile/po/bn.po b/addons/web_mobile/i18n/bn.po
similarity index 100%
rename from addons/web_mobile/po/bn.po
rename to addons/web_mobile/i18n/bn.po
diff --git a/addons/web_mobile/po/da.po b/addons/web_mobile/i18n/da.po
similarity index 100%
rename from addons/web_mobile/po/da.po
rename to addons/web_mobile/i18n/da.po
diff --git a/addons/web_mobile/po/de.po b/addons/web_mobile/i18n/de.po
similarity index 100%
rename from addons/web_mobile/po/de.po
rename to addons/web_mobile/i18n/de.po
diff --git a/addons/web_mobile/po/es.po b/addons/web_mobile/i18n/es.po
similarity index 100%
rename from addons/web_mobile/po/es.po
rename to addons/web_mobile/i18n/es.po
diff --git a/addons/web_mobile/po/es_EC.po b/addons/web_mobile/i18n/es_EC.po
similarity index 100%
rename from addons/web_mobile/po/es_EC.po
rename to addons/web_mobile/i18n/es_EC.po
diff --git a/addons/web_mobile/po/et.po b/addons/web_mobile/i18n/et.po
similarity index 100%
rename from addons/web_mobile/po/et.po
rename to addons/web_mobile/i18n/et.po
diff --git a/addons/web_mobile/po/fr.po b/addons/web_mobile/i18n/fr.po
similarity index 100%
rename from addons/web_mobile/po/fr.po
rename to addons/web_mobile/i18n/fr.po
diff --git a/addons/web_mobile/po/gl.po b/addons/web_mobile/i18n/gl.po
similarity index 100%
rename from addons/web_mobile/po/gl.po
rename to addons/web_mobile/i18n/gl.po
diff --git a/addons/web_mobile/po/hr.po b/addons/web_mobile/i18n/hr.po
similarity index 100%
rename from addons/web_mobile/po/hr.po
rename to addons/web_mobile/i18n/hr.po
diff --git a/addons/web_mobile/po/it.po b/addons/web_mobile/i18n/it.po
similarity index 100%
rename from addons/web_mobile/po/it.po
rename to addons/web_mobile/i18n/it.po
diff --git a/addons/web_mobile/po/nl.po b/addons/web_mobile/i18n/nl.po
similarity index 100%
rename from addons/web_mobile/po/nl.po
rename to addons/web_mobile/i18n/nl.po
diff --git a/addons/web_mobile/po/nl_BE.po b/addons/web_mobile/i18n/nl_BE.po
similarity index 100%
rename from addons/web_mobile/po/nl_BE.po
rename to addons/web_mobile/i18n/nl_BE.po
diff --git a/addons/web_mobile/po/pl.po b/addons/web_mobile/i18n/pl.po
similarity index 100%
rename from addons/web_mobile/po/pl.po
rename to addons/web_mobile/i18n/pl.po
diff --git a/addons/web_mobile/po/pt.po b/addons/web_mobile/i18n/pt.po
similarity index 100%
rename from addons/web_mobile/po/pt.po
rename to addons/web_mobile/i18n/pt.po
diff --git a/addons/web_mobile/po/pt_BR.po b/addons/web_mobile/i18n/pt_BR.po
similarity index 100%
rename from addons/web_mobile/po/pt_BR.po
rename to addons/web_mobile/i18n/pt_BR.po
diff --git a/addons/web_mobile/po/ru.po b/addons/web_mobile/i18n/ru.po
similarity index 100%
rename from addons/web_mobile/po/ru.po
rename to addons/web_mobile/i18n/ru.po
diff --git a/addons/web_mobile/po/sk.po b/addons/web_mobile/i18n/sk.po
similarity index 100%
rename from addons/web_mobile/po/sk.po
rename to addons/web_mobile/i18n/sk.po
diff --git a/addons/web_mobile/po/sl.po b/addons/web_mobile/i18n/sl.po
similarity index 100%
rename from addons/web_mobile/po/sl.po
rename to addons/web_mobile/i18n/sl.po
diff --git a/addons/web_mobile/po/sq.po b/addons/web_mobile/i18n/sq.po
similarity index 100%
rename from addons/web_mobile/po/sq.po
rename to addons/web_mobile/i18n/sq.po
diff --git a/addons/web_mobile/po/tr.po b/addons/web_mobile/i18n/tr.po
similarity index 100%
rename from addons/web_mobile/po/tr.po
rename to addons/web_mobile/i18n/tr.po
diff --git a/addons/web_mobile/po/uk.po b/addons/web_mobile/i18n/uk.po
similarity index 100%
rename from addons/web_mobile/po/uk.po
rename to addons/web_mobile/i18n/uk.po
diff --git a/addons/web_mobile/i18n/web_mobile.pot b/addons/web_mobile/i18n/web_mobile.pot
new file mode 100644
index 00000000000..04ffe4a2ff6
--- /dev/null
+++ b/addons/web_mobile/i18n/web_mobile.pot
@@ -0,0 +1,86 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:17
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:22
+msgid "Database:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:30
+msgid "Login:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:32
+msgid "Password:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:34
+msgid "Login"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:36
+msgid "Bad username or password"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:42
+msgid "Powered by openerp.com"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:57
+msgid "Favourite"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:58
+msgid "Preference"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:123
+msgid "Logout"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:132
+msgid "There are no records to show."
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:264
+#: addons/web_mobile/static/src/xml/web_mobile.xml:268
+msgid "On"
+msgstr ""
+
+#. openerp-web
+#: addons/web_mobile/static/src/xml/web_mobile.xml:265
+#: addons/web_mobile/static/src/xml/web_mobile.xml:269
+msgid "Off"
+msgstr ""
+
diff --git a/addons/web_mobile/po/zh_CN.po b/addons/web_mobile/i18n/zh_CN.po
similarity index 100%
rename from addons/web_mobile/po/zh_CN.po
rename to addons/web_mobile/i18n/zh_CN.po
diff --git a/addons/web_mobile/po/web_mobile.pot b/addons/web_mobile/po/web_mobile.pot
deleted file mode 100644
index 283905ff3ed..00000000000
--- a/addons/web_mobile/po/web_mobile.pot
+++ /dev/null
@@ -1,75 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "OpenERP"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Database:"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Login:"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Password:"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Login"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Bad username or password"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Powered by openerp.com"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Favourite"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Preference"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Logout"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "There are no records to show."
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid ":"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "On"
-msgstr ""
-
-#: addons/web_mobile/static/src/xml/web_mobile.xml:0
-msgid "Off"
-msgstr ""
-
diff --git a/addons/web_process/i18n/web_process.pot b/addons/web_process/i18n/web_process.pot
new file mode 100644
index 00000000000..699bb718b83
--- /dev/null
+++ b/addons/web_process/i18n/web_process.pot
@@ -0,0 +1,119 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:261
+msgid "Cancel"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/js/process.js:262
+msgid "Save"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:3
+msgid "vim:fdl=1:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Documentation"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:19
+msgid "Read Documentation Online"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Forum"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:25
+msgid "Community Discussion"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:31
+msgid "Get the books"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:37
+msgid "Purchase OpenERP Enterprise"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:52
+msgid "Process"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:56
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "Last modified by:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:59
+msgid "N/A"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:62
+msgid "Subflows:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:75
+msgid "Related:"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:88
+msgid "Select Process"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:98
+msgid "Select"
+msgstr ""
+
+#. openerp-web
+#: addons/web_process/static/src/xml/web_process.xml:109
+msgid "Edit Process"
+msgstr ""
+
diff --git a/addons/web_rpc/po/web_rpc.pot b/addons/web_rpc/i18n/web_rpc.pot
similarity index 80%
rename from addons/web_rpc/po/web_rpc.pot
rename to addons/web_rpc/i18n/web_rpc.pot
index 7c2a8136b48..fceb4dad49c 100644
--- a/addons/web_rpc/po/web_rpc.pot
+++ b/addons/web_rpc/i18n/web_rpc.pot
@@ -1,14 +1,14 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-12-20 18:48+0100\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/addons/web_tests/i18n/web_tests.pot b/addons/web_tests/i18n/web_tests.pot
new file mode 100644
index 00000000000..fceb4dad49c
--- /dev/null
+++ b/addons/web_tests/i18n/web_tests.pot
@@ -0,0 +1,19 @@
+# Translations template for PROJECT.
+# Copyright (C) 2012 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2012-02-01 16:37+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+
diff --git a/babel.cfg b/babel.cfg
index 02820af13d6..7d9eb3d0cee 100644
--- a/babel.cfg
+++ b/babel.cfg
@@ -2,6 +2,7 @@
 [extractors]
 qweb = npybabel:extract_qweb
 xmljs = npybabel:extract_xmljs
+javascript = npybabel:extract_javascript
 [javascript: static/src/js/**.js]
 [qweb: static/src/xml/**.xml]
 [xmljs: static/src/xml/**.xml]
diff --git a/gen_translations.sh b/gen_translations.sh
index 62460c397d2..7cf767fd504 100755
--- a/gen_translations.sh
+++ b/gen_translations.sh
@@ -2,12 +2,13 @@
 
 usage() {
 cat << EOF
-usage: $0 -a
-usage: $0 DIR OUTPUT_FILE
+usage: $0 -a [DIR]
+usage: $0 <ADDON_DIR> <OUTPUT_FILE>
 
 OPTIONS:
-   -a    recreate the .pot file for all addons
-   -h    print this message
+   -a [DIR]  export the .pot files for all web addons found
+             at target path (default: ./addons) 
+   -h        print this message
 EOF
 exit 0
 }
@@ -30,21 +31,26 @@ shift $((OPTIND-1))
 
 if [ -n "$do_all" ]
 then
-    echo "Extracting all the translations"
+    echo "Extracting all web addons translations"
     executable=$0
-    extract_module() {
-       $executable addons/$1 addons/$1/po/$1.pot 
-    }
-    extract_module web
-    extract_module web_calendar
-    extract_module web_dashboard
-    extract_module web_diagram
-    extract_module web_gantt
-    extract_module web_graph
-    extract_module web_hello
-    extract_module web_chat
-    extract_module web_mobile
-    extract_module web_rpc
+    target_dir=${1:-./addons}
+    echo "Using target dir: ${target_dir}"
+    for mod in $(find ${target_dir} -type d -name 'static' -exec sh -c 'basename `dirname {}`' \;); do
+       echo ${mod}
+       mod_pot=${target_dir}/${mod}/i18n/${mod}.pot
+       web_pot=${mod_pot}.web 
+       mkdir -p `dirname ${web_pot}`
+       $executable ${target_dir}/${mod} ${web_pot} 
+       if [ -f "${mod_pot}" ]; then
+         echo "Merging with existing PO file: ${mod_pot}"
+         msgcat -o "${mod_pot}.tmp" ${mod_pot} ${web_pot}
+         mv ${mod_pot}.tmp ${mod_pot}
+         rm ${web_pot}
+       else
+         echo "Renaming to final PO file: ${mod_pot}"
+         mv ${web_pot} ${mod_pot}
+       fi
+    done
 elif [ -n "$2" ]
 then
     ./npybabel.py extract -F babel.cfg -o $2 -k _t -k _lt --no-default-keywords $1
diff --git a/npybabel.py b/npybabel.py
index 81cd6abf60a..b2888cd4a2c 100755
--- a/npybabel.py
+++ b/npybabel.py
@@ -5,33 +5,50 @@ import sys
 from pkg_resources import load_entry_point
 import re
 import json
-import xml.etree.ElementTree as elt
+from lxml import etree as elt
+from babel.messages import extract
 
 if __name__ == '__main__':
     sys.exit(
         load_entry_point('Babel==0.9.6', 'console_scripts', 'pybabel')()
     )
-    
+
 XMLJS_EXPR = re.compile(r"""(?:\_t *\( *((?:"(?:[^"\\]|\\.)*")|(?:'(?:[^'\\]|\\.)*')) *\))""")
 
+TRANSLATION_FLAG_COMMENT = "openerp-web"
+
 def extract_xmljs(fileobj, keywords, comment_tags, options):
+    """Extract messages from Javascript code embedded into XML documents.
+    This complements the ``extract_javascript`` extractor which works
+    only on pure .js files, and the``extract_qweb`` extractor, which only
+    extracts XML text.
+
+    :param fileobj: the file-like object the messages should be extracted
+                    from
+    :param keywords: a list of keywords (i.e. function names) that should
+                     be recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and
+                         include in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)``
+             tuples
+    :rtype: ``iterator``
+    """
     content = fileobj.read()
     found = XMLJS_EXPR.finditer(content)
-    result = []
     index = 0
     line_nbr = 0
     for f in found:
-        mes = f.group(1)
-        mes = json.loads(mes)
+        msg = f.group(1)
+        msg = json.loads(msg)
         while index < f.start():
             if content[index] == "\n":
                 line_nbr += 1
             index += 1
-        result.append((line_nbr, None, mes, ""))
-    return result
+        yield (line_nbr, None, msg, [TRANSLATION_FLAG_COMMENT])
 
 def extract_qweb(fileobj, keywords, comment_tags, options):
-    """Extract messages from XXX files.
+    """Extract messages from qweb template files.
     :param fileobj: the file-like object the messages should be extracted
                     from
     :param keywords: a list of keywords (i.e. function names) that should
@@ -44,22 +61,42 @@ def extract_qweb(fileobj, keywords, comment_tags, options):
     :rtype: ``iterator``
     """
     result = []
-    def handle_text(str):
-        str = (str or "").strip()
-        if not str:
-            return
-        result.append((0, None, str, ""))
-    
+    def handle_text(text, lineno):
+        text = (text or "").strip()
+        if len(text) > 1: # Avoid mono-char tokens like ':' ',' etc.
+            result.append((lineno, None, text, [TRANSLATION_FLAG_COMMENT]))
+
     def iter_elements(current_element):
         for el in current_element:
             if "t-js" not in el.attrib and \
                     not ("t-jquery" in el.attrib and "t-operation" not in el.attrib) and \
                     not ("t-translation" in el.attrib and el.attrib["t-translation"].strip() == "off"):
-                handle_text(el.text)
+                handle_text(el.text, el.sourceline)
                 iter_elements(el)
-            handle_text(el.tail)
-    
+            handle_text(el.tail, el.sourceline)
+
     tree = elt.parse(fileobj)
     iter_elements(tree.getroot())
 
     return result
+
+def extract_javascript(fileobj, keywords, comment_tags, options):
+    """Extract messages from Javascript source files. This extractor delegates
+    to babel's buit-in javascript extractor, but adds a special comment
+    used as a flag to identify web translations. 
+
+    :param fileobj: the file-like object the messages should be extracted
+                    from
+    :param keywords: a list of keywords (i.e. function names) that should
+                     be recognized as translation functions
+    :param comment_tags: a list of translator tags to search for and
+                         include in the results
+    :param options: a dictionary of additional options (optional)
+    :return: an iterator over ``(lineno, funcname, message, comments)``
+             tuples
+    :rtype: ``iterator``
+    """
+    for (message_lineno, funcname, messages, comments) in \
+        extract.extract_javascript(fileobj, keywords, comment_tags, options):
+        comments.append(TRANSLATION_FLAG_COMMENT)
+        yield (message_lineno, funcname, messages, comments)