From 5e5626dbc39acfe5ab7afd5cf939883449fa6656 Mon Sep 17 00:00:00 2001 From: JoenioCosta Date: Thu, 31 Jul 2008 23:00:31 +0000 Subject: [PATCH] ActionItem611: updating po files --- po/de/noosfero.po | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- po/fr/noosfero.po | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------ po/hy/noosfero.po | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- po/nl/noosfero.po | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- po/noosfero.pot | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------- po/pt_BR/noosfero.po | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------- 6 files changed, 710 insertions(+), 594 deletions(-) diff --git a/po/de/noosfero.po b/po/de/noosfero.po index bc1680d..fb3d606 100644 --- a/po/de/noosfero.po +++ b/po/de/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -367,7 +367,8 @@ msgstr "" #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "" @@ -445,6 +446,7 @@ msgstr "" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" @@ -1550,7 +1552,7 @@ msgstr "" msgid "Disable search for events" msgstr "" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -1749,15 +1751,15 @@ msgstr "" msgid "Thanks for signing up!" msgstr "" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "" -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "" @@ -3364,50 +3366,24 @@ msgid "" msgstr "" #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" - -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "" - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "" - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "" -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "" -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "" @@ -3428,9 +3404,37 @@ msgid "Send change password procedure by e-mail" msgstr "" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "" +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "" + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "" + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "" @@ -3481,6 +3485,57 @@ msgid "" "environment." msgstr "" +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "" + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "" + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "" + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "" + +#: app/views/account/_signup_form.rhtml:47 +msgid "Sign up" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "We need to be sure that this is your enterprise" +msgstr "" + +#: app/views/account/activation_question.rhtml:8 +msgid "Answer" +msgstr "" + #: app/views/account/invalid_enterprise_code.rhtml:1 msgid "Invalid enterprise code" msgstr "" @@ -3536,6 +3591,10 @@ msgstr "" msgid "You can login now." msgstr "" +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "" @@ -3548,68 +3607,24 @@ msgstr "" msgid "Logout" msgstr "" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" -msgstr "" - -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." -msgstr "" - -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "" - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." -msgstr "" - -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." -msgstr "" - -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" -msgstr "" - -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 -msgid "Sign up" -msgstr "" - #: app/views/account/activate_enterprise.rhtml:1 -msgid "Register and activate enterprise" +msgid "What user should be the admin of the enterprise page" msgstr "" -#: app/views/account/activate_enterprise.rhtml:5 -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" +#: app/views/account/activate_enterprise.rhtml:7 +msgid "Create new user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" +#: app/views/account/accept_terms.rhtml:4 +msgid "I accept the terms" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "We need to be sure that this is your enterprise" +#: app/views/account/accept_terms.rhtml:5 +msgid "I do NOT accept the terms" msgstr "" #: app/views/account/change_password.rhtml:5 diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po index 45358e6..99a700a 100644 --- a/po/fr/noosfero.po +++ b/po/fr/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2008-06-13 16:15-0300\n" "Last-Translator: Raphael Rousseau \n" "Language-Team: LANGUAGE \n" @@ -390,7 +390,8 @@ msgstr "Les validateurs sont assignés par région par les administrateurs." #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "Annuler" @@ -472,6 +473,7 @@ msgstr "Personnes" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Produits" @@ -1704,7 +1706,7 @@ msgstr "" msgid "Disable search for events" msgstr "Rechercher :" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "Seule une CoVi peut être celle par défaut" @@ -1916,15 +1918,15 @@ msgstr "Identifiant ou mot de passe incorrect" msgid "Thanks for signing up!" msgstr "Merci de vous être inscrit(e) !" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "Vous avez été déconnecté(e)." -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "Votre mot de passe a bien été modifié !" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "Le mot de passe actuel fourni est incorrect." @@ -3680,61 +3682,26 @@ msgstr "" "pour devenir membre de cette communauté." #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "Connexion" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" -"Si vous êtes un utilisateur enregistré, entrez vos identifiant et mot de " -"passe pour être authentifié(e)." - -# 1- Verify consistency between translations. -# 2- In English "an user" -> "a user" Cf. http://forum.wordreference.com/showthread.php?t=480322 -# -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" -"Pour rejoindre cette communauté, cliquez sur \"Je rejoins cette " -"communauté !\"." - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" -"Si vous avez oublié votre mot de passe, cliquez sur le lien «J'ai oublié " -"mon mot de passe !»." - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "Ici, le nom que vous avez donné à l'enregistrement." - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "votre mot de passe est personnel, protégez-le." - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "Se connecter" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "Vous pouvez retrouver votre mot de passe en cliquant sur ce lien." -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "J'ai oublié mon mot de passe !" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "" "Cliquez ici pour rejoindre cette communauté, si vous n'en êtes pas déjà " "membre." -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "Je rejoins cette communauté !" @@ -3760,10 +3727,42 @@ msgstr "" "Envoyer le procédure de changement de mot de passe par courrier électronique" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" +"Si vous êtes un utilisateur enregistré, entrez vos identifiant et mot de " +"passe pour être authentifié(e)." + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "" "Pour rejoindre cette communauté, cliquez sur «Nouvel utilisateur»." +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" +"Si vous avez oublié votre mot de passe, cliquez sur le lien «J'ai oublié " +"mon mot de passe !»." + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "Ici, le nom que vous avez donné à l'enregistrement." + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "votre mot de passe est personnel, protégez-le." + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "Se connecter" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "Nouvel utilisateur" @@ -3817,6 +3816,72 @@ msgstr "" "C'est toujours une bonne idée que de se déconnecter explicitement lorsque " "vous avez terminé d'utiliser l'environnement." +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "S'enregistrer" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" +"Remplissez tous ces champs pour rejoindre cette communauté.

