[Merge] lp:openobject-addons

bzr revid: dbr@tinyerp.com-20130730061010-w8y3f6r78izik6te
bzr revid: dbr@tinyerp.com-20130806063107-i4dz2jh4ynkbe3mv

diff --cc addons/point_of_sale/i18n/zh_CN.po
index 23dc97f,2dc8e2b..58d7c1f
--- 1/addons/point_of_sale/i18n/zh_CN.po
--- 2/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@@ -7,14 -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-04-24 06:41+0000\n"
- "Last-Translator: viney <Unknown>\n"
 -"PO-Revision-Date: 2013-08-06 09:45+0000\n"
++"PO-Revision-Date: 2013-07-26 07:07+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-04-25 05:20+0000\n"
- "X-Generator: Launchpad (build 16580)\n"
 -"X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
 -"X-Generator: Launchpad (build 16721)\n"
++"X-Launchpad-Export-Date: 2013-07-27 05:02+0000\n"
++"X-Generator: Launchpad (build 16700)\n"
  
  #. module: point_of_sale
  #: field:report.transaction.pos,product_nb:0
@@@ -1157,11 -1168,11 +1157,11 @@@ msgstr "2L 依云
  
  #. module: point_of_sale
  #: code:addons/point_of_sale/point_of_sale.py:373
- #: code:addons/point_of_sale/point_of_sale.py:472
- #: code:addons/point_of_sale/wizard/pos_session_opening.py:34
+ #: code:addons/point_of_sale/point_of_sale.py:474
+ #: code:addons/point_of_sale/wizard/pos_session_opening.py:33
  #, python-format
  msgid "Start Point Of Sale"
 -msgstr "启动销售点"
 +msgstr ""
  
  #. module: point_of_sale
  #: model:pos.category,name:point_of_sale.pils

diff --cc addons/stock/i18n/zh_CN.po
index 407a76e,add3ef9..3200f82
--- 1/addons/stock/i18n/zh_CN.po
--- 2/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@@ -7,14 -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: 2012-12-09 05:05+0000\n"
- "Last-Translator: sum1201 <Unknown>\n"
 -"PO-Revision-Date: 2013-08-06 09:26+0000\n"
++"PO-Revision-Date: 2013-07-27 18:34+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-03-16 05:00+0000\n"
- "X-Generator: Launchpad (build 16532)\n"
 -"X-Launchpad-Export-Date: 2013-08-07 04:46+0000\n"
 -"X-Generator: Launchpad (build 16721)\n"
++"X-Launchpad-Export-Date: 2013-07-28 05:54+0000\n"
++"X-Generator: Launchpad (build 16700)\n"
  
  #. module: stock
  #: field:stock.inventory.line.split,line_exist_ids:0
@@@ -2320,7 -2339,7 +2332,7 @@@ msgstr "供货商库位
  #. module: stock
  #: view:stock.location.product:0
  msgid "View Products Inventory"
- msgstr ""
 -msgstr "查看产品库存"
++msgstr "查看产品存货清单"
  
  #. module: stock
  #: view:stock.move:0
@@@ -3184,12 -3237,19 +3212,12 @@@ msgid "
  "              </p>\n"
  "            "
  msgstr ""
 -"<p class=\"oe_view_nocontent_create\">\n"
 -"                添加一个追踪号码。\n"
 -"              </p><p>\n"
 -"                这是所有包装的一个列表。当你选择了一个包装，你\n"
 -"                能获得包含在这个包装中的产品的上下游的可追踪性。\n"
 -"              </p>\n"
 -"            "
  
  #. module: stock
- #: code:addons/stock/stock.py:2496
+ #: code:addons/stock/stock.py:2501
  #, python-format
  msgid "%s %s %s has been <b>moved to</b> scrap."
- msgstr ""
+ msgstr "%s %s %s 已被 <b>移动到</b> 报废仓."
  
  #. module: stock
  #: model:ir.actions.act_window,name:stock.action_picking_tree_out
@@@ -3941,13 -4014,13 +3975,13 @@@ msgstr "è¿\99é\80\89项å\85\81许è¿\99åº\93ä½\8dè\83½ä¸\8dè
  #: field:stock.picking.in,message_follower_ids:0
  #: field:stock.picking.out,message_follower_ids:0
  msgid "Followers"
- msgstr ""
+ msgstr "关注者"
  
  #. module: stock
- #: code:addons/stock/stock.py:2585
+ #: code:addons/stock/stock.py:2590
  #, python-format
  msgid "Cannot consume a move with negative or zero quantity."
 -msgstr "消耗的移库数量不能小于等于0。"
 +msgstr ""
  
  #. module: stock
  #: help:stock.config.settings,decimal_precision:0