[MERGE] sync with latest trunk @2012-12-21

[odoo/odoo.git] / addons / auth_crypt / i18n / zh_TW.po

diff --git a/addons/auth_crypt/i18n/zh_TW.po b/addons/auth_crypt/i18n/zh_TW.po
index 0c086e1..dd2829a 100644 (file)
--- a/addons/auth_crypt/i18n/zh_TW.po
+++ b/addons/auth_crypt/i18n/zh_TW.po
@@ -7,21 +7,41 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
 "PO-Revision-Date: 2012-08-19 10:28+0000\n"
 "Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@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-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
+"X-Generator: Launchpad (build 16293)\n"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "所選的公司不是使用者被允許的公司。"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
 msgstr ""
 
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "您不能同時登入二個使用者!"
+
 #~ msgid "Base - Password Encryption"
 #~ msgstr "基礎 - 密碼加密"
 
@@ -29,15 +49,9 @@ msgstr ""
 #~ msgid "Please specify the password !"
 #~ msgstr "請指定密碼 !"
 
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "您不能同時登入二個使用者!"
-
 #, python-format
 #~ msgid "Error"
 #~ msgstr "錯誤"
 
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "所選的公司不是使用者被允許的公司。"
-
 #~ msgid "res.users"
 #~ msgstr "res.users"