Si vous avez " +"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le " +"lien «J'ai oublié mon mot de passe»." + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" +"«Identifiant» est un simple surnom pour vous reconnaître dans cette " +"communauté." + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "" +"Nous vous enverrons un courrier électronique pour valider votre " +"enregistrement." + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "" +"Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque " +"chose que vous n'oublierez pas." + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "" +"Nous devons nous assurer que vous avez écrit correctement votre mot de passe." + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "J'accepte les conditions d'utilisation" + +# Je ne suis pas sûr de la distinction "sign up" / "register" +#: app/views/account/_signup_form.rhtml:47 +#, fuzzy +msgid "Sign up" +msgstr "S'enregistrer" + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +#, fuzzy +msgid "We need to be sure that this is your enterprise" +msgstr "" +"Nous devons nous assurer que vous avez écrit correctement votre mot de passe." + +#: app/views/account/activation_question.rhtml:8 +#, fuzzy +msgid "Answer" +msgstr "utilisateur" + #: app/views/account/invalid_enterprise_code.rhtml:1 #, fuzzy msgid "Invalid enterprise code" @@ -3881,6 +3946,15 @@ msgstr "%s, votre nouveau mot de passe a bien été installé." msgid "You can login now." msgstr "Maintenant, vous pouvez vous commecter." +# 1- Verify consistency between translations. +# 2- In English "an user" -> "a user" Cf. http://forum.wordreference.com/showthread.php?t=480322 +# +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" +"Pour rejoindre cette communauté, cliquez sur \"Je rejoins cette " +"communauté !\"." + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "Connecté en tant que %s" @@ -3893,88 +3967,28 @@ msgstr "Utilisateur depuis %{month}/%{year}" msgid "Logout" msgstr "Déconnexion" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "S'enregistrer" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" -msgstr "" -"Remplissez tous ces champs pour rejoindre cette communauté.

Si vous avez " -"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le " -"lien «J'ai oublié mon mot de passe»." - -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." -msgstr "" -"«Identifiant» est un simple surnom pour vous reconnaître dans cette " -"communauté." - -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "" -"Nous vous enverrons un courrier électronique pour valider votre " -"enregistrement." - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." +#: app/views/account/activate_enterprise.rhtml:1 +msgid "What user should be the admin of the enterprise page" msgstr "" -"Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque " -"chose que vous n'oublierez pas." -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -"Nous devons nous assurer que vous avez écrit correctement votre mot de passe." -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" -msgstr "J'accepte les conditions d'utilisation" - -# Je ne suis pas sûr de la distinction "sign up" / "register" -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 +#: app/views/account/activate_enterprise.rhtml:7 #, fuzzy -msgid "Sign up" -msgstr "S'enregistrer" - -#: app/views/account/activate_enterprise.rhtml:1 -#, fuzzy -msgid "Register and activate enterprise" -msgstr "Enregistrer une nouvelle entreprise" +msgid "Create new user" +msgstr "Créer un nouveau groupe" -#: app/views/account/activate_enterprise.rhtml:5 +#: app/views/account/accept_terms.rhtml:4 #, fuzzy -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" -msgstr "" -"Remplissez tous ces champs pour rejoindre cette communauté.

