[MERGE]Merge lp:openobject-addons.

bzr revid: bth@tinyerp.com-20130610052927-b496hrq36mlrs5xi

4 files changed, 293 insertions, 6 deletions

diff --git a/addons/note/html/index.html b/addons/note/html/index.html
index d4f6a9b8352..7ef37c646e9 100644
--- a/addons/note/html/index.html
+++ b/addons/note/html/index.html
@@ -7,7 +7,6 @@
                 <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=note">
                     <img src="notes_sc_00.png">
                 </a>
-                <span class="oe_demo_play">&nbsp;</span>
                 <div class="oe_demo_footer oe_centeralign">Online Demo</div>
             </div>
         </div>
@@ -25,7 +24,7 @@ Organize yourself with efficient todo lists and notes. From personnal tasks to c
 <section class="oe_container oe_dark">
     <div class="oe_row">
         <div class="oe_span12">
-            <h2 class="oe_slogan">Personnal to-do lists that works</h2>
+            <h2 class="oe_slogan">Personal to-do lists that works</h2>
             <p class="oe_mt32">
 Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.
             </p>
@@ -113,3 +112,5 @@ The real time collaborative writings on notes makes it the perfect tool to colla
         </div>
     </div>
 </section>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/note/i18n/ru.po b/addons/note/i18n/ru.po
new file mode 100644
index 00000000000..ef2cd6be0c1
--- /dev/null
+++ b/addons/note/i18n/ru.po
@@ -0,0 +1,286 @@
+# Russian 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:04+0000\n"
+"PO-Revision-Date: 2013-06-06 10:35+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@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-06-07 05:48+0000\n"
+"X-Generator: Launchpad (build 16667)\n"
+
+#. 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 ""
+
+#. 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
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Этап"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Название тега"
+
+#. 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
+#: 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
+#: view:note.note:0
+#: 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 "Используйте совместный планшет (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
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Владелец"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+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 "Свернуто по умолчанию"
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 49a154d10cc..f3b9e4669c7 100644
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@@ -175,7 +175,7 @@
       <field name="view_type">form</field>
       <field name="view_mode">kanban,tree,form</field>
       <field name="search_view_id" ref="view_note_note_filter"/>
-      <field name="context">{'search_default_open_true':True}</field>
+      <field name="context">{}</field>
       <field name="help" type="html">
           <p class="oe_view_nocontent_create">
             Click to add a personal note.
@@ -193,7 +193,7 @@
     </record>
 
     <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
-    <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+    <menuitem name="Stages" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
 
   </data>
 </openerp>
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
index b0c79561355..2c6e9f3bc7f 100644
--- a/addons/note/security/ir.rule.xml
+++ b/addons/note/security/ir.rule.xml
@@ -3,7 +3,7 @@
 <data>
   <record id="note_note_rule_global" model="ir.rule">
     <field name="name">Only followers can access a sticky notes</field>
-    <field model="ir.model" ref="model_note_note" name="model_id"/>
+    <field ref="model_note_note" name="model_id"/>
     <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
     <field eval="True" name="global"/>
     <field eval="1" name="perm_unlink"/>
@@ -14,7 +14,7 @@
 
   <record id="note_stage_rule_global" model="ir.rule">
     <field name="name">Each user have his stage name</field>
-    <field model="ir.model" ref="model_note_stage" name="model_id"/>
+    <field ref="model_note_stage" name="model_id"/>
     <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
     <field eval="True" name="global"/>
   </record>