[Merge] lp:openobject-addons

bzr revid: dbr@tinyerp.com-20130930064431-leffnq9o024uca4b
bzr revid: dbr@tinyerp.com-20131003121617-u3f3hg1mqoex3ej0
This commit is contained in:
DBR (OpenERP)
2013-10-03 17:46:17 +05:30
5 changed files with 38 additions and 12 deletions
+5 -5
View File
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2011-11-08 10:42+0000\n"
"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
"PO-Revision-Date: 2013-09-26 21:19+0000\n"
"Last-Translator: Morten Schou <ms@msteknik.dk>\n"
"Language-Team: Danish <da@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-09-12 06:17+0000\n"
"X-Generator: Launchpad (build 16761)\n"
"X-Launchpad-Export-Date: 2013-09-27 05:49+0000\n"
"X-Generator: Launchpad (build 16774)\n"
#. module: account_cancel
#: view:account.invoice:0
msgid "Cancel"
msgstr ""
msgstr "Annuller"
#~ msgid "Account Cancel"
#~ msgstr "Annuller post"
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-09-24 05:55+0000\n"
"X-Launchpad-Export-Date: 2013-09-25 05:28+0000\n"
"X-Generator: Launchpad (build 16771)\n"
#. module: account_test
+2 -1
View File
@@ -48,7 +48,8 @@ openerp.mail.suggestions = function(session, mail) {
join_group: function (event) {
var self = this;
return this.mail_group.call('message_subscribe_users', [[$(event.currentTarget).attr('id')],[this.session.uid]]).then(function(res) {
var group_id = parseInt($(event.currentTarget).attr('id'), 10);
return this.mail_group.call('message_subscribe_users', [[group_id],[this.session.uid]]).then(function(res) {
self.fetch_suggested_groups();
});
},
+5 -5
View File
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-08-06 09:26+0000\n"
"PO-Revision-Date: 2013-09-30 10:54+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-09-12 05:01+0000\n"
"X-Generator: Launchpad (build 16761)\n"
"X-Launchpad-Export-Date: 2013-10-01 05:18+0000\n"
"X-Generator: Launchpad (build 16774)\n"
#. module: stock
#: field:stock.inventory.line.split,line_exist_ids:0
@@ -1876,7 +1876,7 @@ msgstr "点击此项从下面列表中选择一个已有的系列号,否则你
#: selection:stock.picking.in,type:0
#: selection:stock.picking.out,type:0
msgid "Sending Goods"
msgstr "送货"
msgstr "待发货"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
@@ -4305,7 +4305,7 @@ msgstr "请为产品 \"%s\" (id: %d) 定义一个入库科目。"
#: model:ir.actions.act_window,name:stock.action_reception_picking_move
#: model:ir.ui.menu,name:stock.menu_action_pdct_in
msgid "Incoming Products"
msgstr "入库产品"
msgstr "待收货"
#. module: stock
#: view:product.product:0
+25
View File
@@ -0,0 +1,25 @@
# Greek translation for openobject-addons
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
# This file is distributed under the same license as the openobject-addons package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-12-21 17:06+0000\n"
"PO-Revision-Date: 2013-09-30 20:14+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Greek <el@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-10-01 05:18+0000\n"
"X-Generator: Launchpad (build 16774)\n"
#. module: web_shortcuts
#. openerp-web
#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
#, python-format
msgid "Add / Remove Shortcut..."
msgstr ""