Si vous avez " -"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le " -"lien «J'ai oublié mon mot de passe»." - -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" -msgstr "" - -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" -msgstr "" +msgid "I accept the terms" +msgstr "J'accepte les conditions d'utilisation" -#: app/views/account/activate_enterprise.rhtml:27 +#: app/views/account/accept_terms.rhtml:5 #, fuzzy -msgid "We need to be sure that this is your enterprise" -msgstr "" -"Nous devons nous assurer que vous avez écrit correctement votre mot de passe." +msgid "I do NOT accept the terms" +msgstr "J'accepte les conditions d'utilisation" #: app/views/account/change_password.rhtml:5 msgid "Current password" @@ -4222,6 +4236,20 @@ msgstr "Un projet du FBES" msgid "Developed by Colivre" msgstr "Développé par Colivre" +#, fuzzy +#~ msgid "Register and activate enterprise" +#~ msgstr "Enregistrer une nouvelle entreprise" + +#, fuzzy +#~ msgid "" +#~ "Fill all this fields to activate your enterprise and join in this " +#~ "environment.

If you forgot your password, do not create a new account, " +#~ "click on the \"I forgot my password!\" link. ;-)" +#~ msgstr "" +#~ "Remplissez tous ces champs pour rejoindre cette communauté.

Si vous " +#~ "avez oublié votre mot de passe, ne créez pas un nouveau compte, cliquez " +#~ "sur le lien «J'ai oublié mon mot de passe»." + #~ msgid "Some feature" #~ msgstr "Quelques fonctionnalités" diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po index bc1680d..fb3d606 100644 --- a/po/hy/noosfero.po +++ b/po/hy/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -367,7 +367,8 @@ msgstr "" #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "" @@ -445,6 +446,7 @@ msgstr "" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" @@ -1550,7 +1552,7 @@ msgstr "" msgid "Disable search for events" msgstr "" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -1749,15 +1751,15 @@ msgstr "" msgid "Thanks for signing up!" msgstr "" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "" -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "" @@ -3364,50 +3366,24 @@ msgid "" msgstr "" #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" - -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "" - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "" - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "" -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "" -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "" @@ -3428,9 +3404,37 @@ msgid "Send change password procedure by e-mail" msgstr "" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "" +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "" + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "" + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "" @@ -3481,6 +3485,57 @@ msgid "" "environment." msgstr "" +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "" + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "" + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "" + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "" + +#: app/views/account/_signup_form.rhtml:47 +msgid "Sign up" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "We need to be sure that this is your enterprise" +msgstr "" + +#: app/views/account/activation_question.rhtml:8 +msgid "Answer" +msgstr "" + #: app/views/account/invalid_enterprise_code.rhtml:1 msgid "Invalid enterprise code" msgstr "" @@ -3536,6 +3591,10 @@ msgstr "" msgid "You can login now." msgstr "" +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "" @@ -3548,68 +3607,24 @@ msgstr "" msgid "Logout" msgstr "" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" -msgstr "" - -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." -msgstr "" - -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "" - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." -msgstr "" - -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." -msgstr "" - -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" -msgstr "" - -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 -msgid "Sign up" -msgstr "" - #: app/views/account/activate_enterprise.rhtml:1 -msgid "Register and activate enterprise" +msgid "What user should be the admin of the enterprise page" msgstr "" -#: app/views/account/activate_enterprise.rhtml:5 -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" +#: app/views/account/activate_enterprise.rhtml:7 +msgid "Create new user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" +#: app/views/account/accept_terms.rhtml:4 +msgid "I accept the terms" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "We need to be sure that this is your enterprise" +#: app/views/account/accept_terms.rhtml:5 +msgid "I do NOT accept the terms" msgstr "" #: app/views/account/change_password.rhtml:5 diff --git a/po/nl/noosfero.po b/po/nl/noosfero.po index bc1680d..fb3d606 100644 --- a/po/nl/noosfero.po +++ b/po/nl/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -367,7 +367,8 @@ msgstr "" #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "" @@ -445,6 +446,7 @@ msgstr "" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" @@ -1550,7 +1552,7 @@ msgstr "" msgid "Disable search for events" msgstr "" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -1749,15 +1751,15 @@ msgstr "" msgid "Thanks for signing up!" msgstr "" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "" -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "" @@ -3364,50 +3366,24 @@ msgid "" msgstr "" #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" - -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "" - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "" - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "" -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "" -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "" @@ -3428,9 +3404,37 @@ msgid "Send change password procedure by e-mail" msgstr "" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "" +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "" + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "" + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "" @@ -3481,6 +3485,57 @@ msgid "" "environment." msgstr "" +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "" + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "" + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "" + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "" + +#: app/views/account/_signup_form.rhtml:47 +msgid "Sign up" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "We need to be sure that this is your enterprise" +msgstr "" + +#: app/views/account/activation_question.rhtml:8 +msgid "Answer" +msgstr "" + #: app/views/account/invalid_enterprise_code.rhtml:1 msgid "Invalid enterprise code" msgstr "" @@ -3536,6 +3591,10 @@ msgstr "" msgid "You can login now." msgstr "" +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "" @@ -3548,68 +3607,24 @@ msgstr "" msgid "Logout" msgstr "" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" -msgstr "" - -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." -msgstr "" - -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "" - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." -msgstr "" - -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." -msgstr "" - -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" -msgstr "" - -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 -msgid "Sign up" -msgstr "" - #: app/views/account/activate_enterprise.rhtml:1 -msgid "Register and activate enterprise" +msgid "What user should be the admin of the enterprise page" msgstr "" -#: app/views/account/activate_enterprise.rhtml:5 -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" +#: app/views/account/activate_enterprise.rhtml:7 +msgid "Create new user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" +#: app/views/account/accept_terms.rhtml:4 +msgid "I accept the terms" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "We need to be sure that this is your enterprise" +#: app/views/account/accept_terms.rhtml:5 +msgid "I do NOT accept the terms" msgstr "" #: app/views/account/change_password.rhtml:5 diff --git a/po/noosfero.pot b/po/noosfero.pot index bc1680d..fb3d606 100644 --- a/po/noosfero.pot +++ b/po/noosfero.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -367,7 +367,8 @@ msgstr "" #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "" @@ -445,6 +446,7 @@ msgstr "" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" @@ -1550,7 +1552,7 @@ msgstr "" msgid "Disable search for events" msgstr "" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -1749,15 +1751,15 @@ msgstr "" msgid "Thanks for signing up!" msgstr "" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "" -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "" @@ -3364,50 +3366,24 @@ msgid "" msgstr "" #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" - -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "" - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "" - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "" -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "" -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "" @@ -3428,9 +3404,37 @@ msgid "Send change password procedure by e-mail" msgstr "" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "" +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "" + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "" + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "" @@ -3481,6 +3485,57 @@ msgid "" "environment." msgstr "" +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "" + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "" + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "" + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "" + +#: app/views/account/_signup_form.rhtml:47 +msgid "Sign up" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "" + +#: app/views/account/activation_question.rhtml:3 +msgid "We need to be sure that this is your enterprise" +msgstr "" + +#: app/views/account/activation_question.rhtml:8 +msgid "Answer" +msgstr "" + #: app/views/account/invalid_enterprise_code.rhtml:1 msgid "Invalid enterprise code" msgstr "" @@ -3536,6 +3591,10 @@ msgstr "" msgid "You can login now." msgstr "" +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "" @@ -3548,68 +3607,24 @@ msgstr "" msgid "Logout" msgstr "" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" -msgstr "" - -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." -msgstr "" - -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "" - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." -msgstr "" - -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." -msgstr "" - -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" -msgstr "" - -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 -msgid "Sign up" -msgstr "" - #: app/views/account/activate_enterprise.rhtml:1 -msgid "Register and activate enterprise" +msgid "What user should be the admin of the enterprise page" msgstr "" -#: app/views/account/activate_enterprise.rhtml:5 -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" +#: app/views/account/activate_enterprise.rhtml:7 +msgid "Create new user" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" +#: app/views/account/accept_terms.rhtml:4 +msgid "I accept the terms" msgstr "" -#: app/views/account/activate_enterprise.rhtml:27 -msgid "We need to be sure that this is your enterprise" +#: app/views/account/accept_terms.rhtml:5 +msgid "I do NOT accept the terms" msgstr "" #: app/views/account/change_password.rhtml:5 diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po index af00454..04277cc 100644 --- a/po/pt_BR/noosfero.po +++ b/po/pt_BR/noosfero.po @@ -11,8 +11,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.11.0\n" -"POT-Creation-Date: 2008-07-21 21:21-0300\n" +"Project-Id-Version: noosfero 0.10.3\n" +"POT-Creation-Date: 2008-07-31 19:51-0300\n" "PO-Revision-Date: 2008-07-21 21:46-0300\n" "Last-Translator: Joenio Costa \n" "Language-Team: LANGUAGE \n" @@ -377,7 +377,8 @@ msgstr "Administrador atribui organizações validadoras por região." #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12 -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2 +#: app/views/account/_login_form.rhtml:22 +#: app/views/shared/_change_image.rhtml:2 #: app/views/shared/_select_categories.rhtml:22 msgid "Cancel" msgstr "Cancelar" @@ -455,6 +456,7 @@ msgstr "Pessoas" #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12 #: app/controllers/public/search_controller.rb:137 +#: app/controllers/public/search_controller.rb:198 #: app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Produtos" @@ -1588,7 +1590,7 @@ msgstr "Desabilitar busca por produtos" msgid "Disable search for events" msgstr "Desabilitar buscar por eventos" -#: app/models/environment.rb:197 +#: app/models/environment.rb:214 msgid "Only one Virtual Community can be the default one" msgstr "Apenas uma comunidade virtual pode ser a padrão" @@ -1789,15 +1791,15 @@ msgstr "Nome ou senha incorreto" msgid "Thanks for signing up!" msgstr "Obrigado por se registrar!" -#: app/controllers/public/account_controller.rb:71 +#: app/controllers/public/account_controller.rb:65 msgid "You have been logged out." msgstr "Você saiu do sistema." -#: app/controllers/public/account_controller.rb:82 +#: app/controllers/public/account_controller.rb:76 msgid "Your password has been changed successfully!" msgstr "Sua senha foi alterada com sucesso!" -#: app/controllers/public/account_controller.rb:85 +#: app/controllers/public/account_controller.rb:79 msgid "The supplied current password is incorrect." msgstr "A senha informada está incorreta" @@ -3467,55 +3469,24 @@ msgstr "" "membro desse comunidade virtual." #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4 +#: app/views/account/activate_enterprise.rhtml:15 #: app/views/shared/user_menu.rhtml:54 msgid "Login" msgstr "Entrar" -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you are a registered user, enter your username and password to be " -"authenticated." -msgstr "" -"Se você é um usuário registrado, informe seu login e senha para ser " -"autenticado." - -#: app/views/account/login.rhtml:11 -msgid "To join on this environment, click on \"I want to be an user!\"." -msgstr "" -"Para entrar neste ambiente, clique em \"Quero ser um usuário!\"." - -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13 -msgid "" -"If you forgot your password, click on \"I forgot my password!\" link." -msgstr "" -"Se você esqueceu sua senha, clique no link \"Eu esqueci a minha senha!" -"\"." - -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17 -msgid "Here goes the nickname that you give on the registration." -msgstr "Aqui vai o apelido que você informou no registro." - -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21 -msgid "your password is personal, protect it." -msgstr "sua senha é pessoal, proteja-a." - -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24 -msgid "Log in" -msgstr "Entrar" - -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33 msgid "You can recover your password clicking on this link." msgstr "Você pode recuperar sua senha clicando neste link." -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34 msgid "I forgot my password!" msgstr "Eu esqueci a minha senha!" -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27 msgid "Click here to join to this environment, if you is not already an user." msgstr "Clique aqui para entrar neste ambiente, se voce ainda não é um usurio." -#: app/views/account/login.rhtml:34 +#: app/views/account/login.rhtml:12 msgid "I want to be an user!" msgstr "Quero ser um usuário!" @@ -3539,9 +3510,41 @@ msgid "Send change password procedure by e-mail" msgstr "Mande a mudança da senha pelo e-mail" #: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you are a registered user, enter your username and password to be " +"authenticated." +msgstr "" +"Se você é um usuário registrado, informe seu login e senha para ser " +"autenticado." + +#: app/views/account/login_block.rhtml:13 msgid "To join on this environment, click on \"New user\"." msgstr "Para entrar neste ambiente, clique em \"Novo usuário\"." +#: app/views/account/login_block.rhtml:13 +#: app/views/account/_login_form.rhtml:3 +msgid "" +"If you forgot your password, click on \"I forgot my password!\" link." +msgstr "" +"Se você esqueceu sua senha, clique no link \"Eu esqueci a minha senha!" +"\"." + +#: app/views/account/login_block.rhtml:17 +#: app/views/account/_login_form.rhtml:7 +msgid "Here goes the nickname that you give on the registration." +msgstr "Aqui vai o apelido que você informou no registro." + +#: app/views/account/login_block.rhtml:21 +#: app/views/account/_login_form.rhtml:12 +msgid "your password is personal, protect it." +msgstr "sua senha é pessoal, proteja-a." + +#: app/views/account/login_block.rhtml:24 +#: app/views/account/_login_form.rhtml:21 +msgid "Log in" +msgstr "Entrar" + #: app/views/account/login_block.rhtml:25 msgid "New user" msgstr "Novo usuário" @@ -3594,6 +3597,62 @@ msgstr "" "É sempre uma boa idéia fazer logout quando você terminar de usar a " "comunidade virtual." +#: app/views/account/_signup_form.rhtml:1 +msgid "Register" +msgstr "Registrar" + +#: app/views/account/_signup_form.rhtml:5 +msgid "" +"Fill all this fields to join in this environment.

