credativ team mailing list archive

Thread
Date

[Merge] lp:~credativ/openerp-web/7.0-lp1153853 into lp:openerp-web

To: mp+222936@xxxxxxxxxxxxxxxxxx
From: "Craig Gowing \(credativ\)" <craiggowing@xxxxxxxxxxxxxx>
Date: Thu, 12 Jun 2014 12:33:42 -0000
Reply-to: mp+222936@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Craig Gowing (credativ) has proposed merging lp:~credativ/openerp-web/7.0-lp1153853 into lp:openerp-web.

Requested reviews:
  OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
  Bug #1153853 in OpenERP Server: "On change method doesn't update inline editing read only value"
  https://bugs.launchpad.net/openobject-server/+bug/1153853

For more details, see:
https://code.launchpad.net/~credativ/openerp-web/7.0-lp1153853/+merge/222936
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~credativ/openerp-web/7.0-lp1153853/+merge/222936
Your team credativ is subscribed to branch lp:~credativ/openerp-web/7.0-lp1153853.

=== modified file 'addons/web/i18n/ar.po'
--- addons/web/i18n/ar.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ar.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/bg.po'
--- addons/web/i18n/bg.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/bg.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/bn.po'
--- addons/web/i18n/bn.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/bn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/bs.po'
--- addons/web/i18n/bs.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/bs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/ca.po'
--- addons/web/i18n/ca.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ca.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/cs.po'
--- addons/web/i18n/cs.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/cs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 "X-Poedit-Language: Czech\n"
 
 #. module: web

=== modified file 'addons/web/i18n/da.po'
--- addons/web/i18n/da.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/da.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/de.po'
--- addons/web/i18n/de.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/de.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/en_AU.po'
--- addons/web/i18n/en_AU.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/en_AU.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/en_GB.po'
--- addons/web/i18n/en_GB.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/en_GB.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es.po'
--- addons/web/i18n/es.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es_CL.po'
--- addons/web/i18n/es_CL.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es_CL.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es_CR.po'
--- addons/web/i18n/es_CR.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es_CR.po	2014-06-12 12:31:56 +0000
@@ -14,9 +14,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 "Language: es\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es_DO.po'
--- addons/web/i18n/es_DO.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es_DO.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es_EC.po'
--- addons/web/i18n/es_EC.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es_EC.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/es_MX.po'
--- addons/web/i18n/es_MX.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/es_MX.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== added file 'addons/web/i18n/es_PE.po'
--- addons/web/i18n/es_PE.po	1970-01-01 00:00:00 +0000
+++ addons/web/i18n/es_PE.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,2865 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 15:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr ""

=== renamed file 'addons/web/i18n/es_PE.po' => 'addons/web/i18n/es_PE.po.moved'
=== modified file 'addons/web/i18n/et.po'
--- addons/web/i18n/et.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/et.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,23 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr "Lisa"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/eu.po'
--- addons/web/i18n/eu.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/eu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/fa.po'
--- addons/web/i18n/fa.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/fa.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/fi.po'
--- addons/web/i18n/fi.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/fi.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/fr.po'
--- addons/web/i18n/fr.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/fr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/fr_CA.po'
--- addons/web/i18n/fr_CA.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/fr_CA.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/gl.po'
--- addons/web/i18n/gl.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/gl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/gu.po'
--- addons/web/i18n/gu.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/gu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== added file 'addons/web/i18n/he.po'
--- addons/web/i18n/he.po	1970-01-01 00:00:00 +0000
+++ addons/web/i18n/he.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,2866 @@
+# Hebrew translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-31 00:07+0000\n"
+"Last-Translator: Amir Elion <Unknown>\n"
+"Language-Team: Hebrew <he@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+"Language: he\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr "שפת ברירת־מחדל:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr "לפני %d דקות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr "עדיין טוען...<br />נא להמתין."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr "יותר או פחות מ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr "היום"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr "הגישה נדחתה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr "עכשיו"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr "לפני כשעה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr "שבוע בשנה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr "גיבוי בסיס הנתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr "'%s' אינן תאריך תקין"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr "הבא>"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr "לפני כדקה"
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr "לא ניתן להשאיר סיסמא כלשהי ריקה."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr "שם משתמש או סיסמה לא-תקפים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr "בחר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr "בסיס הנתונים שוחזר בהצלחה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr "גירסה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr "למשל - החברה שלי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr "טופס"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr "'%s' אינו זמן תקין"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr "אינו מספר תקין"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr "סיסמה חדשה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr "קובץ מצורף:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr "שדות שיש לייצא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr "לא מוגדר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr "העלאת קובץ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr "לפני כחודש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr "מסננים מותאמים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr "סוג הכפתור:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr "מַסְנֵן מותאם אישית"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr "שכפל בסיס נתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr "שינוי סיסמה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr "הורדה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr "'%s' אינו בתצורת תאריך וזמן תקינה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr "קבוצה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr "בחירה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr "השדות הבאים אינם תקינים:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr "שפות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr "הצג את החודש הבא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr "ייבוא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr "העלאת קובץ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr "כפתור פעולה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr "ניהול מסננים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr "מכיל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr "טוען (%d)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr "קבץ לפי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr "קבע כברירת מחדל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr "יחס:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr "לפני פחות מדקה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr "בחר תאריך"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr "תנאי:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr "זמן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr "שוחזר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr "%d-%d מתוך %d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr "צור וערוך..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr "אינו"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr "אנא אשר את הסיסמא החדשה שלך"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr "תצורות ייצוא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr "רשימה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr "גדול מ־"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr "שנה סיסמא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr "שמור מסנן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr "סיסמה ישנה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr "החל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr "שמור וצור חדש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr "מחק תאריך נוכחי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr "שמירה בשם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr "צור בסיס נתונים חדש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr "לפני יום"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr "בלתי־מוגבל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr "חיפוש: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr "תרגום טכני"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr "מפריד:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr "שם המסנן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr "-- פעולות --"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr "הוסף"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr "הוסף..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr "העדפות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr "סגור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr "מחק קובץ מצורף זה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr "שמור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr "עוד"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr "שם משתמש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr "שעה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr "התחבר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr "מחק"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr "שמור רשימת שדות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr "התחל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr "תאריך יצירה:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr "תצוגה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr "חיפוש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr "<הקודם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr "גיבוי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr "לפני %d ימים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr "ביטול"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr "טוען..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr "שינוי אחרון על ידי:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr "אזור זמן לא תואם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr "הצג את החודש הקודם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr "שם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr "לפני %d חודשים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr "הוסף מסנן מתקדם"
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr "שחזר בסיס נתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr "התחבר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr "שחזר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr "סוג ייצוא:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr "התנתק"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr "קבץ לפי: %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr "הצג חודש אחר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr "ייצוא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr "ייצא לקובץ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr "עליך לבחור לפחות רשומה אחת."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr "חיפוש לא חוקי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr "הסר הכול"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr "שיטה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr "ערוך מידע על חברה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr "שמירה בשם..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr "עזרה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr "(%d רשומות)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr "שנה ברירת מחדל:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr "מתקדם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr "שווה ל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr "חיפוש מתקדם"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr "צור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr "לא מכיל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr "אפשרויות ייבוא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr "הוסף %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr "סגור מבלי לשמור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr "בחרו סיסמה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr "בחרו D, M d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr "קובץ CSV:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr "דקה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr "עץ"
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr "כל המשתמשים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr "חיפוש מתקדם..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr "כן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr "אי התאמה באזור זמן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr "גודל:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr "--- אל תייבא ---"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr "לפני %d שנים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr "שם בסיס הנתונים החדש:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr "הזן את הסיסמה החדשה שלך"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr "נהל תצוגות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr "קידוד:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr "צור \"<strong>%s</strong>\""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr "שדות זמינים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr "שמירה בשם:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr "מסנן על: %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr "צור: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr "בוצע"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr "צפה בשדות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr "אימות הסיסמה החדשה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr "האם אתם באמת רוצים להסיר רשומות אלו?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr "הקשר:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr "הוא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr "ייצוא נתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr "ברירת מחדל:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr "עצור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr "בסיס נתונים:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr "מעלה..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr "שם:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr "אודות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr "חפש שנית"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr "-- מסננים --"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr "ייצוא כל הנתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr "הגדר ברירת מחדל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr "הצג שנה אחרת"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr "שם המסנן:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr "סוג:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr "אובייקט:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr "טוען"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr "הצג את החודש הנוכחי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr "לפני כשנה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr "אינו שווה ל-"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr "נקה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr "לפני %d שעות"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr "הוסף: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr "הוספה מהירה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr "אישור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr "מעלה..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr "נוצר על ידי :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr "קובץ:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr "פחות מ-"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr "אזהרה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr "הוסף פריט"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr "שמור מסנן נוכחי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr "אשר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr "הורד \"%s\""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr "חדש"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr "אימות סיסמה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr "גדול או שווה ל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr "כפתור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr "אינו מוגדר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr "שתף עם משתמשים אחרים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr "ניהול בסיס נתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr "תמונה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr "או"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr "לא"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr "שכפל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr "בטל"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr "הוסף תנאי"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr "עדיין טוען..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr "פתח: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr "ערוך פעולה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr "מזהה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr "שדה:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr "שונה על ידי:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr "הדפס"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr "מיוחד:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr "האם אתה בטוח שאתה רוצה למחוק רשומה זאת?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr "שמור וסגור"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr "חפש עוד..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr "סיסמה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr "בחר זמן"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr "ערוך"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr "הסר"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr "בחר תאריך"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr "מחיקת קובץ זה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr "צור בסיס נתונים"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr "מפריד:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr "שנייה"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr "מסננים"

=== renamed file 'addons/web/i18n/he.po' => 'addons/web/i18n/he.po.moved'
=== modified file 'addons/web/i18n/hi.po'
--- addons/web/i18n/hi.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/hi.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/hr.po'
--- addons/web/i18n/hr.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/hr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/hu.po'
--- addons/web/i18n/hu.po	2014-05-23 08:22:13 +0000
+++ addons/web/i18n/hu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-23 08:22+0000\n"
 "X-Generator: Launchpad (build 17017)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/id.po'
