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

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

diff --git a/addons/auth_crypt/i18n/en_GB.po b/addons/auth_crypt/i18n/en_GB.po
index 19ec230..b29d2e1 100644 (file)
--- a/addons/auth_crypt/i18n/en_GB.po
+++ b/addons/auth_crypt/i18n/en_GB.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: 2011-08-25 11:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United Kingdom) <en_GB@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 "The chosen company is not in the allowed companies for this user"
 
 #. 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 "You can not have two users with the same login !"
+
 #~ msgid ""
 #~ "This module replaces the cleartext password in the database with a password "
 #~ "hash,\n"
@@ -67,11 +87,5 @@ msgstr ""
 #~ msgid "Please specify the password !"
 #~ msgstr "Please specify the password !"
 
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr "The chosen company is not in the allowed companies for this user"
-
 #~ msgid "res.users"
 #~ msgstr "res.users"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "You can not have two users with the same login !"