[Merge]Merged with trunk

bzr revid: dhr@tinyerp.com-20130318115147-iif7gjyoz7nqrbp8

27 files changed, 27 insertions, 27 deletions

diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index 5152d31b27b..152d5e2722c 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index 1b8db9dd0db..e6e1236e50b 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index ebfad7b18ac..f31469e91a1 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index b9b6442ae31..950383d20ee 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,7 +13,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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 4eacd0f9fe2..08636a30840 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index aa59ab4bad3..138bff203f3 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 "Language: es\n"
 
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index da938bd3490..8b8c74c80c7 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index 4193bd5fd98..74b21b6f561 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 74c894f4f50..774d5c69321 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,7 +13,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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index 328056648fa..f7a3da8d031 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index 9aaebb64304..d34d8e36aa7 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -13,7 +13,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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 0ab49132ea1..fcef56ae3ce 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index 089d00c0a04..bb332f116e7 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 575d68d347c..37e6210868c 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/mk.po b/addons/project_long_term/i18n/mk.po
index 8b96e230cf9..221e3ac09f8 100644
--- a/addons/project_long_term/i18n/mk.po
+++ b/addons/project_long_term/i18n/mk.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 0810f392bdb..b5554c80f73 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 424a74c76e3..30d4159b7cd 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index cefd4a945e7..ae4f5f2750a 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 3f0f27b3bcf..e7ac4284a2d 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index ce223527052..887c5820139 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -15,7 +15,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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index 7c1328938d1..447d14574df 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/ru.po b/addons/project_long_term/i18n/ru.po
index 95c7335b93f..8f15318e6a1 100644
--- a/addons/project_long_term/i18n/ru.po
+++ b/addons/project_long_term/i18n/ru.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/sl.po b/addons/project_long_term/i18n/sl.po
index f9093946b6b..b2a023f4308 100644
--- a/addons/project_long_term/i18n/sl.po
+++ b/addons/project_long_term/i18n/sl.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index d28fb5b5c10..b4e615e135d 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index af65512a8e8..572115f4dd1 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -13,7 +13,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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 2eda931c99a..4b5ad3f0e44 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -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-03-15 05:47+0000\n"
+"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
 "X-Generator: Launchpad (build 16532)\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index e8e21caab0a..4066b6133c1 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -146,7 +146,7 @@
                     <button string="Done" name="set_done" states="pending,open"/>
                     <button string="Pending" name="set_pending" states="open"/>
                     <button string="Draft" name="set_draft" states="open"/>
-                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
+                    <button string="Cancel Phase" name="set_cancel" states="draft,open,pending"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>