--- addons/web/i18n/id.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/id.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/it.po'
--- addons/web/i18n/it.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/it.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/ja.po'
--- addons/web/i18n/ja.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ja.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/ka.po'
--- addons/web/i18n/ka.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ka.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== added file 'addons/web/i18n/ko.po'
--- addons/web/i18n/ko.po	1970-01-01 00:00:00 +0000
+++ addons/web/i18n/ko.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,2910 @@
+# Korean translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-05 14:40+0000\n"
+"Last-Translator: Lee SunSin <Unknown>\n"
+"Language-Team: Korean <ko@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:27+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr "기본 언어:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr "%d분 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr "로딩 중입니다...<br />기다려 주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr "%(field)s %(operator)s \"%(value)s\""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr "다음보다 작거나 같음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+"OpenERP 데이터베이스를 생성하기위해 이 폼을 채워주세요. \n"
+"다른 회사나 다른 목적으로 데이터베이스를 생성할 수있습니다. (테스트용, 운영서버용)\n"
+"데이터베이스가 생성된후에, 애플리케이션을 설치할 수 있습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr "마스터 비밀번호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr "마스터 비밀번호 변경하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr "오늘"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr "%s 데이터베이스를 삭제하시겠습니까?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr "다음 위치에서 %(field)s 검색: %(value)s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr "접근이 거부됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr "지금"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr "약 1시간 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr "Week of the year"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr "데이터베이스 백업"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr "%(view_type)s 화면"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr "'%s' 는 유효한 날짜가 아닙니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr "다음으로>"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr "다음은 불러올 수 없는 파일의 미리보기입니다:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr "기존 암호를 입력해 주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr "약 1분 전"
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr "비밀번호는 비워둘 수 없습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr "유효하지 않은 사용자명 또는 비밀번호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr "마스터 비밀번호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr "선택하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr "데이터베이스가 성공적으로 복구되었습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr "버전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr "최종 수정일:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr "M2O 검색 필드는 현재 다중 기본값을 처리하지 않습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr "'%s' 위젯 유형은 구현되지 않습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr "예) mycompany"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr "양식의 데이터는 폐기될 수 없습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr "폼"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr "(문자열 없음)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr "'%s' 은(는) 올바른 시간이 아닙니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr "유효한 숫자가 아님"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr "새 비밀번호:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr "첨부 파일 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr "내보낼 필드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr "정의되지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr "파일 업로드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr "약 한 달 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr "사용자 지정 필터"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr "버튼 유형:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr "OpenERP SA Company"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr "사용자 지정 필터"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr "중복 데이터베이스"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr "비밀번호 변경하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr "'%s' 화면 유형은 One2Many에서 지원되지 않습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr "원본 데이터베이스명:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr "다운로드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr "'%s'은(는) 올바른 datetime이 아닙니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr "그룹"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr "Wk"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr "처리되지 않은 위젯"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr "선택:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr "다음 필드는 유효하지 않습니다:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr "언어"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr "다음달 보기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr "...업로드가 진행 중입니다..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr "가져오기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr "데이터베이스를 복구할 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr "파일 업로드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr "액션 버튼"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr "필터 관리"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr "포함"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr "불러오는 중이오니<br />커피 한 잔 하시면서 기다려 주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr "개발자 모드 활성화"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr "(%d)을(를) 불러오는 중"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr "GroupBy"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr "최소한 하나의 기록을 선택해야 합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr "로그 보기 (perm_read)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr "기본 값 설정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr "관계:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr "1분 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr "날짜를 선택해주세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr "조건:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr "시간"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr "지원되지 않는 %s 작업자가  %s 도메인에 있음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr "'%s' 는 유효한 float 유형이 아닙니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr "복구됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr "%d의 %d-%d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr "생성 및 편집..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr "알 수 없는 비문자 유형 "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr "일치하지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr "업무 흐름 인쇄"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr "새 암호를 확정해 주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr "더 많은 정보를 원하시면 다음을 방문하세요 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr "모든 정보 추가..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr "내보내기 형식"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr "변경 시:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr "%s 모델 필드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr "설정됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr "기존 %s 기록에 'id' 속성 설정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr "목록"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr "다음보다 큼"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr "변경된 암호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr "필터 저장"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr "액션 ID:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr "기본 설정의 시간대가 브라우저 시간대와 일치하지 않습니다 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr "화면에서 지정된 '%s' 필드를 찾을 수 없습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr "저장된 내보내기 파일:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr "기존 암호:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr "바이트,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr "데이터베이스 사본이 생성되었습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr "적용"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr "저장 & 신규 생성"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr "현재날짜 지우기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr "다른 이름으로"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr "새 데이터베이스 생성하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr "1일 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr "데모 데이터 로드하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr "파일에 제목이 있습니까?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr "무한"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr "경고, 기록이 수정되었으며 변경사항이 제거됩니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr "찾기: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr "OpenERP를 테스트해보려면 이 박스를 체크하세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr "기술적 번역"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr "구획자:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr "브라우저의 시간대"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr "필터명"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr "-- 액션 --"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr "추가"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ".CSV 파일 불러오기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr "OpenERP.com"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr "유효하지 않은 이메일 주소로 이메일을 전송할 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr "추가..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr "환경 설정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr "Only export selection:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr "잘못된 형식 변경:  %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr "데이터베이스 중단"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr "닫기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr "여기를 클릭하여 사용자의 시간대를 변경하세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr "수정자:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr "해당 첨부 파일 삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr "저장"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr "더 보기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr "사용자명"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr "데이터베이스 복제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr "암호가 성공적으로 변경되었습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr "리소스 에러"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr "시간"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr "디버깅 화면#"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr "로그인"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr "삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr "나의 OpenERP.com 계정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"로컬 평가 실패\n"
+"%s\n"
+"\n"
+"%s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr "유효하지 않은 데이터베이스명"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr "필드 목록 저장"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr "시작"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr "(%s) 로그 보기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr "생성일:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr "오류, 암호가 변경되지 않음!"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr "선택된 파일은 %s인 최대 파일 크기를 초과했습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr "화면"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr "찾기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr "<이전으로"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr "첫번째 주의 일(日)자로 DD를 설정하기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+"기본값으로, 마스터 비밀번호는 'admin' 입니다. \n"
+"이 비밀번호는 데이터베이스를 생성및 복구하거나 덤프를 삭제할때 필요합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr "떠두기(백업)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr "'%s'은(는) 유효하지 않은 시간입니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr "'%s'은(는) 올바르지 않은 날짜입니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr "(nolabel)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr "%d 일 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr "(동일한 이름의 모든 기존 필터는 교체됩니다)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr "취소"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr "최근 수정자:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr "시간대 불일치"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr "알 수 없는 %s 작업자가 %s 도메인에 존재함"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr "이전 달(月 ) 보이기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr "2. 파일 형식을 확인하세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr "명칭"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+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 ""
+"불러올 .CSV 파일을 선택하세요. 불러올 파일 샘플이 필요할 경우,\n"
+"       내보내기 도구에서 \"호환 파일 불러오기\" 옵션을 사용해야 합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr "%d달 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr "삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr "고급 필터 추가"
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr "새 암호와 확정 암호는 동일해야 합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr "데이터베이스 복원"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr "로그인"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr "다음 조건에 따라 허가됨:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr "복원"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr "내보내기 유형:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr "로그아웃"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr "분류 기준: %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr "다른 달(月 ) 보이기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr "데이터가 제공되지 않음."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr "내보내기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr "파일로 내보내기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr "최소 한 개의 기록을 선택해야 합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr "잠시만 기다리세요.<br />아직 불러오는 중입니다..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr "유효하지 않은 검색"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr "데이터 세트에서 id를 찾을 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr "모두 삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+"OpenERP의 세션이 만료되었습니다. \r\n"
+"현재 웹페이지를 새로고침하여주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr "방식:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr "%(page)d/%(page_count)d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr "확정 암호가 일치하지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr "업체 데이터 편집"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr "다른 이름으로 저장..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr "선택한 이미지를 표시할 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr "데이터베이스가 성공적으로 백업됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr "CSV 파일이 다중 입력줄을 보유하고 있을 경우에 사용됨, 가져오기 작업 시 한 줄 이상 건너뜀."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr "99+"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr "도움말"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr "양식 레이아웃 개요 토글"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr "데이터베이스가 선택되지 않음 !"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr "(%d개의 기록)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr "기본 값 변경:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr "고급"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr "와 동일함"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr "XML을 직렬화할 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr "고급 검색"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr "새로운 마스터 암호 확정:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr "F5를 눌러 응용 프로그램을 다시 불러오는 것을 고려해보세요..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr "생성"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr "포함하지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr "가져오기 옵션"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr "%s 추가"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr "변경하지말고 닫기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr "비빌번호를 선택하세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr "D, M d 를 선택해주세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr "믿기시지 않겠지만<br />응용 프로그램을 실제로 불러오는 중입니다..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr "CSV 파일:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr "분"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr "트리"
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr "데이터베이스를 삭제할 수 없음 !"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr "'%s'은(는) 올바른 정수가 아닙니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr "모든 사용자"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr "알 수 없는 %s 필드가 %s 도메인에 존재함"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr "[%s] 노드는 JSON 처리된 XML 노드가 아닙니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr "고급 검색..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr "데이터 베이스 삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr "Powered by"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr "예"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr "시간대 불일치"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr "파일 업로드 중 문제가 발생했습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr "XML ID:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr "크기:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr "--- 가져오지 않기 ---"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr "가져오기-호환 파일 내보내기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr "%d년 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr "알 수 없는 %s m2m 명령"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr "기본 값 저장"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr "신규 데이터베이스명:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr "새 암호를 입력해주세요."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr "필드가 비어있을 경우, 저장할 것이 없습니다 !"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr "화면 관리"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr "이메일 에러"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr "암호화:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr "건너뛸 입력줄"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr "\"<strong>%s</strong>\" 생성"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr "내보내기 목록을 저장할 필드를 선택하세요..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr "Copyright © 2004-TODAY OpenERP SA. 모든 권리 보유."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr "해당 리소스는 비어있습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr "사용 가능한 필드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr "다음 사유로 인해 가져오기를 실패함:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr "JS 시험"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr "다른 이름으로 저장:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr "다음에 필터 적용: %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr "다음 생성: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr "완료되었습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr "필드 보기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr "새로운 암호 확인 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr "정말로 해당 기록을 제거하시겠습니까?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr "문맥:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr "같음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr "데이터 내보내기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr "도메인:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr "기본 값:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr "중단"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr "데이터베이스:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr "업로드 중 ..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr "명칭:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr "정보"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr "다시 검색"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr "-- 필터 --"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr "%(field)s %(operator)s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr "모든 데이터 내보내기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr "'%s' 필드는 목록 화면에 나타나지 않으므로 분류할 수 없습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr "기본 값 설정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+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 ""
+"해당 마법사는 현재 검색 조건과 일치하는 모든 데이터를 CSV 파일로 내보냅니다.\n"
+"            전체 데이터 또는 수정 후 다시 가져올 수 있는 필드만 내보낼 수 있습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr "데이터베이스에서 기록을 찾을 수 없습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr "다른 년도 보이기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr "필터명:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr "유형:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr "잘못된 슈퍼 관리자 암호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr "객체:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr "불러오는 중"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr "현재 월 보이기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr "약 1년 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr "동일하지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+"The type of the field '%s' 필드의 유형은 'ir.attachment' 모델과 관련된 many2many 필드여야 "
+"합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr "삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr "데이터베이스명을 선택해주세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr "%d 시간 전"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr "추가: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr "빠른 추가"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr "라틴어 1"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr "올려주기…"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr "생성자 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr "'%s'은(는) 유효한 datetime이 아닙니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr "파일:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr "미만"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr "경고"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr "검색 화면 편집"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr "참"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr "항목 추가"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr "현재 필터 저장"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr "확정"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr "저장 필드 목록명을 입력하세요"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr "\"%s\" 다운로드"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr "새로 만들기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr "%s 값을 문맥으로 변환할 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr "필드 화면 얻기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr "암호 확인:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr "이상"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr "버튼"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr "OpenERP은 다음 소유의 등록 상표입니다:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr "내보낼 필드를 선택하세요..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr "설정되지 않음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr "새로운 마스터 암호:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr "모든 사용자들과 공유"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr "거짓"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr "OpenERP 정보"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr "'%s'은(는) 올바른 날짜, 일시 또는 시간이 아닙니다"
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr "'%s:%s'의 '%s' 필드에서 내용을 찾을 수 없음"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr "데이터베이스 관리"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr "이미지"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr "데이터베이스 관리"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr "평가 오류"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr "유효하지 않은 정수"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr "또는"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr "아니오"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr "'%s'은(는) 날짜, 일시 또는 시간으로 변환할 수 없습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr "사본 생성"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr "무시"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr "업로드 에러"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr "조건 추가"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr "아직 불러오는 중..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr "%(fieldname)s 필드에 대한 잘못된 값: [%(value)s]은(는) %(message)s임"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr "o2m 기록은 액션을 사용하기 전에 저장되어야 합니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr "백업됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr "기본으로 사용"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr "열기: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr "검색 화면에서 촉발됨"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr "필터"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr "위젯:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr "액션 편집"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr "이 필터는 글로벌이며, 만약 계속한다면 모두에게 제거됩니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr "ID:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr "Only you"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr "작업 흐름 편집"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr "해당 첨부 파일을 정말로 삭제하시겠습니까?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr "기술적 번역"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr "필드:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr "수정자 :"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr "%s 데이터베이스를 삭제하였습니다"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr "사용자의 시간대"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr "클라이언트 오류"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr "인쇄"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr "특별:"
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr "제공된 오래된 암호가 잘못되었습니다, 암호가 변경되지 않았습니다."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr "생성 사용자:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr "정말로 이 기록을 삭제하시겠습니까?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr "로그인 화면으로 돌아가기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr "저장 & 닫기"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr "추가 검색..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr "암호"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr "Choose Time"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr "편집"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr "제거"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr "날짜 선택"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr "%(field)s에서 다음 검색: %(value)s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr "해당 파일 삭제"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr "데이터데이스 생성"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr "GNU Affero 일반 공개 라이선스"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr "구분자:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr "Second"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr "필터"
+
+#, python-format
+#~ msgid "Uploading error"
+#~ msgstr "업로드 오류"
+
+#, python-format
+#~ msgid "File"
+#~ msgstr "파일"
+
+#, python-format
+#~ msgid "Resource error"
+#~ msgstr "리소스 오류"
+
+#, python-format
+#~ msgid "E-mail error"
+#~ msgstr "이메일 오류"
+
+#, python-format
+#~ msgid "/web/binary/upload_attachment"
+#~ msgstr "/web/binary/upload_attachment"
+
+#, python-format
+#~ msgid "Admin password:"
+#~ msgstr "관리자 암호:"
+
+#, python-format
+#~ msgid "Load Demonstration data:"
+#~ msgstr "시연 데이터 불러오기:"