If you forgot your " +"password, do not create a new account, click on the \"I forgot my " +"password!\" link. ;-)" +msgstr "" +"Preencha todos os campos para entrar neste ambiente.

Se você esqueceu sua " +"senha, não crie uma nova conta, clique no link \"Eu esqueci minha senha!\". ;-)" + +#: app/views/account/_signup_form.rhtml:11 +msgid "\"Username\" is a simple nickname to recognize you on this environment." +msgstr "" +"\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente." + +#: app/views/account/_signup_form.rhtml:16 +msgid "We'll send you an e-mail to validate your registration." +msgstr "Nós iremos lhe enviar um e-mail para validar seu registro." + +#: app/views/account/_signup_form.rhtml:20 +msgid "Do not use a obviously password, but try some unforgettable word." +msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente." + +#: app/views/account/_signup_form.rhtml:24 +msgid "We need to be sure that you wrote correctly your password." +msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente." + +#: app/views/account/_signup_form.rhtml:35 +msgid "I accept the terms of use" +msgstr "Eu aceito os termos de uso" + +#: app/views/account/_signup_form.rhtml:47 +msgid "Sign up" +msgstr "Registre-se." + +#: app/views/account/activation_question.rhtml:3 +msgid "What year your enterprise was founded?" +msgstr "Qual o ano de fundação do seu empreendimento?" + +#: app/views/account/activation_question.rhtml:3 +msgid "What is the CNPJ of your enterprise?" +msgstr "Qual o CNPJ do seu empreendimento?" + +#: app/views/account/activation_question.rhtml:3 +msgid "We need to be sure that this is your enterprise" +msgstr "Nós precisamos ter certeza que este empreendimento é seu" + +#: app/views/account/activation_question.rhtml:8 +#, fuzzy +msgid "Answer" +msgstr "usuário" + #: app/views/account/invalid_enterprise_code.rhtml:1 msgid "Invalid enterprise code" msgstr "Código de empreendimento inválido" @@ -3656,6 +3715,11 @@ msgstr "%s, sua nova senha foi alterada com sucesso." msgid "You can login now." msgstr "Você pode logar agora." +#: app/views/account/_login_form.rhtml:3 +msgid "To join on this environment, click on \"I want to be an user!\"." +msgstr "" +"Para entrar neste ambiente, clique em \"Quero ser um usuário!\"." + #: app/views/account/user_info.rhtml:3 msgid "Logged in as %s" msgstr "Identificado(a) como %s" @@ -3668,76 +3732,28 @@ msgstr "Usuário desde %{month}/%{year}" msgid "Logout" msgstr "Sair" -#: app/views/account/signup.rhtml:1 -msgid "Register" -msgstr "Registrar" - -#: app/views/account/signup.rhtml:5 -msgid "" -"Fill all this fields to join in this environment.

