[MERGE] trunk

bzr revid: qdp-launchpad@openerp.com-20121127134541-t16ham0o3k4xx0f8

4 files changed, 382 insertions, 95 deletions

diff --git a/addons/note/i18n/nl.po b/addons/note/i18n/nl.po
index 0e3baeee351..686ddcd2ac9 100644
--- a/addons/note/i18n/nl.po
+++ b/addons/note/i18n/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-02 12:54+0000\n"
-"PO-Revision-Date: 2012-11-07 14:51+0000\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-24 21:35+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@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: 2012-11-08 04:47+0000\n"
-"X-Generator: Launchpad (build 16232)\n"
+"X-Launchpad-Export-Date: 2012-11-25 06:33+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
 
 #. module: note
 #: sql_constraint:res.users:0
@@ -33,6 +33,12 @@ msgid "Stages of Notes"
 msgstr "Notitie fases"
 
 #. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Deze week"
+
+#. module: note
 #: model:ir.model,name:note.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
@@ -59,11 +65,6 @@ msgid "Group By..."
 msgstr "Groepeer op..."
 
 #. module: note
-#: field:note.note,message_summary:0
-msgid "Summary"
-msgstr "Samenvatting"
-
-#. module: note
 #: field:note.note,message_follower_ids:0
 msgid "Followers"
 msgstr "Volgers"
@@ -107,11 +108,6 @@ msgstr ""
 "        "
 
 #. module: note
-#: view:note.note:0
-msgid "kanban note"
-msgstr "kanban notitie"
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_01
 #: model:note.stage,name:note.note_stage_01
 msgid "Today"
@@ -163,13 +159,7 @@ msgid "Is a Follower"
 msgstr "Is een volger"
 
 #. module: note
-#: view:note.note:0
-msgid "title"
-msgstr "titel"
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_02
-#: model:note.stage,name:note.note_stage_02
 msgid "Tomorrow"
 msgstr "Morgen"
 
@@ -201,6 +191,11 @@ msgid "Tag Name"
 msgstr "Label naam"
 
 #. module: note
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID moet uniek zijn per provider"
+
+#. module: note
 #: field:note.note,message_ids:0
 msgid "Messages"
 msgstr "Berichten"
@@ -226,14 +221,9 @@ msgid "Note Stage"
 msgstr "Notitie fase"
 
 #. module: note
-#: view:note.note:0
-msgid "dropdown menu"
-msgstr "keuze menu"
-
-#. module: note
-#: model:note.stage,name:note.demo_note_stage_04
-msgid "Morning"
-msgstr "Ochtend"
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
 
 #. module: note
 #: help:note.stage,sequence:0
@@ -241,11 +231,6 @@ msgid "Used to order the note stages"
 msgstr "Wordt gebruikt om de notitie fases te sorteren"
 
 #. module: note
-#: view:note.note:0
-msgid "W"
-msgstr "W"
-
-#. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
 msgstr "Gebrukers fases"
@@ -308,6 +293,11 @@ msgstr ""
 "ingevoegd."
 
 #. module: note
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: Ongeldige EAN-code"
+
+#. module: note
 #: field:base.config.settings,group_note_fancy:0
 msgid "Use fancy layouts for notes"
 msgstr "Gebruik luxe layouts voor notities"
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index 48aec03d61f..48e0ffe87fa 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-02 12:54+0000\n"
-"PO-Revision-Date: 2012-11-02 12:54+0000\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-24 02:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,12 @@ msgid "Stages of Notes"
 msgstr ""
 
 #. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr ""
+
+#. module: note
 #: model:ir.model,name:note.model_base_config_settings
 msgid "base.config.settings"
 msgstr ""
@@ -57,11 +63,6 @@ msgid "Group By..."
 msgstr ""
 
 #. module: note
-#: field:note.note,message_summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: note
 #: field:note.note,message_follower_ids:0
 msgid "Followers"
 msgstr ""
@@ -84,11 +85,6 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "kanban note"
-msgstr ""
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_01
 #: model:note.stage,name:note.note_stage_01
 msgid "Today"
@@ -140,13 +136,7 @@ msgid "Is a Follower"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "title"
-msgstr ""
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_02
-#: model:note.stage,name:note.note_stage_02
 msgid "Tomorrow"
 msgstr ""
 
@@ -178,6 +168,11 @@ msgid "Tag Name"
 msgstr ""
 
 #. module: note
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: note
 #: field:note.note,message_ids:0
 msgid "Messages"
 msgstr ""
@@ -203,13 +198,8 @@ msgid "Note Stage"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "dropdown menu"
-msgstr ""
-
-#. module: note
-#: model:note.stage,name:note.demo_note_stage_04
-msgid "Morning"
+#: field:note.note,message_summary:0
+msgid "Summary"
 msgstr ""
 
 #. module: note
@@ -218,11 +208,6 @@ msgid "Used to order the note stages"
 msgstr ""
 
 #. module: note