=== renamed file 'addons/web/i18n/ko.po' => 'addons/web/i18n/ko.po.moved'
=== modified file 'addons/web/i18n/lo.po'
--- addons/web/i18n/lo.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/lo.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/lt.po'
--- addons/web/i18n/lt.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/lt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== added file 'addons/web/i18n/lv.po'
--- addons/web/i18n/lv.po	1970-01-01 00:00:00 +0000
+++ addons/web/i18n/lv.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,2865 @@
+# Latvian translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-10-23 14:30+0000\n"
+"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@xxxxxxxxx>\n"
+"Language-Team: Latvian <lv@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr "Noklusējuma valoda:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr "pirms %d minūtēm"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr "Joprojām ielādē... <br />Lūdzu, esiet pacietīgi"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr "mazāks vai vienāds par"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr "Izmainīt galveno paroli"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr "Šodien"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr "Vai tiešam velties dzēst %s datubāzi ?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr "Piekļuve Liegta"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr "Tagad"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr "apmēram stundu atpakaļ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr "'%s' ir datums nepareizā formātā"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr "Lūdzu, ievadiet iepriekšējo paroli"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr "apmēram minūti atpakaļ"
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr "Nederīgs lietotājsvārds vai parole"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr "Galvenā parole:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr "Izvēlēties"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr "Versija"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr "Veidne"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr "Jaunā parole:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr "Lauki eksportam"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr "Nenoteikts"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr "apmēram mēnesi atpakaļ"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr "Mainīt paroli"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr "Lejupielādēt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr "Grupa"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr "Sekcijas"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr "Valodas"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr "Importēt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr "Pārvaldīt filtrus"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr "satur"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr "Ieladē (%d)"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr "Iestatīt kā noklusējumu"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr "Attiecība:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr "Izvēlēties datumu"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr "Nosacījums:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr "Laiks"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr "Atjaunots"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr "Izveidot un Rediģēt..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr "nav"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr "Drukāt darbplūsmu"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr "Ludzu apstipriniet jūsu jauno paroli"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr "UTF-8"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr "Lai iegūt vairāk informāciju, ejiet uz"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr "ir iestatīts"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr "Saraksts"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr "lielāks nekā"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr "Parole nomainīta"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr "Veca parole:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr "Pielietot"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr "Saglabāt kā"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr "Izveidot jaunu datu bāzi"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr "Neierobežots"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr "Meklēt: "
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr "Norobežotājs:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr "Filtra nosaukums"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr "Pievienot"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr "Pievienot..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr "Iestatījumi"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr "Aizvērt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr "Saglabāt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr "Vairāk"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr "Lietotājvārds"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr "Stunda"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr "Ienākt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr "Dzēst"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr "Sākt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr "Skatīt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr "Meklēt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr "Dublējums"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr "'%s' ir laiks nepareizā formātā"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr "pirms %d dienām"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr "Ielādē..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr "%d. no %d"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr ""

=== renamed file 'addons/web/i18n/lv.po' => 'addons/web/i18n/lv.po.moved'
=== modified file 'addons/web/i18n/mk.po'
--- addons/web/i18n/mk.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/mk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/mn.po'
--- addons/web/i18n/mn.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/mn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/nb.po'
--- addons/web/i18n/nb.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/nb.po	2014-06-12 12:31:56 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-21 11:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-11 00:23+0000\n"
+"Last-Translator: Kenneth Aalberg <kenneaal@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -58,8 +69,23 @@
 #. openerp-web
 #: code:addons/web/static/src/js/chrome.js:410
 #, python-format
+<<<<<<< TREE
 msgid "Please enter your previous password"
 msgstr "Skriv inn ditt gamle passord"
+=======
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+"Fyll inn dette skjemaet for å skape en OpenERP database.Du kan\n"
+"          lage databaser for forskjellige firmaer eller forskjellige\n"
+"          mål (Testing eller produksjon). Når databasen er skapt,\n"
+"          kan du installere din første applikasjon."
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -114,6 +140,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr "Ukenummer"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/controllers/main.py:811
 #: code:addons/web/static/src/js/chrome.js:536
 #: code:addons/web/static/src/xml/base.xml:234
@@ -220,6 +256,7 @@
 #: code:addons/web/static/src/js/view_form.js:1241
 #, python-format
 msgid "Widget type '%s' is not implemented"
+<<<<<<< TREE
 msgstr "Widget type '%s' er ikke implementert"
 
 #. module: web
@@ -228,6 +265,23 @@
 #, python-format
 msgid "Share with all users"
 msgstr "Del med alle brukere"
+=======
+msgstr "Widget type '%s' er ikke implementert"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr "f.eks mittfirma"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr "Skjemaets data kan ikke forkastes"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -359,6 +413,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr "Opprinnelig databasenavn:"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/view_form.js:5082
 #: code:addons/web/static/src/js/view_list.js:2204
 #, python-format
@@ -381,6 +445,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr "Uke"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:949
 #, python-format
 msgid "Unhandled widget"
@@ -408,6 +482,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr "Vis neste måned"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:1298
 #, python-format
 msgid "...Upload in progress..."
@@ -517,7 +601,18 @@
 #: code:addons/web/static/src/js/coresetup.js:590
 #, python-format
 msgid "less than a minute ago"
-msgstr "mindre enn ett minutt siden"
+<<<<<<< TREE
+msgstr "mindre enn ett minutt siden"
+=======
+msgstr "mindre enn ett minutt siden"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr "Velg en dato"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -528,6 +623,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr "Tid"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/view_form.js:1709
 #, python-format
 msgid "Unsupported operator %s in domain %s"
@@ -566,6 +671,7 @@
 #: code:addons/web/static/src/js/pyeval.js:736
 #, python-format
 msgid "Unknown nonliteral type "
+<<<<<<< TREE
 msgstr "Ukjent type "
 
 #. module: web
@@ -574,6 +680,9 @@
 #, python-format
 msgid "Resource error"
 msgstr ""
+=======
+msgstr "Ukjent type "
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -636,7 +745,22 @@
 #: code:addons/web/static/src/js/views.js:939
 #, python-format
 msgid "Model %s fields"
-msgstr "Modeller %s felt"
+<<<<<<< TREE
+msgstr "Modeller %s felt"
+=======
+msgstr "Modeller %s felt"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr "er satt"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -739,7 +863,18 @@
 #: code:addons/web/static/src/xml/base.xml:1414
 #, python-format
 msgid "Save & New"
-msgstr "Lagre & Ny"
+<<<<<<< TREE
+msgstr "Lagre & Ny"
+=======
+msgstr "Lagre & Ny"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr "Slett nåværende dato"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -751,6 +886,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr "Lag ny database"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/doc/module/static/src/xml/web_example.xml:3
 #, python-format
 msgid "00:00:00"
@@ -772,6 +917,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr "Last eksempeldata:"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:1810
 #, python-format
 msgid "Does your file have titles?"
@@ -806,6 +961,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr "Merk denne boksen for å evaluere OpenERP."
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:566
 #, python-format
 msgid "Technical translation"
@@ -882,7 +1047,18 @@
 #: code:addons/web/static/src/xml/base.xml:424
 #, python-format
 msgid "Preferences"
-msgstr "Brukervalg"
+<<<<<<< TREE
+msgstr "Brukervalg"
+=======
+msgstr "Brukervalg"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr "Eksporter kun utvalg:"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -961,10 +1137,24 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
 #: code:addons/web/static/src/js/view_list_editable.js:793
 #, python-format
 msgid "The form's data can not be discarded"
 msgstr "Skjemaets data kan ikke forkastes"
+=======
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr "Ressursfeil"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr "Time"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -991,6 +1181,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr "Min OpenERP.com konto"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/pyeval.js:774
 #, python-format
 msgid ""
@@ -1051,6 +1251,7 @@
 #: code:addons/web/static/src/js/view_form.js:4981
 #, python-format
 msgid "The selected file exceed the maximum file size of %s."
+<<<<<<< TREE
 msgstr "Den valgte filen har overskredet maks filstørrelse på %s."
 
 #. module: web
@@ -1066,6 +1267,17 @@
 #, python-format
 msgid "Changed Password"
 msgstr "Endret passord"
+=======
+msgstr "Den valgte filen har overskredet maks filstørrelse på %s."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr "Vis"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1076,6 +1288,7 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
 #: code:addons/web/static/src/js/view_form.js:3139
 #: code:addons/web/static/src/js/view_form.js:3785
 #: code:addons/web/static/src/js/view_form.js:3906
@@ -1084,6 +1297,31 @@
 #, python-format
 msgid "Open: "
 msgstr "Åpne: "
+=======
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr "<Forrige"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr "Set DD som første ukedag"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+"Hovedpassordet er etter installasjon 'admin'. Dette passordet\n"
+"                 kreves for å lage, slette, eksportere eller gjenopprette "
+"databaser."
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1167,7 +1405,18 @@
 #: code:addons/web/static/src/js/view_form.js:1663
 #, python-format
 msgid "Unknown operator %s in domain %s"
-msgstr "Ukjent operator %s i domene %s"
+<<<<<<< TREE
+msgstr "Ukjent operator %s i domene %s"
+=======
+msgstr "Ukjent operator %s i domene %s"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr "Vis forrige måned"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1284,6 +1533,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr "Vis en annen måned"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/view_form.js:154
 #, python-format
 msgid "No data provided."
@@ -1337,7 +1596,18 @@
 #: code:addons/web/static/src/xml/base.xml:1728
 #, python-format
 msgid "Remove All"
-msgstr "Fjern alle"
+<<<<<<< TREE
+msgstr "Fjern alle"
+=======
+msgstr "Fjern alle"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr "Din OpenERP-sesjon har utløpt. Vennligst last inn nettsiden på nytt."
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1408,10 +1678,24 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
 #: code:addons/web/static/src/xml/base.xml:1795
 #, python-format
 msgid "1. Import a .CSV file"
 msgstr "Importer en .CSV fil"
+=======
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr "Hjelp"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr "Skru av/på skjema layout utlinjer"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1513,6 +1797,7 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
 #: code:addons/web/static/src/xml/base.xml:145
 #, python-format
 msgid "Admin password:"
@@ -1526,6 +1811,26 @@
 #, python-format
 msgid "Close"
 msgstr "Lukk"
+=======
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr "Lukk uten endringer"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr "Velg et passord:"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr "Velg D, M d"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1548,8 +1853,13 @@
 #. openerp-web
 #: code:addons/web/static/src/js/search.js:1879
 #, python-format
+<<<<<<< TREE
 msgid "Advanced"
 msgstr "Avansert"
+=======
+msgid "Minute"
+msgstr "Minutt"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1624,6 +1934,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr "Tidssoner samsvarer ikke"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/view_form.js:5002
 #, python-format
 msgid "There was a problem while uploading your file"
@@ -1705,7 +2025,18 @@
 #: code:addons/web/static/src/xml/base.xml:567
 #, python-format
 msgid "Manage Views"
-msgstr "Administrer visninger"
+<<<<<<< TREE
+msgstr "Administrer visninger"
+=======
+msgstr "Administrer visninger"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr "Epost feil"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1795,6 +2126,17 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr "Ferdig"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:562
 #, python-format
 msgid "View Fields"
@@ -1916,8 +2258,13 @@
 #: code:addons/web/static/src/xml/base.xml:1258
 #: code:addons/web/static/src/xml/base.xml:1260
 #, python-format
+<<<<<<< TREE
 msgid "Clear"
 msgstr "Tøm"
+=======
+msgid "%(field)s %(operator)s"
+msgstr "%(field)s %(operator)s"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -1964,7 +2311,18 @@
 #: code:addons/web/static/src/js/view_form.js:320
 #, python-format
 msgid "The record could not be found in the database."
-msgstr "Posten ble ikke funnet i databasen."
+<<<<<<< TREE
+msgstr "Posten ble ikke funnet i databasen."
+=======
+msgstr "Posten ble ikke funnet i databasen."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr "Vis et annet år"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -2004,6 +2362,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr "Vis nåværende måned"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/js/coresetup.js:599
 #, python-format
 msgid "about a year ago"
@@ -2027,8 +2395,29 @@
 "The type of the field '%s' must be a many2many field with a relation to "
 "'ir.attachment' model."
 msgstr ""
-"Felttypen '%s' må være et mange-til-mange felt med relasjon til "
-"'ir.attachment' modellen."
+<<<<<<< TREE
+"Felttypen '%s' må være et mange-til-mange felt med relasjon til "
+"'ir.attachment' modellen."
+=======
+"Felttypen '%s' må være et mange-til-mange felt med relasjon til "
+"'ir.attachment' modellen."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr "Tøm"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr "Velg et databasenavn:"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -2231,7 +2620,22 @@
 #: code:addons/web/static/src/js/data_export.js:375
 #, python-format
 msgid "Please select fields to export..."
-msgstr "Velg felt for eksportering..."
+<<<<<<< TREE
+msgstr "Velg felt for eksportering..."
+=======
+msgstr "Velg felt for eksportering..."
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr "er ikke satt"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -2348,6 +2752,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr "Feil under opplasting"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:1642
 #, python-format
 msgid "Add a condition"
@@ -2425,6 +2839,18 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+"Dette filteret er globalt, og vil bli slettet for alle dersom du fortsetter."
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:577
 #, python-format
 msgid "ID:"
@@ -2527,7 +2953,18 @@
 #: code:addons/web/static/src/js/view_form.js:769
 #, python-format
 msgid "Do you really want to delete this record?"
-msgstr "Vil du virkelig slette denne posten ?"
+<<<<<<< TREE
+msgstr "Vil du virkelig slette denne posten ?"
+=======
+msgstr "Vil du virkelig slette denne posten ?"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr "Tilbake til innlogging"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -2553,6 +2990,16 @@
 
 #. module: web
 #. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr "Velg tid"
+
+#. module: web
+#. openerp-web
+>>>>>>> MERGE-SOURCE
 #: code:addons/web/static/src/xml/base.xml:568
 #: code:addons/web/static/src/xml/base.xml:831
 #: code:addons/web/static/src/xml/base.xml:1206
@@ -2614,8 +3061,13 @@
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:318
 #, python-format
+<<<<<<< TREE
 msgid "Back to Login"
 msgstr "Tilbake til innlogging"