If you forgot your " -"password, do not create a new account, click on the \"I forgot my " -"password!\" link. ;-)" +#: app/views/account/activate_enterprise.rhtml:1 +msgid "What user should be the admin of the enterprise page" msgstr "" -"Preencha todos os campos para entrar neste ambiente.

Se você esqueceu sua " -"senha, não crie uma nova conta, clique no link \"Eu esqueci minha senha!\". ;-)" -#: app/views/account/signup.rhtml:11 -#: app/views/account/activate_enterprise.rhtml:11 -msgid "\"Username\" is a simple nickname to recognize you on this environment." +#: app/views/account/activate_enterprise.rhtml:6 +msgid "Already have user" msgstr "" -"\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente." -#: app/views/account/signup.rhtml:16 -#: app/views/account/activate_enterprise.rhtml:16 -msgid "We'll send you an e-mail to validate your registration." -msgstr "Nós iremos lhe enviar um e-mail para validar seu registro." - -#: app/views/account/signup.rhtml:20 -#: app/views/account/activate_enterprise.rhtml:20 -msgid "Do not use a obviously password, but try some unforgettable word." -msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente." - -#: app/views/account/signup.rhtml:24 -#: app/views/account/activate_enterprise.rhtml:24 -msgid "We need to be sure that you wrote correctly your password." -msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente." +#: app/views/account/activate_enterprise.rhtml:7 +#, fuzzy +msgid "Create new user" +msgstr "Criar nova comunidade" -#: app/views/account/signup.rhtml:35 -#: app/views/account/activate_enterprise.rhtml:37 -msgid "I accept the terms of use" +#: app/views/account/accept_terms.rhtml:4 +#, fuzzy +msgid "I accept the terms" msgstr "Eu aceito os termos de uso" -#: app/views/account/signup.rhtml:40 -#: app/views/account/activate_enterprise.rhtml:42 -msgid "Sign up" -msgstr "Registre-se." - -#: app/views/account/activate_enterprise.rhtml:1 -msgid "Register and activate enterprise" -msgstr "Registrar e ativar empreendimento" - -#: app/views/account/activate_enterprise.rhtml:5 -msgid "" -"Fill all this fields to activate your enterprise and join in this " -"environment.

