[MERGE] merge from trunk

bzr revid: ged@openerp.com-20131227152221-w0k62w93yqs1euxx
bzr revid: ged@openerp.com-20131230090912-pc5kpl70gop00lpg

addons/web_kanban/i18n/he.po

@@ -0,0 +1,161 @@
+# 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: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2013-12-26 22:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hebrew <he@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-12-27 05:26+0000\n"
+"X-Generator: Launchpad (build 16877)\n"
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:689
+#, python-format
+msgid "Edit column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:418
+#, python-format
+msgid "An error has occured while moving the record to this group."
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:10
+#, python-format
+msgid "Kanban"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:542
+#, python-format
+msgid "Undefined"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:708
+#, python-format
+msgid "Are you sure to remove this column ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
+#, python-format
+msgid "Edit"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:192
+#, python-format
+msgid "Add column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:1085
+#, python-format
+msgid "Create: "
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:24
+#, python-format
+msgid "Add a new column"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:680
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:45
+#, python-format
+msgid "Fold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "Add"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:35
+#, python-format
+msgid "Quick create"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:921
+#, python-format
+msgid "Are you sure you want to delete this record ?"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/js/kanban.js:680
+#, python-format
+msgid "Unfold"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "Show more... ("
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:99
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:80
+#, python-format
+msgid "remaining)"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:22
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:98
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:40
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:55
+#, python-format
+msgid "99+"
+msgstr ""
+
+#. module: web_kanban
+#. openerp-web
+#: code:addons/web_kanban/static/src/xml/web_kanban.xml:48
+#, python-format
+msgid "Delete"
+msgstr ""

addons/web_kanban_gauge/static/src/js/kanban_gauge.js

@@ -9,6 +9,7 @@ var _t = instance.web._t,
 
 instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
     className: "oe_gauge",
+
     start: function() {
         var self = this;
         var parent = this.getParent();
@@ -41,7 +42,7 @@ instance.web_kanban.GaugeWidget = instance.web_kanban.AbstractField.extend({
             valueFontColor: '#333333',
             labelFontColor: '#000',
             label: label,
-            levelColors: [
+            levelColors: self.options.levelcolors || [
                 "#ff0000",
                 "#f9c802",
                 "#a9d70b"