+=======
+msgid "Second"
+msgstr "Sekund"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web
@@ -2623,6 +3075,7 @@
 #: code:addons/web/static/src/xml/base.xml:1480
 #, python-format
 msgid "Filters"
+<<<<<<< TREE
 msgstr "Filter"
 
 #~ msgid "Dont send"
@@ -2785,3 +3238,26 @@
 
 #~ msgid "Add condition"
 #~ msgstr "Legg til betingelse"
+=======
+msgstr "Filter"
+
+#, python-format
+#~ msgid "Load Demonstration data:"
+#~ msgstr "Last demonstrasjonsdata:"
+
+#, python-format
+#~ msgid "Uploading error"
+#~ msgstr "Feil ved opplasting"
+
+#, python-format
+#~ msgid "File"
+#~ msgstr "Fil"
+
+#, python-format
+#~ msgid "/web/binary/upload_attachment"
+#~ msgstr "/web/binary/upload_attachment"
+
+#, python-format
+#~ msgid "Admin password:"
+#~ msgstr "Administrator passord:"
+>>>>>>> MERGE-SOURCE

=== modified file 'addons/web/i18n/nl.po'
--- addons/web/i18n/nl.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/nl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:52+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/nl_BE.po'
--- addons/web/i18n/nl_BE.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/nl_BE.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/pl.po'
--- addons/web/i18n/pl.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/pl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/pt.po'
--- addons/web/i18n/pt.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/pt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/pt_BR.po'
--- addons/web/i18n/pt_BR.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/pt_BR.po	2014-06-12 12:31:56 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/ro.po'
--- addons/web/i18n/ro.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ro.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/ru.po'
--- addons/web/i18n/ru.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/ru.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/sk.po'
--- addons/web/i18n/sk.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/sk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/sl.po'
--- addons/web/i18n/sl.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/sl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/sq.po'
--- addons/web/i18n/sq.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/sq.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:51+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/sr@xxxxxxxx'
--- addons/web/i18n/sr@xxxxxxxx	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/sr@xxxxxxxx	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/sv.po'
--- addons/web/i18n/sv.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/sv.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/th.po'
--- addons/web/i18n/th.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/th.po	2014-06-12 12:31:56 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-12-12 05:20+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-03 16:39+0000\n"
+"Last-Translator: Nirun Tungketmukda <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Thai <th@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/tr.po'
--- addons/web/i18n/tr.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/tr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/uk.po'
--- addons/web/i18n/uk.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/uk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:53+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== added file 'addons/web/i18n/vi.po'
--- addons/web/i18n/vi.po	1970-01-01 00:00:00 +0000
+++ addons/web/i18n/vi.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,2865 @@
+# Vietnamese translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-07-29 08:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:147
+#, python-format
+msgid "Default language:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:592
+#, python-format
+msgid "%d minutes ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:620
+#, python-format
+msgid "Still loading...<br />Please be patient."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1999
+#, python-format
+msgid "%(field)s %(operator)s \"%(value)s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2061
+#: code:addons/web/static/src/js/search.js:2097
+#: code:addons/web/static/src/js/search.js:2124
+#, python-format
+msgid "less or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:114
+#, python-format
+msgid ""
+"Fill in this form to create an OpenERP database. You can\n"
+"                    create databases for different companies or for "
+"different\n"
+"                    goals (testing, production). Once the database is "
+"created,\n"
+"                    you will be able to install your first application."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:126
+#: code:addons/web/static/src/xml/base.xml:185
+#: code:addons/web/static/src/xml/base.xml:300
+#, python-format
+msgid "Master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:292
+#, python-format
+msgid "Change Master Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2439
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:513
+#, python-format
+msgid "Do you really want to delete the database: %s ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1502
+#, python-format
+msgid "Search %(field)s at: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:559
+#, python-format
+msgid "Access Denied"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2462
+#, python-format
+msgid "Now"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:593
+#, python-format
+msgid "about an hour ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2446
+#, python-format
+msgid "Week of the year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:811
+#: code:addons/web/static/src/js/chrome.js:536
+#: code:addons/web/static/src/xml/base.xml:234
+#, python-format
+msgid "Backup Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:518
+#, python-format
+msgid "%(view_type)s view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:49
+#: code:addons/web/static/src/js/dates.js:53
+#, python-format
+msgid "'%s' is not a valid date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2437
+#, python-format
+msgid "Next>"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1858
+#, python-format
+msgid "Here is a preview of the file we could not import:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:410
+#, python-format
+msgid "Please enter your previous password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:591
+#, python-format
+msgid "about a minute ago"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:869
+#, python-format
+msgid "You cannot leave any password empty."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:732
+#, python-format
+msgid "Invalid username or password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:224
+#: code:addons/web/static/src/xml/base.xml:256
+#: code:addons/web/static/src/xml/base.xml:278
+#, python-format
+msgid "Master Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1245
+#: code:addons/web/static/src/xml/base.xml:1402
+#, python-format
+msgid "Select"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Database restored successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:437
+#, python-format
+msgid "Version"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:592
+#, python-format
+msgid "Latest Modification Date:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1566
+#, python-format
+msgid "M2O search fields do not currently handle multiple default values"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1241
+#, python-format
+msgid "Widget type '%s' is not implemented"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:134
+#, python-format
+msgid "e.g. mycompany"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list_editable.js:793
+#, python-format
+msgid "The form's data can not be discarded"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:77
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "Form"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1352
+#, python-format
+msgid "(no string)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:286
+#, python-format
+msgid "'%s' is not a correct time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1401
+#, python-format
+msgid "not a valid number"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:343
+#, python-format
+msgid "New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:632
+#, python-format
+msgid "Attachment :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1712
+#, python-format
+msgid "Fields to export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1350
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "File Upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:597
+#, python-format
+msgid "about a month ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1618
+#, python-format
+msgid "Custom Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1364
+#, python-format
+msgid "Button Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:441
+#, python-format
+msgid "OpenERP SA Company"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1663
+#, python-format
+msgid "Custom Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:177
+#, python-format
+msgid "Duplicate Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:832
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:869
+#: code:addons/web/controllers/main.py:871
+#: code:addons/web/controllers/main.py:877
+#: code:addons/web/controllers/main.py:878
+#: code:addons/web/static/src/js/chrome.js:823
+#: code:addons/web/static/src/xml/base.xml:294
+#: code:addons/web/static/src/xml/base.xml:354
+#, python-format
+msgid "Change Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3528
+#, python-format
+msgid "View type '%s' is not supported in One2Many."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:189
+#, python-format
+msgid "Original database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5082
+#: code:addons/web/static/src/js/view_list.js:2204
+#, python-format
+msgid "Download"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:270
+#, python-format
+msgid "'%s' is not a correct datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:432
+#, python-format
+msgid "Group"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2445
+#, python-format
+msgid "Wk"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:949
+#, python-format
+msgid "Unhandled widget"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1004
+#, python-format
+msgid "Selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:881
+#, python-format
+msgid "The following fields are invalid:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:890
+#, python-format
+msgid "Languages"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2438
+#, python-format
+msgid "Show the next month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1298
+#, python-format
+msgid "...Upload in progress..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1789
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:565
+#, python-format
+msgid "Could not restore the database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4982
+#, python-format
+msgid "File upload"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3925
+#, python-format
+msgid "Action Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:564
+#: code:addons/web/static/src/xml/base.xml:1493
+#, python-format
+msgid "Manage Filters"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2042
+#, python-format
+msgid "contains"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:623
+#, python-format
+msgid "Take a minute to get a coffee,<br />because it's loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:435
+#, python-format
+msgid "Activate the developer mode"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:341
+#, python-format
+msgid "Loading (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1216
+#, python-format
+msgid "GroupBy"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#, python-format
+msgid "You must select at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:557
+#, python-format
+msgid "View Log (perm_read)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1071
+#, python-format
+msgid "Set Default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1000
+#, python-format
+msgid "Relation:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:590
+#, python-format
+msgid "less than a minute ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2453
+#, python-format
+msgid "Select a date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:873
+#, python-format
+msgid "Condition:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2458
+#, python-format
+msgid "Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1709
+#, python-format
+msgid "Unsupported operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:246
+#, python-format
+msgid "'%s' is not a correct float"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:571
+#, python-format
+msgid "Restored"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:409
+#, python-format
+msgid "%d-%d of %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2955
+#, python-format
+msgid "Create and Edit..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:736
+#, python-format
+msgid "Unknown nonliteral type "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2144
+#, python-format
+msgid "is not"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:572
+#, python-format
+msgid "Print Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:413
+#, python-format
+msgid "Please confirm your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1825
+#, python-format
+msgid "UTF-8"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "For more information visit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1880
+#, python-format
+msgid "Add All Info..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1701
+#, python-format
+msgid "Export Formats"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:996
+#, python-format
+msgid "On change:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:939
+#, python-format
+msgid "Model %s fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2046
+#: code:addons/web/static/src/js/search.js:2062
+#: code:addons/web/static/src/js/search.js:2098
+#: code:addons/web/static/src/js/search.js:2125
+#: code:addons/web/static/src/js/search.js:2145
+#, python-format
+msgid "is set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:906
+#, python-format
+msgid "Setting 'id' attribute on existing record %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:8
+#, python-format
+msgid "List"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2058
+#: code:addons/web/static/src/js/search.js:2094
+#: code:addons/web/static/src/js/search.js:2121
+#, python-format
+msgid "greater than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Changed Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1492
+#, python-format
+msgid "Save Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1372
+#, python-format
+msgid "Action ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:479
+#, python-format
+msgid "Your user's preference timezone does not match your browser timezone:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1237
+#, python-format
+msgid "Field '%s' specified in view could not be found."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1777
+#, python-format
+msgid "Saved exports:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:338
+#, python-format
+msgid "Old Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:113
+#, python-format
+msgid "Bytes,Kb,Mb,Gb,Tb,Pb,Eb,Zb,Yb"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "The database has been duplicated."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1643
+#, python-format
+msgid "Apply"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1414
+#, python-format
+msgid "Save & New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2432
+#, python-format
+msgid "Erase the current date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1251
+#: code:addons/web/static/src/xml/base.xml:1253
+#, python-format
+msgid "Save As"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:109
+#, python-format
+msgid "Create a New Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:3
+#, python-format
+msgid "00:00:00"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:595
+#, python-format
+msgid "a day ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:138
+#, python-format
+msgid "Load demonstration data:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1810
+#, python-format
+msgid "Does your file have titles?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:327
+#, python-format
+msgid "Unlimited"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:788
+#, python-format
+msgid ""
+"Warning, the record has been modified, your changes will be discarded.\n"
+"\n"
+"Are you sure you want to leave this page ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#, python-format
+msgid "Search: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:141
+#, python-format
+msgid "Check this box to evaluate OpenERP."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:566
+#, python-format
+msgid "Technical translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1818
+#, python-format
+msgid "Delimiter:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:484
+#, python-format
+msgid "Browser's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1623
+#, python-format
+msgid "Filter name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1490
+#, python-format
+msgid "-- Actions --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4262
+#: code:addons/web/static/src/js/view_form.js:4423
+#: code:addons/web/static/src/xml/base.xml:1435
+#: code:addons/web/static/src/xml/base.xml:1726
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1795
+#, python-format
+msgid "1. Import a .CSV file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:443
+#, python-format
+msgid "OpenERP.com"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "Can't send email to invalid e-mail address"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:658
+#, python-format
+msgid "Add..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:424
+#, python-format
+msgid "Preferences"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1704
+#, python-format
+msgid "Only export selection:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:435
+#, python-format
+msgid "Wrong on change format: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/controllers/main.py:793
+#: code:addons/web/static/src/xml/base.xml:203
+#, python-format
+msgid "Drop Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:30
+#: code:addons/web/static/src/js/view_form.js:1077
+#: code:addons/web/static/src/xml/base.xml:1422
+#, python-format
+msgid "Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:488
+#, python-format
+msgid "Click here to change your user's timezone."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:988
+#, python-format
+msgid "Modifiers:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:649
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:796
+#: code:addons/web/static/src/xml/base.xml:837
+#: code:addons/web/static/src/xml/base.xml:1410
+#: code:addons/web/static/src/xml/base.xml:1630
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1074
+#: code:addons/web/static/src/xml/base.xml:370
+#, python-format
+msgid "More"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:73
+#, python-format
+msgid "Username"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:503
+#, python-format
+msgid "Duplicating database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:585
+#, python-format
+msgid "Password has been changed successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "Resource Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2459
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:555
+#, python-format
+msgid "Debug View#"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:77
+#, python-format
+msgid "Log in"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:199
+#: code:addons/web/static/src/js/view_list.js:346
+#: code:addons/web/static/src/xml/base.xml:1785
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:425
+#, python-format
+msgid "My OpenERP.com account"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:774
+#, python-format
+msgid ""
+"Local evaluation failure\n"
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:367
+#, python-format
+msgid "Invalid database name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1714
+#, python-format
+msgid "Save fields list"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:5
+#, python-format
+msgid "Start"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:897
+#, python-format
+msgid "View Log (%s)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:586
+#, python-format
+msgid "Creation Date:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:833
+#: code:addons/web/controllers/main.py:878
+#, python-format
+msgid "Error, password not changed !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4981
+#, python-format
+msgid "The selected file exceed the maximum file size of %s."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:568
+#, python-format
+msgid "View"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2435
+#, python-format
+msgid "<Prev"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2450
+#, python-format
+msgid "Set DD as first week day"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:120
+#, python-format
+msgid ""
+"By default, the master password is 'admin'. This password\n"
+"                    is required to created, delete dump or restore databases."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:236
+#: code:addons/web/static/src/xml/base.xml:327
+#, python-format
+msgid "Backup"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:76
+#: code:addons/web/static/src/js/dates.js:80
+#, python-format
+msgid "'%s' is not a valid time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:278
+#, python-format
+msgid "'%s' is not a correct date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:955
+#, python-format
+msgid "(nolabel)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:596
+#, python-format
+msgid "%d days ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1500
+#, python-format
+msgid "(Any existing filter with the same name will be replaced)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1936
+#: code:addons/web/static/src/xml/base.xml:356
+#: code:addons/web/static/src/xml/base.xml:1405
+#: code:addons/web/static/src/xml/base.xml:1881
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:672
+#: code:addons/web/static/src/js/coresetup.js:618
+#: code:addons/web/static/src/xml/base.xml:9
+#, python-format
+msgid "Loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:589
+#, python-format
+msgid "Latest Modification by:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:492
+#, python-format
+msgid "Timezone mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1663
+#, python-format
+msgid "Unknown operator %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2436
+#, python-format
+msgid "Show the previous month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:427
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1803
+#, python-format
+msgid "2. Check your file format"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1739
+#, python-format
+msgid "Name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1796
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:598
+#, python-format
+msgid "%d months ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:205
+#: code:addons/web/static/src/xml/base.xml:326
+#, python-format
+msgid "Drop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1491
+#, python-format
+msgid "Add Advanced Filter"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:871
+#, python-format
+msgid "The new password and its confirmation must be identical."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:564
+#: code:addons/web/static/src/xml/base.xml:266
+#, python-format
+msgid "Restore Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "Licenced under the terms of"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:268
+#: code:addons/web/static/src/xml/base.xml:328
+#, python-format
+msgid "Restore"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1695
+#, python-format
+msgid "Export Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:428
+#, python-format
+msgid "Log out"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1192
+#, python-format
+msgid "Group by: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2443
+#, python-format
+msgid "Show a different month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:154
+#, python-format
+msgid "No data provided."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:345
+#: code:addons/web/static/src/xml/base.xml:1683
+#, python-format
+msgid "Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:31
+#, python-format
+msgid "Export To File"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "You must choose at least one record."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:621
+#, python-format
+msgid "Don't leave yet,<br />it's still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "Invalid Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:990
+#, python-format
+msgid "Could not find id in dataset"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1728
+#, python-format
+msgid "Remove All"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:253
+#, python-format
+msgid "Your OpenERP session expired. Please refresh the current web page."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1368
+#, python-format
+msgid "Method:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1449
+#, python-format
+msgid "%(page)d/%(page_count)d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:414
+#, python-format
+msgid "The confirmation does not match the password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:463
+#, python-format
+msgid "Edit Company data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "Save As..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Could not display the selected image."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Database backed up successfully"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid ""
+"For use if CSV files have titles on multiple lines, skips more than a single "
+"line during import"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:414
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:427
+#, python-format
+msgid "Help"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:558
+#, python-format
+msgid "Toggle Form Layout Outline"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:702
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:184
+#, python-format
+msgid "(%d records)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Change default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1879
+#, python-format
+msgid "Advanced"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2044
+#: code:addons/web/static/src/js/search.js:2056
+#: code:addons/web/static/src/js/search.js:2092
+#: code:addons/web/static/src/js/search.js:2119
+#, python-format
+msgid "is equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1581
+#, python-format
+msgid "Could not serialize XML"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1637
+#, python-format
+msgid "Advanced Search"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:308
+#, python-format
+msgid "Confirm new master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:624
+#, python-format
+msgid "Maybe you should consider reloading the application by pressing F5..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:17
+#: code:addons/web/static/src/js/view_list.js:2258
+#: code:addons/web/static/src/xml/base.xml:324
+#: code:addons/web/static/src/xml/base.xml:834
+#: code:addons/web/static/src/xml/base.xml:1404
+#, python-format
+msgid "Create"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2043
+#, python-format
+msgid "doesn't contain"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1806
+#, python-format
+msgid "Import Options"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3023
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2434
+#, python-format
+msgid "Close without change"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:159
+#, python-format
+msgid "Choose a password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2451
+#, python-format
+msgid "Select D, M d"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:622
+#, python-format
+msgid ""
+"You may not believe it,<br />but the application is actually loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1800
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2460
+#, python-format
+msgid "Minute"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_tree.js:11
+#, python-format
+msgid "Tree"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:793
+#, python-format
+msgid "Could not drop database !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:231
+#, python-format
+msgid "'%s' is not a correct integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:899
+#, python-format
+msgid "All users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1671
+#, python-format
+msgid "Unknown field %s in domain %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1546
+#, python-format
+msgid "Node [%s] is not a JSONified XML node"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1454
+#, python-format
+msgid "Advanced Search..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "Dropping database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:467
+#, python-format
+msgid "Powered by"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1484
+#: code:addons/web/static/src/xml/base.xml:992
+#, python-format
+msgid "Yes"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1350
+#, python-format
+msgid "Timezone Mismatch"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5002
+#, python-format
+msgid "There was a problem while uploading your file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:580
+#, python-format
+msgid "XML ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:976
+#, python-format
+msgid "Size:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1845
+#, python-format
+msgid "--- Don't Import ---"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1697
+#, python-format
+msgid "Import-Compatible Export"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:600
+#, python-format
+msgid "%d years ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1050
+#, python-format
+msgid "Unknown m2m command %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1078
+#, python-format
+msgid "Save default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:193
+#: code:addons/web/static/src/xml/base.xml:282
+#, python-format
+msgid "New database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:411
+#, python-format
+msgid "Please enter your new password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5017
+#, python-format
+msgid "The field is empty, there's nothing to save !"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:567
+#, python-format
+msgid "Manage Views"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2349
+#, python-format
+msgid "E-mail Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1822
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1829
+#, python-format
+msgid "Lines to skip"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2945
+#, python-format
+msgid "Create \"<strong>%s</strong>\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:362
+#, python-format
+msgid "Please select fields to save export list..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2379
+#, python-format
+msgid "This resource is empty"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1710
+#, python-format
+msgid "Available fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1856
+#, python-format
+msgid "The import failed due to:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:886
+#: code:addons/web/static/src/xml/base.xml:561
+#, python-format
+msgid "JS Tests"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1771
+#, python-format
+msgid "Save as:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1024
+#, python-format
+msgid "Filter on: %s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2991
+#: code:addons/web/static/src/js/view_form.js:3878
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2433
+#: code:addons/web/static/src/js/view_form.js:2463
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:562
+#, python-format
+msgid "View Fields"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:348
+#, python-format
+msgid "Confirm New Password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:587
+#, python-format
+msgid "Do you really want to remove these records?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:980
+#, python-format
+msgid "Context:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2114
+#: code:addons/web/static/src/js/search.js:2143
+#, python-format
+msgid "is"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:6
+#, python-format
+msgid "Export Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:984
+#, python-format
+msgid "Domain:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:856
+#, python-format
+msgid "Default:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:82
+#: code:addons/web/static/src/xml/base.xml:468
+#, python-format
+msgid "OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/doc/module/static/src/xml/web_example.xml:8
+#, python-format
+msgid "Stop"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:68
+#: code:addons/web/static/src/xml/base.xml:211
+#: code:addons/web/static/src/xml/base.xml:243
+#, python-format
+msgid "Database:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1211
+#: code:addons/web/static/src/xml/base.xml:1268
+#, python-format
+msgid "Uploading ..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1874
+#, python-format
+msgid "Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:1165
+#, python-format
+msgid "About"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1457
+#, python-format
+msgid "Search Again"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1481
+#, python-format
+msgid "-- Filters --"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1998
+#: code:addons/web/static/src/js/search.js:2165
+#, python-format
+msgid "%(field)s %(operator)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1698
+#, python-format
+msgid "Export all Data"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1344
+#, python-format
+msgid ""
+"Grouping on field '%s' is not possible because that field does not appear in "
+"the list view."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:559
+#, python-format
+msgid "Set Defaults"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1688
+#, python-format
+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 ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:320
+#, python-format
+msgid "The record could not be found in the database."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2444
+#, python-format
+msgid "Show a different year"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1498
+#, python-format
+msgid "Filter Name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:968
+#, python-format
+msgid "Type:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:560
+#, python-format
+msgid "Incorrect super-administrator password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:964
+#, python-format
+msgid "Object:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:309
+#: code:addons/web/static/src/js/chrome.js:343
+#, python-format
+msgid "Loading"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2440
+#, python-format
+msgid "Show the current month"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:599
+#, python-format
+msgid "about a year ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2045
+#: code:addons/web/static/src/js/search.js:2057
+#: code:addons/web/static/src/js/search.js:2093
+#: code:addons/web/static/src/js/search.js:2120
+#, python-format
+msgid "is not equal to"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5167
+#, python-format
+msgid ""
+"The type of the field '%s' must be a many2many field with a relation to "
+"'ir.attachment' model."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2431
+#: code:addons/web/static/src/xml/base.xml:1258
+#: code:addons/web/static/src/xml/base.xml:1260
+#, python-format
+msgid "Clear"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:132
+#, python-format
+msgid "Select a database name:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:594
+#, python-format
+msgid "%d hours ago"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4334
+#: code:addons/web/static/src/js/view_form.js:4464
+#, python-format
+msgid "Add: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1879
+#, python-format
+msgid "Quick Add"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1826
+#, python-format
+msgid "Latin 1"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:277
+#: code:addons/web/static/src/js/chrome.js:286
+#: code:addons/web/static/src/js/chrome.js:466
+#: code:addons/web/static/src/js/chrome.js:847
+#: code:addons/web/static/src/js/view_form.js:575
+#: code:addons/web/static/src/js/view_form.js:1940
+#: code:addons/web/static/src/xml/base.xml:1773
+#, python-format
+msgid "Ok"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1237
+#, python-format
+msgid "Uploading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:637
+#, python-format
+msgid "Created by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/dates.js:22
+#: code:addons/web/static/src/js/dates.js:26
+#, python-format
+msgid "'%s' is not a valid datetime"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:274
+#, python-format
+msgid "File:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2059
+#: code:addons/web/static/src/js/search.js:2095
+#: code:addons/web/static/src/js/search.js:2122
+#, python-format
+msgid "less than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:699
+#: code:addons/web/static/src/js/views.js:1172
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:569
+#, python-format
+msgid "Edit SearchView"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2160
+#, python-format
+msgid "is true"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:4030
+#, python-format
+msgid "Add an item"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1621
+#, python-format
+msgid "Save current filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:1933
+#, python-format
+msgid "Confirm"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:127
+#, python-format
+msgid "Please enter save field list name"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:2216
+#, python-format
+msgid "Download \"%s\""
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:325
+#, python-format
+msgid "New"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1777
+#, python-format
+msgid "Can't convert value %s to context"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:881
+#: code:addons/web/static/src/xml/base.xml:563
+#, python-format
+msgid "Fields View Get"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:163
+#, python-format
+msgid "Confirm password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2060
+#: code:addons/web/static/src/js/search.js:2096
+#: code:addons/web/static/src/js/search.js:2123
+#, python-format
+msgid "greater or equal than"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1349
+#, python-format
+msgid "Button"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:440
+#, python-format
+msgid "OpenERP is a trademark of the"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/data_export.js:375
+#, python-format
+msgid "Please select fields to export..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2047
+#: code:addons/web/static/src/js/search.js:2063
+#: code:addons/web/static/src/js/search.js:2099
+#: code:addons/web/static/src/js/search.js:2126
+#: code:addons/web/static/src/js/search.js:2146
+#, python-format
+msgid "is not set"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:304
+#, python-format
+msgid "New master password:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1626
+#, python-format
+msgid "Share with all users"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:2161
+#, python-format
+msgid "is false"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:426
+#, python-format
+msgid "About OpenERP"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:301
+#, python-format
+msgid "'%s' is not a correct date, datetime nor time"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:1307
+#, python-format
+msgid "No content found for field '%s' on '%s:%s'"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:322
+#, python-format
+msgid "Database Management"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5138
+#, python-format
+msgid "Image"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:81
+#, python-format
+msgid "Manage Databases"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/pyeval.js:770
+#, python-format
+msgid "Evaluation Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1387
+#, python-format
+msgid "not a valid integer"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:355
+#: code:addons/web/static/src/xml/base.xml:798
+#: code:addons/web/static/src/xml/base.xml:838
+#: code:addons/web/static/src/xml/base.xml:1404
+#: code:addons/web/static/src/xml/base.xml:1412
+#: code:addons/web/static/src/xml/base.xml:1648
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1485
+#, python-format
+msgid "No"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/formats.js:313
+#, python-format
+msgid "'%s' is not convertible to date, datetime nor time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:200
+#: code:addons/web/static/src/xml/base.xml:179
+#: code:addons/web/static/src/xml/base.xml:325
+#, python-format
+msgid "Duplicate"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:799
+#: code:addons/web/static/src/xml/base.xml:839
+#: code:addons/web/static/src/xml/base.xml:1419
+#, python-format
+msgid "Discard"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:5314
+#, python-format
+msgid "Uploading Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1642
+#, python-format
+msgid "Add a condition"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/coresetup.js:619
+#, python-format
+msgid "Still loading..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:884
+#, python-format
+msgid "Incorrect value for field %(fieldname)s: [%(value)s] is %(message)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3926
+#, python-format
+msgid "The o2m record must be saved before an action can be used"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:531
+#, python-format
+msgid "Backed"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1628
+#, python-format
+msgid "Use by default"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:3139
+#: code:addons/web/static/src/js/view_form.js:3785
+#: code:addons/web/static/src/js/view_form.js:3906
+#: code:addons/web/static/src/js/view_form.js:4358
+#: code:addons/web/static/src/js/view_form.js:4482
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_list.js:1358
+#, python-format
+msgid "%s (%d)"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:841
+#, python-format
+msgid "triggered from search view"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1079
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:972
+#, python-format
+msgid "Widget:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:570
+#, python-format
+msgid "Edit Action"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1681
+#, python-format
+msgid ""
+"This filter is global and will be removed for everybody if you continue."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:577
+#, python-format
+msgid "ID:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:892
+#, python-format
+msgid "Only you"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:571
+#, python-format
+msgid "Edit Workflow"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1246
+#, python-format
+msgid "Do you really want to delete this attachment ?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:914
+#, python-format
+msgid "Technical Translation"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:960
+#, python-format
+msgid "Field:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:642
+#, python-format
+msgid "Modified by :"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:521
+#, python-format
+msgid "The database %s has been dropped"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:482
+#, python-format
+msgid "User's timezone"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/chrome.js:301
+#: code:addons/web/static/src/js/chrome.js:1276
+#, python-format
+msgid "Client Error"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/views.js:1073
+#, python-format
+msgid "Print"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1359
+#, python-format
+msgid "Special:"
+msgstr ""
+
+#. module: web
+#: code:addons/web/controllers/main.py:877
+#, python-format
+msgid ""
+"The old password you provided is incorrect, your password was not changed."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:583
+#, python-format
+msgid "Creation User:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:769
+#, python-format
+msgid "Do you really want to delete this record?"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:318
+#, python-format
+msgid "Back to Login"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1413
+#, python-format
+msgid "Save & Close"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2932
+#, python-format
+msgid "Search More..."
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:75
+#: code:addons/web/static/src/xml/base.xml:329
+#, python-format
+msgid "Password"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2457
+#, python-format
+msgid "Choose Time"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:568
+#: code:addons/web/static/src/xml/base.xml:831
+#: code:addons/web/static/src/xml/base.xml:1206
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1727
+#, python-format
+msgid "Remove"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1090
+#, python-format
+msgid "Select date"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:1351
+#: code:addons/web/static/src/js/search.js:1369
+#, python-format
+msgid "Search %(field)s for: %(value)s"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1305
+#, python-format
+msgid "Delete this file"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:168
+#, python-format
+msgid "Create Database"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:442
+#, python-format
+msgid "GNU Affero General Public License"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/xml/base.xml:1816
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/view_form.js:2461
+#, python-format
+msgid "Second"
+msgstr ""
+
+#. module: web
+#. openerp-web
+#: code:addons/web/static/src/js/search.js:616
+#: code:addons/web/static/src/xml/base.xml:1480
+#, python-format
+msgid "Filters"
+msgstr ""