-#: view:note.note:0
-msgid "W"
-msgstr ""
-
-#. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
 msgstr ""
@@ -280,6 +265,11 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
 msgstr ""
 
 #. module: note
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: note
 #: field:base.config.settings,group_note_fancy:0
 msgid "Use fancy layouts for notes"
 msgstr ""
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index eea43f2275f..6ecf7a0c548 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
 "PO-Revision-Date: 2012-11-14 04:29+0000\n"
 "Last-Translator: Guilherme R. Santos <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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: 2012-11-15 04:42+0000\n"
-"X-Generator: Launchpad (build 16265)\n"
+"X-Launchpad-Export-Date: 2012-11-25 06:33+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
 
 #. module: note
 #: sql_constraint:res.users:0
@@ -33,6 +33,12 @@ msgid "Stages of Notes"
 msgstr "Estágio das Notas"
 
 #. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr ""
+
+#. module: note
 #: model:ir.model,name:note.model_base_config_settings
 msgid "base.config.settings"
 msgstr "base.config.settings"
@@ -59,11 +65,6 @@ msgid "Group By..."
 msgstr "Agrupar Por..."
 
 #. module: note
-#: field:note.note,message_summary:0
-msgid "Summary"
-msgstr "Resumo"
-
-#. module: note
 #: field:note.note,message_follower_ids:0
 msgid "Followers"
 msgstr "Seguidores"
@@ -104,11 +105,6 @@ msgstr ""
 "        "
 
 #. module: note
-#: view:note.note:0
-msgid "kanban note"
-msgstr "nota kanban"
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_01
 #: model:note.stage,name:note.note_stage_01
 msgid "Today"
@@ -160,13 +156,7 @@ msgid "Is a Follower"
 msgstr "É um seguidor"
 
 #. module: note
-#: view:note.note:0
-msgid "title"
-msgstr "título"
-
-#. module: note
 #: model:note.stage,name:note.demo_note_stage_02
-#: model:note.stage,name:note.note_stage_02
 msgid "Tomorrow"
 msgstr "Amanhã"
 
@@ -198,6 +188,11 @@ msgid "Tag Name"
 msgstr "Nome da Tag"
 
 #. module: note
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: note
 #: field:note.note,message_ids:0
 msgid "Messages"
 msgstr "Mensagens"
@@ -223,14 +218,9 @@ msgid "Note Stage"
 msgstr "Estágio da Nota"
 
 #. module: note
-#: view:note.note:0
-msgid "dropdown menu"
-msgstr "dropdown menu"
-
-#. module: note
-#: model:note.stage,name:note.demo_note_stage_04
-msgid "Morning"
-msgstr "Manhã"
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
 
 #. module: note
 #: help:note.stage,sequence:0
@@ -238,11 +228,6 @@ msgid "Used to order the note stages"
 msgstr "Usado para ordenar os estágios das notas"
 
 #. module: note
-#: view:note.note:0
-msgid "W"
-msgstr "W"
-
-#. module: note
 #: field:note.note,stage_ids:0
 msgid "Stages of Users"
 msgstr "Estágios de Usuários"
@@ -302,6 +287,11 @@ msgid ""
 msgstr ""
 
 #. module: note
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: note
 #: field:base.config.settings,group_note_fancy:0
 msgid "Use fancy layouts for notes"
 msgstr "Usar leiautes fantasia para notas"
diff --git a/addons/note/i18n/zh_CN.po b/addons/note/i18n/zh_CN.po
new file mode 100644
index 00000000000..af393cfa67b
--- /dev/null
+++ b/addons/note/i18n/zh_CN.po
@@ -0,0 +1,317 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-27 01:57+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "便签内容"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "便签阶段"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "本周"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "便签标签"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "便签/拟物化 模式"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "便笺"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "分组于..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "关注者"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"单击增加一个个人便签。\n"
+"          \n"
+"            使用便签来组织个人的任务或者是事项。所有的便器都是私有的。\n"
+"            没有其他人看到它们。\n"
+"           然后，你能通过在便签上邀请关注者来分享你的一些便签\n"
+"           (对于会议记录非常有用，特别是当你激活了便签簿的 合作书写模式)。\n"
+"          \n"
+"           通过增加、删除或者修改列，你可以个性化你对便签和任务的处理。\n"
+"        "
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "今天"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "人员"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "便签阶段"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "未读信息"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "未知的"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr "通过即时贴类别"
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "如果要求你关注新消息，勾选此项"
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "阶段名称"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "是一个关注者"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr "明天"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "启用"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "便签阶段的所有者"
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "类别"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "评论和电子邮件"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "标签名"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者唯一的"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "便签"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "稍后"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "便签阶段"
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "用来整理便签阶段"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "用户的阶段"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "便签摘要"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "阶段"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "消息和通信历史"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "刪除"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "颜色索引"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "序号"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "标签"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "存档"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "使用collaborative pads (etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
+
+#. module: note
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "为便签使用拟物化布局"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "承办人"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "完成日期"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "默认文件夹"