[MERGE] merge from trunk into local branch

bzr revid: ged@openerp.com-20140204120420-ry8bcwr0j1syyt96

addons/web_kanban/i18n/mk.po

@@ -8,28 +8,28 @@ 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-03-08 16:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-02-03 10:39+0000\n"
+"Last-Translator: goran.cvetkovski <goran.cvetkovski@gmail.com>\n"
 "Language-Team: Macedonian <mk@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: 2014-01-22 05:40+0000\n"
-"X-Generator: Launchpad (build 16901)\n"
+"X-Launchpad-Export-Date: 2014-02-04 06:12+0000\n"
+"X-Generator: Launchpad (build 16916)\n"
 
 #. module: web_kanban
 #. openerp-web
 #: code:addons/web_kanban/static/src/js/kanban.js:689
 #, python-format
 msgid "Edit column"
-msgstr "Измени колона"
+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 ""
+msgstr "Се појави грешка при преместување на податок во оваа група"
 
 #. module: web_kanban
 #. openerp-web
@@ -43,7 +43,7 @@ msgstr "Канбан"
 #: code:addons/web_kanban/static/src/js/kanban.js:542
 #, python-format
 msgid "Undefined"
-msgstr "Недефинирано"
+msgstr "Недефиниран"
 
 #. module: web_kanban
 #. openerp-web
@@ -57,7 +57,7 @@ msgstr "Дали сакате да ја отстраните оваа колон
 #: code:addons/web_kanban/static/src/xml/web_kanban.xml:47
 #, python-format
 msgid "Edit"
-msgstr "Измени"
+msgstr "Уреди"
 
 #. module: web_kanban
 #. openerp-web