=== renamed file 'addons/web/i18n/vi.po' => 'addons/web/i18n/vi.po.moved'
=== modified file 'addons/web/i18n/zh_CN.po'
--- addons/web/i18n/zh_CN.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/zh_CN.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/i18n/zh_TW.po'
--- addons/web/i18n/zh_TW.po	2014-05-14 05:55:34 +0000
+++ addons/web/i18n/zh_TW.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web
 #. openerp-web

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/js/view_form.js	2014-06-12 12:31:56 +0000
@@ -2323,14 +2323,15 @@
     },
     render_value: function() {
         var show_value = this.format_value(this.get('value'), '');
-        if (!this.get("effective_readonly")) {
-            this.$el.find('input').val(show_value);
-        } else {
+        if (this.get("effective_readonly")) {
             if (this.password) {
                 show_value = new Array(show_value.length + 1).join('*');
             }
-            this.$(".oe_form_char_content").text(show_value);
+            if (this.get("effective_invisible") && this.get("readonly") && !this.get("invisible") && this.name != "sequence") {
+                this.set({"effective_invisible": false});
+            }
         }
+        this.$el.find('input').val(show_value);
     },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly") && this.$("input").size() > 0) {

=== modified file 'addons/web/static/src/js/views.js'
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-05-08 15:34:18 +0000
+++ addons/web/static/src/xml/base.xml	2014-06-12 12:31:56 +0000
@@ -1025,7 +1025,14 @@
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </t>
         <t t-if="widget.get('effective_readonly')">
-            <span class="oe_form_char_content"></span>
+            <input t-att-type="widget.password ? 'password' : 'text'"
+                t-att-id="widget.id_for_label"
+                t-att-tabindex="widget.node.attrs.tabindex"
+                t-att-autofocus="widget.node.attrs.autofocus"
+                t-att-placeholder="widget.node.attrs.placeholder"
+                t-att-maxlength="widget.field.size"
+                disabled="disabled"
+            />
         </t>
     </span>
 </t>
@@ -1099,7 +1106,15 @@
             />            
         </t>
         <t t-if="widget.get('effective_readonly')">
-            <span class="oe_form_text_content"></span>
+            <textarea rows="6"
+                t-att-name="widget.name"
+                class="field_text"
+                t-att-tabindex="widget.node.attrs.tabindex"
+                t-att-autofocus="widget.node.attrs.autofocus"
+                t-att-placeholder="! widget.get('effective_readonly') ? widget.node.attrs.placeholder : ''"
+                t-att-maxlength="widget.field.size"
+                disabled="disabled"
+            />
         </t>
     </div>
 </t>

=== added file 'addons/web_api/i18n/cs.po.OTHER'
--- addons/web_api/i18n/cs.po.OTHER	1970-01-01 00:00:00 +0000
+++ addons/web_api/i18n/cs.po.OTHER	2014-06-12 12:31:56 +0000
@@ -0,0 +1,20 @@
+# Czech translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-02 09:06+0200\n"
+"PO-Revision-Date: 2013-03-30 19:14+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Czech <cs@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+

=== modified file 'addons/web_api/i18n/es_CR.po'
--- addons/web_api/i18n/es_CR.po	2014-04-15 13:09:51 +0000
+++ addons/web_api/i18n/es_CR.po	2014-06-12 12:31:56 +0000
@@ -14,7 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-08-15 04:50+0000\n"
 "X-Generator: Launchpad (build 15801)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 

=== modified file 'addons/web_calendar/i18n/ar.po'
--- addons/web_calendar/i18n/ar.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ar.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/bg.po'
--- addons/web_calendar/i18n/bg.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/bg.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/bn.po'
--- addons/web_calendar/i18n/bn.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/bn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/bs.po'
--- addons/web_calendar/i18n/bs.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/bs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/ca.po'
--- addons/web_calendar/i18n/ca.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ca.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/cs.po'
--- addons/web_calendar/i18n/cs.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/cs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 "X-Poedit-Language: Czech\n"
 
 #. module: web_calendar

=== modified file 'addons/web_calendar/i18n/da.po'
--- addons/web_calendar/i18n/da.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/da.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/de.po'
--- addons/web_calendar/i18n/de.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/de.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/en_AU.po'
--- addons/web_calendar/i18n/en_AU.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/en_AU.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/en_GB.po'
--- addons/web_calendar/i18n/en_GB.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/en_GB.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/es.po'
--- addons/web_calendar/i18n/es.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== added file 'addons/web_calendar/i18n/es_AR.po'
--- addons/web_calendar/i18n/es_AR.po	1970-01-01 00:00:00 +0000
+++ addons/web_calendar/i18n/es_AR.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,225 @@
+# Spanish (Argentina) translation for openerp-web
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-06-10 16:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-11 06:33+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr "Nuevo evento"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr "Detalles"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr "Guardar"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr "La vista calendario tiene un tipo 'date_delay' != float"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr "Hoy"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr "Semana"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr "Todo el día"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr "Descripción"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr "El evento será borrado permanentemente, ¿está seguro?"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr "&nbsp;"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr "Fecha"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr "Editar"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr "Habilitado"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "¿Quiere editar todo el conjunto de eventos repetidos?"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr "Filtro"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr "Repetir evento"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr "Agenda"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr "Período de tiempo"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr "Suprimir"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr "Mes"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr "Año"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr "Calendario"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr "La vista calendario no tiene definido el atributo 'date_start'"
+
+#, python-format
+#~ msgid "Edit: "
+#~ msgstr "Editar: "
+
+#, python-format
+#~ msgid "Create: "
+#~ msgstr "Crear: "

=== renamed file 'addons/web_calendar/i18n/es_AR.po' => 'addons/web_calendar/i18n/es_AR.po.moved'
=== modified file 'addons/web_calendar/i18n/es_CL.po'
--- addons/web_calendar/i18n/es_CL.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es_CL.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/es_CR.po'
--- addons/web_calendar/i18n/es_CR.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es_CR.po	2014-06-12 12:31:56 +0000
@@ -15,9 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 "Language: es\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/es_DO.po'
--- addons/web_calendar/i18n/es_DO.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es_DO.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/es_EC.po'
--- addons/web_calendar/i18n/es_EC.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es_EC.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/es_MX.po'
--- addons/web_calendar/i18n/es_MX.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/es_MX.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== added file 'addons/web_calendar/i18n/es_PE.po'
--- addons/web_calendar/i18n/es_PE.po	1970-01-01 00:00:00 +0000
+++ addons/web_calendar/i18n/es_PE.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,217 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 15:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr ""

=== renamed file 'addons/web_calendar/i18n/es_PE.po' => 'addons/web_calendar/i18n/es_PE.po.moved'
=== modified file 'addons/web_calendar/i18n/et.po'
--- addons/web_calendar/i18n/et.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/et.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/eu.po'
--- addons/web_calendar/i18n/eu.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/eu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/fa.po'
--- addons/web_calendar/i18n/fa.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/fa.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/fi.po'
--- addons/web_calendar/i18n/fi.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/fi.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/fr.po'
--- addons/web_calendar/i18n/fr.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/fr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/fr_CA.po'
--- addons/web_calendar/i18n/fr_CA.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/fr_CA.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/gl.po'
--- addons/web_calendar/i18n/gl.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/gl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/gu.po'
--- addons/web_calendar/i18n/gu.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/gu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/hr.po'
--- addons/web_calendar/i18n/hr.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/hr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/hu.po'
--- addons/web_calendar/i18n/hu.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/hu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/id.po'
--- addons/web_calendar/i18n/id.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/id.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/it.po'
--- addons/web_calendar/i18n/it.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/it.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/ja.po'
--- addons/web_calendar/i18n/ja.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ja.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/ka.po'
--- addons/web_calendar/i18n/ka.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ka.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== added file 'addons/web_calendar/i18n/ko.po'
--- addons/web_calendar/i18n/ko.po	1970-01-01 00:00:00 +0000
+++ addons/web_calendar/i18n/ko.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,225 @@
+# Korean translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-02-26 07:11+0000\n"
+"Last-Translator: Josh Kim <joshkkim@xxxxxxxxx>\n"
+"Language-Team: Korean <ko@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr "신규 이벤트"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr "상세 내용"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr "저장"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr "달력 화면에 'date_delay'유형의 != 플로트가 있습니다"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr "오늘"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr "주"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr "하루 종일"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr "설명"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr "이벤트가 영구 삭제될 것입니다. 확실하십니까?"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr "&nbsp;"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr "날짜"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr "일"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr "편집"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr "활성화 됨"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "반복 이벤트의 전체 세트를 편집하시겠습니까?"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr "필터"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr "이벤트 반복"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr "의제"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr "시한"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr "삭제"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr "월"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr "비활성화 됨"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr "년도"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr "취소"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr "달력"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr "달력 화면이 'date_start' 속성을 정의하지 않았습니다."
+
+#, python-format
+#~ msgid "Edit: "
+#~ msgstr "편집: "
+
+#, python-format
+#~ msgid "Create: "
+#~ msgstr "생성: "

=== renamed file 'addons/web_calendar/i18n/ko.po' => 'addons/web_calendar/i18n/ko.po.moved'
=== modified file 'addons/web_calendar/i18n/lt.po'
--- addons/web_calendar/i18n/lt.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/lt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/mk.po'
--- addons/web_calendar/i18n/mk.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/mk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/mn.po'
--- addons/web_calendar/i18n/mn.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/mn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/nb.po'
--- addons/web_calendar/i18n/nb.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/nb.po	2014-06-12 12:31:56 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openerp-web\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:06+0000\n"
 "PO-Revision-Date: 2012-03-28 13:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-11 00:27+0000\n"
+"Last-Translator: Jakob Aresvik <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web
@@ -151,7 +162,18 @@
 #: code:addons/web_calendar/static/src/js/calendar.js:188
 #, python-format
 msgid "Agenda"
-msgstr "Saksliste"
+<<<<<<< TREE
+msgstr "Saksliste"
+=======
+msgstr "Saksliste"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr "Opprett: %s"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web
@@ -214,7 +236,11 @@
 #: code:addons/web_calendar/static/src/js/calendar.js:101
 #, python-format
 msgid "Calendar view has not defined 'date_start' attribute."
+<<<<<<< TREE
 msgstr "'date_start' attributt er ikke definert i kalendervisning."
 
 #~ msgid "Navigator"
 #~ msgstr "Navigator"
+=======
+msgstr "'date_start' attributt er ikke definert i kalendervisning."
+>>>>>>> MERGE-SOURCE

=== modified file 'addons/web_calendar/i18n/nl.po'
--- addons/web_calendar/i18n/nl.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/nl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/nl_BE.po'
--- addons/web_calendar/i18n/nl_BE.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/nl_BE.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/pl.po'
--- addons/web_calendar/i18n/pl.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/pl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/pt.po'
--- addons/web_calendar/i18n/pt.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/pt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/pt_BR.po'
--- addons/web_calendar/i18n/pt_BR.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/pt_BR.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/ro.po'
--- addons/web_calendar/i18n/ro.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ro.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/ru.po'
--- addons/web_calendar/i18n/ru.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/ru.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/sk.po'
--- addons/web_calendar/i18n/sk.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/sk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/sl.po'
--- addons/web_calendar/i18n/sl.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/sl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/sq.po'
--- addons/web_calendar/i18n/sq.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/sq.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/sr@xxxxxxxx'
--- addons/web_calendar/i18n/sr@xxxxxxxx	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/sr@xxxxxxxx	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/sv.po'
--- addons/web_calendar/i18n/sv.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/sv.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== added file 'addons/web_calendar/i18n/th.po'
--- addons/web_calendar/i18n/th.po	1970-01-01 00:00:00 +0000
+++ addons/web_calendar/i18n/th.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,217 @@
+# Thai translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-02-04 07:27+0000\n"
+"Last-Translator: bravoland <Unknown>\n"
+"Language-Team: Thai <th@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr "กิจกรรมใหม่"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr "รายละเอียด"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr "แก้ไข: %s"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr "บันทึก"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr "วันนี้"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr "สัปดาห์"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr "เต็มวัน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr "รายละเอียด"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr "คุณมั่นใจ? เหตุการณ์จะถูกลบออกอย่างถาวร"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr "&nbsp;"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr "วันที่"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr "วัน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr "แก้ไข"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr "เปิดใช้งาน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr "คุณต้องการที่จะแก้ไขกิจกรรมที่จะเกิดขึ้นซ้ำในอนาคตด้วยหรือไม่?"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr "ตัวกรอง"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr "ทำซ้ำกิจกรรม"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr "กำหนดการ"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr "สร้าง: %s"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr "ระยะเวลา"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr "ลบ"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr "เดือน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr "ปิดการใช้งาน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr "ปี"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr "ปฏิทิน"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr "มุมมองปฏิทินยังไม่ได้กำหนด 'date_start'"

=== renamed file 'addons/web_calendar/i18n/th.po' => 'addons/web_calendar/i18n/th.po.moved'
=== modified file 'addons/web_calendar/i18n/tr.po'
--- addons/web_calendar/i18n/tr.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/tr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/uk.po'
--- addons/web_calendar/i18n/uk.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/uk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== modified file 'addons/web_calendar/i18n/zh_CN.po'
--- addons/web_calendar/i18n/zh_CN.po	2014-05-14 05:55:34 +0000
+++ addons/web_calendar/i18n/zh_CN.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_calendar
 #. openerp-web

=== added file 'addons/web_calendar/i18n/zh_TW.po'
--- addons/web_calendar/i18n/zh_TW.po	1970-01-01 00:00:00 +0000
+++ addons/web_calendar/i18n/zh_TW.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,217 @@
+# Chinese (Traditional) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-09-27 09:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:161
+#, python-format
+msgid "New event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:164
+#, python-format
+msgid "Details"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:512
+#, python-format
+msgid "Edit: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:162
+#, python-format
+msgid "Save"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:109
+#, python-format
+msgid "Calendar view has a 'date_delay' type != float"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:157
+#, python-format
+msgid "Today"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:159
+#, python-format
+msgid "Week"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:171
+#, python-format
+msgid "Full day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:169
+#: code:addons/web_calendar/static/src/js/calendar.js:182
+#, python-format
+msgid "Description"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:168
+#, python-format
+msgid "Event will be deleted permanently, are you sure?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:8
+#: code:addons/web_calendar/static/src/xml/web_calendar.xml:9
+#, python-format
+msgid "&nbsp;"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:181
+#, python-format
+msgid "Date"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:158
+#, python-format
+msgid "Day"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:165
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:177
+#, python-format
+msgid "Enabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:174
+#, python-format
+msgid "Do you want to edit the whole set of repeated events?"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:90
+#, python-format
+msgid "Filter"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:175
+#, python-format
+msgid "Repeat event"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:180
+#: code:addons/web_calendar/static/src/js/calendar.js:188
+#, python-format
+msgid "Agenda"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:475
+#, python-format
+msgid "Create: %s"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:170
+#, python-format
+msgid "Time period"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:166
+#, python-format
+msgid "Delete"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:160
+#, python-format
+msgid "Month"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:176
+#, python-format
+msgid "Disabled"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:185
+#, python-format
+msgid "Year"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:163
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:36
+#, python-format
+msgid "Calendar"
+msgstr ""
+
+#. module: web_calendar
+#. openerp-web
+#: code:addons/web_calendar/static/src/js/calendar.js:101
+#, python-format
+msgid "Calendar view has not defined 'date_start' attribute."
+msgstr ""

=== renamed file 'addons/web_calendar/i18n/zh_TW.po' => 'addons/web_calendar/i18n/zh_TW.po.moved'
=== modified file 'addons/web_diagram/i18n/ar.po'
--- addons/web_diagram/i18n/ar.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ar.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/bg.po'
--- addons/web_diagram/i18n/bg.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/bg.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/bn.po'
--- addons/web_diagram/i18n/bn.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/bn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/bs.po'
--- addons/web_diagram/i18n/bs.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/bs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/ca.po'
--- addons/web_diagram/i18n/ca.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ca.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/cs.po'
--- addons/web_diagram/i18n/cs.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/cs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 "X-Poedit-Language: Czech\n"
 
 #. module: web_diagram

=== modified file 'addons/web_diagram/i18n/da.po'
--- addons/web_diagram/i18n/da.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/da.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/de.po'
--- addons/web_diagram/i18n/de.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/de.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/en_AU.po'
--- addons/web_diagram/i18n/en_AU.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/en_AU.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/en_GB.po'
--- addons/web_diagram/i18n/en_GB.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/en_GB.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/es.po'
--- addons/web_diagram/i18n/es.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/es_AR.po'
--- addons/web_diagram/i18n/es_AR.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/es_AR.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,106 @@
+# Spanish (Argentina) translation for openerp-web
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-06-10 15:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-11 06:33+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr "Abrir: "
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"La eliminación de este nodo no puede ser deshecha.\n"
+"También eliminará todas las transiciones conectadas.\n"
+"\n"
+"¿Está seguro?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr "Nuevo Nodo"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr "Transición"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr "Diagrama"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr "Actividad"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr "Crear:"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"La eliminación de esta transición no se puede deshacer.\n"
+"\n"
+"¿Está seguro?"

=== renamed file 'addons/web_diagram/i18n/es_AR.po' => 'addons/web_diagram/i18n/es_AR.po.moved'
=== modified file 'addons/web_diagram/i18n/es_CL.po'
--- addons/web_diagram/i18n/es_CL.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es_CL.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/es_CR.po'
--- addons/web_diagram/i18n/es_CR.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es_CR.po	2014-06-12 12:31:56 +0000
@@ -15,9 +15,14 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
 "Language: es\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/es_DO.po'
--- addons/web_diagram/i18n/es_DO.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es_DO.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/es_EC.po'
--- addons/web_diagram/i18n/es_EC.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es_EC.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/es_MX.po'
--- addons/web_diagram/i18n/es_MX.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/es_MX.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/es_PE.po'
--- addons/web_diagram/i18n/es_PE.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/es_PE.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,99 @@
+# Spanish (Peru) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-10 16:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Peru) <es_PE@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""

=== renamed file 'addons/web_diagram/i18n/es_PE.po' => 'addons/web_diagram/i18n/es_PE.po.moved'
=== modified file 'addons/web_diagram/i18n/et.po'
--- addons/web_diagram/i18n/et.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/et.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/fa.po'
--- addons/web_diagram/i18n/fa.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/fa.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/fi.po'
--- addons/web_diagram/i18n/fi.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/fi.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/fr.po'
--- addons/web_diagram/i18n/fr.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/fr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/gl.po'
--- addons/web_diagram/i18n/gl.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/gl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/gu.po'
--- addons/web_diagram/i18n/gu.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/gu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/hr.po'
--- addons/web_diagram/i18n/hr.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/hr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/hu.po'
--- addons/web_diagram/i18n/hu.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/hu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/id.po'
--- addons/web_diagram/i18n/id.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/id.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/it.po'
--- addons/web_diagram/i18n/it.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/it.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/ja.po'
--- addons/web_diagram/i18n/ja.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ja.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/ka.po'
--- addons/web_diagram/i18n/ka.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ka.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/ko.po'
--- addons/web_diagram/i18n/ko.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/ko.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,106 @@
+# Korean translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-02-26 07:09+0000\n"
+"Last-Translator: Josh Kim <joshkkim@xxxxxxxxx>\n"
+"Language-Team: Korean <ko@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr "열기: "
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"해당 노드를 삭제하는 작업은 복구할 수 없습니다.\n"
+"또한 모든 연결된 전환을 삭제할 것입니다.\n"
+"\n"
+"확실하십니까?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr "신규 노드"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr "전환"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr "도표"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr "활동"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr "생성:"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr "확실하십니까?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"해당 전환을 삭제하는 작업은 복구할 수 없습니다.\n"
+"\n"
+"확실하십니까 ?"

=== renamed file 'addons/web_diagram/i18n/ko.po' => 'addons/web_diagram/i18n/ko.po.moved'
=== modified file 'addons/web_diagram/i18n/lt.po'
--- addons/web_diagram/i18n/lt.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/lt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/mk.po'
--- addons/web_diagram/i18n/mk.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/mk.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,106 @@
+# Macedonian translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-03-08 17:42+0000\n"
+"Last-Translator: Ivica Dimitrijev <palifra@xxxxxxxxx>\n"
+"Language-Team: Macedonian <mk@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr "Отвори: "
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Избришаниот јазол не може да се врати.\n"
+"Ова ќе ги избрише сите поврзани премини.\n"
+"\n"
+"Дали си сигурен ?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr "Нов јазол"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr "Премин"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr "Дијаграм"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr "Активност"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr "Креирај:"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr "Дали си сигурен?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Избришаната транзиција не може да се врати.\n"
+"\n"
+"Дали си сигурен ?"

=== renamed file 'addons/web_diagram/i18n/mk.po' => 'addons/web_diagram/i18n/mk.po.moved'
=== modified file 'addons/web_diagram/i18n/mn.po'
--- addons/web_diagram/i18n/mn.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/mn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/nb.po'
--- addons/web_diagram/i18n/nb.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/nb.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,106 @@
+# Norwegian Bokmal translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-05-11 00:29+0000\n"
+"Last-Translator: Jakob Aresvik <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-11 07:08+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr "Åpne: "
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Når denne noden er slettet kan den ikke gjenopprettes.\n"
+"Alle tilkoblede overganger vil også bli slettet.\n"
+"\n"
+"Er du sikker?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr "Ny node"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr "Overgang"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr "Diagram"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr "Aktivitet"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr "Opprett:"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr "Er du sikker?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"Når denne overgangen slettes, kan den ikke gjenopprettes.\n"
+"\n"
+"Er du sikker?"

=== renamed file 'addons/web_diagram/i18n/nb.po' => 'addons/web_diagram/i18n/nb.po.moved'
=== modified file 'addons/web_diagram/i18n/nl.po'
--- addons/web_diagram/i18n/nl.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/nl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/nl_BE.po'
--- addons/web_diagram/i18n/nl_BE.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/nl_BE.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/pl.po'
--- addons/web_diagram/i18n/pl.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/pl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/pt.po'
--- addons/web_diagram/i18n/pt.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/pt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/pt_BR.po'
--- addons/web_diagram/i18n/pt_BR.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/pt_BR.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/ro.po'
--- addons/web_diagram/i18n/ro.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ro.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/ru.po'
--- addons/web_diagram/i18n/ru.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/ru.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/sl.po'
--- addons/web_diagram/i18n/sl.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/sl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/sq.po'
--- addons/web_diagram/i18n/sq.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/sq.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/sr@xxxxxxxx'
--- addons/web_diagram/i18n/sr@xxxxxxxx	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/sr@xxxxxxxx	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/sv.po'
--- addons/web_diagram/i18n/sv.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/sv.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/th.po'
--- addons/web_diagram/i18n/th.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/th.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,106 @@
+# Thai translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-06-19 16:04+0000\n"
+"Last-Translator: Sumonchai ( เหลา ) <sumonchai@xxxxxxxxx>\n"
+"Language-Team: Thai <th@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr "เปิด: "
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"กำลังลบโหนดนี้ จะไม่สามารถเรียกคืนได้.\n"
+"นอกจากนี้ยังจะลบการเปลี่ยนการเชื่อมต่อทั้งหมด.\n"
+"\n"
+"คุณแน่ใจหรือไม่ ?"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr "สร้างโหนดใหม่"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr "การเปลี่ยน"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr "ไดอะแกรม"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr "กิจกรรม"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr "%d / %d"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr "สร้าง"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr "คุณแน่ใจหรือไม่"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+"การลบการเปลี่ยนแปลงนี้ไม่สามารถยกเลิกได้.\n"
+"\n"
+"คุณแน่ใจหรือไม่ ?"

=== renamed file 'addons/web_diagram/i18n/th.po' => 'addons/web_diagram/i18n/th.po.moved'
=== modified file 'addons/web_diagram/i18n/tr.po'
--- addons/web_diagram/i18n/tr.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/tr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== modified file 'addons/web_diagram/i18n/zh_CN.po'
--- addons/web_diagram/i18n/zh_CN.po	2014-05-14 05:55:34 +0000
+++ addons/web_diagram/i18n/zh_CN.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_diagram
 #. openerp-web

=== added file 'addons/web_diagram/i18n/zh_TW.po'
--- addons/web_diagram/i18n/zh_TW.po	1970-01-01 00:00:00 +0000
+++ addons/web_diagram/i18n/zh_TW.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,99 @@
+# Chinese (Traditional) translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-05-31 06:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:252
+#: code:addons/web_diagram/static/src/js/diagram.js:317
+#, python-format
+msgid "Open: "
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:215
+#, python-format
+msgid ""
+"Deleting this node cannot be undone.\n"
+"It will also delete all connected transitions.\n"
+"\n"
+"Are you sure ?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/xml/base_diagram.xml:13
+#, python-format
+msgid "New Node"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:310
+#: code:addons/web_diagram/static/src/js/diagram.js:329
+#, python-format
+msgid "Transition"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:11
+#, python-format
+msgid "Diagram"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:244
+#: code:addons/web_diagram/static/src/js/diagram.js:278
+#, python-format
+msgid "Activity"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:420
+#, python-format
+msgid "%d / %d"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:283
+#: code:addons/web_diagram/static/src/js/diagram.js:335
+#, python-format
+msgid "Create:"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:185
+#, python-format
+msgid "Are you sure?"
+msgstr ""
+
+#. module: web_diagram
+#. openerp-web
+#: code:addons/web_diagram/static/src/js/diagram.js:233
+#, python-format
+msgid ""
+"Deleting this transition cannot be undone.\n"
+"\n"
+"Are you sure ?"
+msgstr ""

=== renamed file 'addons/web_diagram/i18n/zh_TW.po' => 'addons/web_diagram/i18n/zh_TW.po.moved'
=== modified file 'addons/web_gantt/i18n/ar.po'
--- addons/web_gantt/i18n/ar.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ar.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/bg.po'
--- addons/web_gantt/i18n/bg.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/bg.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/bn.po'
--- addons/web_gantt/i18n/bn.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/bn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/bs.po'
--- addons/web_gantt/i18n/bs.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/bs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/ca.po'
--- addons/web_gantt/i18n/ca.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ca.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/cs.po'
--- addons/web_gantt/i18n/cs.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/cs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 "X-Poedit-Language: Czech\n"
 
 #. module: web_gantt

=== modified file 'addons/web_gantt/i18n/da.po'
--- addons/web_gantt/i18n/da.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/da.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/de.po'
--- addons/web_gantt/i18n/de.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/de.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/en_AU.po'
--- addons/web_gantt/i18n/en_AU.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/en_AU.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/en_GB.po'
--- addons/web_gantt/i18n/en_GB.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/en_GB.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/es.po'
--- addons/web_gantt/i18n/es.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== added file 'addons/web_gantt/i18n/es_AR.po'
--- addons/web_gantt/i18n/es_AR.po	1970-01-01 00:00:00 +0000
+++ addons/web_gantt/i18n/es_AR.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,32 @@
+# Spanish (Argentina) translation for openerp-web
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-06-10 15:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-11 06:33+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/xml/web_gantt.xml:10
+#, python-format
+msgid "Create"
+msgstr "Crear"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/js/gantt.js:11
+#, python-format
+msgid "Gantt"
+msgstr "Gantt"

=== renamed file 'addons/web_gantt/i18n/es_AR.po' => 'addons/web_gantt/i18n/es_AR.po.moved'
=== modified file 'addons/web_gantt/i18n/es_CL.po'
--- addons/web_gantt/i18n/es_CL.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es_CL.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/es_CR.po'
--- addons/web_gantt/i18n/es_CR.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es_CR.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/es_DO.po'
--- addons/web_gantt/i18n/es_DO.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es_DO.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/es_EC.po'
--- addons/web_gantt/i18n/es_EC.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es_EC.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/es_MX.po'
--- addons/web_gantt/i18n/es_MX.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/es_MX.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/et.po'
--- addons/web_gantt/i18n/et.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/et.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/fa.po'
--- addons/web_gantt/i18n/fa.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/fa.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/fi.po'
--- addons/web_gantt/i18n/fi.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/fi.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/fr.po'
--- addons/web_gantt/i18n/fr.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/fr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/gl.po'
--- addons/web_gantt/i18n/gl.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/gl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/gu.po'
--- addons/web_gantt/i18n/gu.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/gu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== added file 'addons/web_gantt/i18n/he.po'
--- addons/web_gantt/i18n/he.po	1970-01-01 00:00:00 +0000
+++ addons/web_gantt/i18n/he.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,32 @@
+# Hebrew translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-12-30 18:09+0000\n"
+"Last-Translator: Amir Elion <Unknown>\n"
+"Language-Team: Hebrew <he@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/xml/web_gantt.xml:10
+#, python-format
+msgid "Create"
+msgstr "צור"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/js/gantt.js:11
+#, python-format
+msgid "Gantt"
+msgstr "גאנט"

=== renamed file 'addons/web_gantt/i18n/he.po' => 'addons/web_gantt/i18n/he.po.moved'
=== modified file 'addons/web_gantt/i18n/hr.po'
--- addons/web_gantt/i18n/hr.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/hr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/hu.po'
--- addons/web_gantt/i18n/hu.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/hu.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/it.po'
--- addons/web_gantt/i18n/it.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/it.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/ja.po'
--- addons/web_gantt/i18n/ja.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ja.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/ka.po'
--- addons/web_gantt/i18n/ka.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ka.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== added file 'addons/web_gantt/i18n/ko.po'
--- addons/web_gantt/i18n/ko.po	1970-01-01 00:00:00 +0000
+++ addons/web_gantt/i18n/ko.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,32 @@
+# Korean translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-02-26 06:02+0000\n"
+"Last-Translator: Josh Kim <joshkkim@xxxxxxxxx>\n"
+"Language-Team: Korean <ko@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/xml/web_gantt.xml:10
+#, python-format
+msgid "Create"
+msgstr "생성"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/js/gantt.js:11
+#, python-format
+msgid "Gantt"
+msgstr "간트"

=== renamed file 'addons/web_gantt/i18n/ko.po' => 'addons/web_gantt/i18n/ko.po.moved'
=== modified file 'addons/web_gantt/i18n/lo.po'
--- addons/web_gantt/i18n/lo.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/lo.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/lt.po'
--- addons/web_gantt/i18n/lt.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/lt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/mk.po'
--- addons/web_gantt/i18n/mk.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/mk.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/mn.po'
--- addons/web_gantt/i18n/mn.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/mn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/nb.po'
--- addons/web_gantt/i18n/nb.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/nb.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/nl.po'
--- addons/web_gantt/i18n/nl.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/nl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/nl_BE.po'
--- addons/web_gantt/i18n/nl_BE.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/nl_BE.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/pl.po'
--- addons/web_gantt/i18n/pl.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/pl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/pt.po'
--- addons/web_gantt/i18n/pt.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/pt.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/pt_BR.po'
--- addons/web_gantt/i18n/pt_BR.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/pt_BR.po	2014-06-12 12:31:56 +0000
@@ -15,8 +15,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/ro.po'
--- addons/web_gantt/i18n/ro.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ro.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/ru.po'
--- addons/web_gantt/i18n/ru.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/ru.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/sl.po'
--- addons/web_gantt/i18n/sl.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/sl.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/sq.po'
--- addons/web_gantt/i18n/sq.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/sq.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/sr@xxxxxxxx'
--- addons/web_gantt/i18n/sr@xxxxxxxx	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/sr@xxxxxxxx	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/sv.po'
--- addons/web_gantt/i18n/sv.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/sv.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== added file 'addons/web_gantt/i18n/th.po'
--- addons/web_gantt/i18n/th.po	1970-01-01 00:00:00 +0000
+++ addons/web_gantt/i18n/th.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,32 @@
+# Thai translation for openerp-web
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2013-06-16 12:47+0000\n"
+"Last-Translator: Sumonchai ( เหลา ) <sumonchai@xxxxxxxxx>\n"
+"Language-Team: Thai <th@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/xml/web_gantt.xml:10
+#, python-format
+msgid "Create"
+msgstr "สร้าง"
+
+#. module: web_gantt
+#. openerp-web
+#: code:addons/web_gantt/static/src/js/gantt.js:11
+#, python-format
+msgid "Gantt"
+msgstr "แกนต์"

=== renamed file 'addons/web_gantt/i18n/th.po' => 'addons/web_gantt/i18n/th.po.moved'
=== modified file 'addons/web_gantt/i18n/tr.po'
--- addons/web_gantt/i18n/tr.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/tr.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_gantt/i18n/zh_CN.po'
--- addons/web_gantt/i18n/zh_CN.po	2014-05-14 05:55:34 +0000
+++ addons/web_gantt/i18n/zh_CN.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_gantt
 #. openerp-web

=== modified file 'addons/web_graph/i18n/ar.po'
--- addons/web_graph/i18n/ar.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/ar.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/bg.po'
--- addons/web_graph/i18n/bg.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/bg.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/bn.po'
--- addons/web_graph/i18n/bn.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/bn.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/bs.po'
--- addons/web_graph/i18n/bs.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/bs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/ca.po'
--- addons/web_graph/i18n/ca.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/ca.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/cs.po'
--- addons/web_graph/i18n/cs.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/cs.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/da.po'
--- addons/web_graph/i18n/da.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/da.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:54+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/de.po'
--- addons/web_graph/i18n/de.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/de.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:55+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/en_AU.po'
--- addons/web_graph/i18n/en_AU.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/en_AU.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:55+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/en_GB.po'
--- addons/web_graph/i18n/en_GB.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/en_GB.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:55+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== modified file 'addons/web_graph/i18n/es.po'
--- addons/web_graph/i18n/es.po	2014-05-14 05:55:34 +0000
+++ addons/web_graph/i18n/es.po	2014-06-12 12:31:56 +0000
@@ -14,8 +14,13 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2014-05-14 05:55+0000\n"
 "X-Generator: Launchpad (build 17002)\n"
+=======
+"X-Launchpad-Export-Date: 2014-05-03 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: web_graph
 #. openerp-web

=== added file 'addons/web_graph/i18n/es_AR.po'
--- addons/web_graph/i18n/es_AR.po	1970-01-01 00:00:00 +0000
+++ addons/web_graph/i18n/es_AR.po	2014-06-12 12:31:56 +0000
@@ -0,0 +1,137 @@
+# Spanish (Argentina) translation for openerp-web
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openerp-web package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openerp-web\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:37+0000\n"
+"PO-Revision-Date: 2014-06-10 16:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Argentina) <es_AR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-06-11 06:33+0000\n"
+"X-Generator: Launchpad (build 17031)\n"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:12
+#, python-format
+msgid "Bars"
+msgstr "Barras"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:33
+#, python-format
+msgid "Show Data"
+msgstr "Mostrar Datos"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/js/graph.js:22
+#, python-format
+msgid "Graph"
+msgstr "Gráfico"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:25
+#, python-format
+msgid "Inside"
+msgstr "Interno"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:3
+#, python-format
+msgid "&iacute;"
+msgstr "&iacute;"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:11
+#, python-format
+msgid "Pie"
+msgstr "Torta"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:28
+#, python-format
+msgid "Actions"
+msgstr "Acciones"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/web_graph.xml:7
+#, python-format
+msgid "Graph Mode"
+msgstr "Modo gráfico"
+
+#. module: web_graph
+#. openerp-web
+#: code:addons/web_graph/static/src/xml/w