If you forgot your password, do not create a new account, " -"click on the \"I forgot my password!\" link. ;-)" -msgstr "" -"Preencha todos os campos para ativar seu empreendimento e entrar neste " -"ambiente.

Se você esqueceu sua senha, não crie uma nova conta, clique no " -"link \"Eu esqueci minha senha!\". ;-)" - -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What year your enterprise was founded?" -msgstr "Qual o ano de fundação do seu empreendimento?" - -#: app/views/account/activate_enterprise.rhtml:27 -msgid "What is the CNPJ of your enterprise?" -msgstr "Qual o CNPJ do seu empreendimento?" - -#: app/views/account/activate_enterprise.rhtml:27 -msgid "We need to be sure that this is your enterprise" -msgstr "Nós precisamos ter certeza que este empreendimento é seu" +#: app/views/account/accept_terms.rhtml:5 +#, fuzzy +msgid "I do NOT accept the terms" +msgstr "Eu aceito os termos de uso" #: app/views/account/change_password.rhtml:5 msgid "Current password" @@ -3928,10 +3944,10 @@ msgid "" "methodology, restrictions to the types of organizations the organization " "validates etc." msgstr "" -"Informações de validação são as informações que as organizações verão " -"sobre como sua organização processa as validações de organizações que ela " -"recebe: metodologia de validação, restrição de tipos de organizações que " -"a organização valida etc." +"Informações de validação são as informações que as organizações verão sobre " +"como sua organização processa as validações de organizações que ela recebe: " +"metodologia de validação, restrição de tipos de organizações que a " +"organização valida etc." #: lib/zen3_terminology.rb:36 msgid "Here all all %s's organizations." @@ -3961,6 +3977,18 @@ msgstr "Um projeto FBES" msgid "Developed by Colivre" msgstr "Desenvolvimento Colivre" +#~ msgid "Register and activate enterprise" +#~ msgstr "Registrar e ativar empreendimento" + +#~ msgid "" +#~ "Fill all this fields to activate your enterprise and join in this " +#~ "environment.

If you forgot your password, do not create a new account, " +#~ "click on the \"I forgot my password!\" link. ;-)" +#~ msgstr "" +#~ "Preencha todos os campos para ativar seu empreendimento e entrar neste " +#~ "ambiente.

Se você esqueceu sua senha, não crie uma nova conta, clique " +#~ "no link \"Eu esqueci minha senha!\". ;-)" + #~ msgid "Some feature" #~ msgstr "Alguma funcionalidade" -- libgit2 0.21.2