Download as
Browse Code »

Commit 5e5626dbc39acfe5ab7afd5cf939883449fa6656

Authored by JoenioCosta
1 parent 9b36e31a

ActionItem611: updating po files 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/branches/0.10.x@2365 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 6 changed files with 710 additions and 594 deletions   Show diff stats
po/de/noosfero.po
  Diff comments   View file @5e5626d
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.11.0\n"
10   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  9 +"Project-Id-Version: noosfero 0.10.3\n"
  10 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -367,7 +367,8 @@ msgstr &quot;&quot;
367 367 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
368 368 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
369 369 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
370   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  370 +#: app/views/account/_login_form.rhtml:22
  371 +#: app/views/shared/_change_image.rhtml:2
371 372 #: app/views/shared/_select_categories.rhtml:22
372 373 msgid "Cancel"
373 374 msgstr ""
... ... @@ -445,6 +446,7 @@ msgstr &quot;&quot;
445 446  
446 447 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
447 448 #: app/controllers/public/search_controller.rb:137
  449 +#: app/controllers/public/search_controller.rb:198
448 450 #: app/views/search/_sellers_form.rhtml:8
449 451 msgid "Products"
450 452 msgstr ""
... ... @@ -1550,7 +1552,7 @@ msgstr &quot;&quot;
1550 1552 msgid "Disable search for events"
1551 1553 msgstr ""
1552 1554  
1553   -#: app/models/environment.rb:197
  1555 +#: app/models/environment.rb:214
1554 1556 msgid "Only one Virtual Community can be the default one"
1555 1557 msgstr ""
1556 1558  
... ... @@ -1749,15 +1751,15 @@ msgstr &quot;&quot;
1749 1751 msgid "Thanks for signing up!"
1750 1752 msgstr ""
1751 1753  
1752   -#: app/controllers/public/account_controller.rb:71
  1754 +#: app/controllers/public/account_controller.rb:65
1753 1755 msgid "You have been logged out."
1754 1756 msgstr ""
1755 1757  
1756   -#: app/controllers/public/account_controller.rb:82
  1758 +#: app/controllers/public/account_controller.rb:76
1757 1759 msgid "Your password has been changed successfully!"
1758 1760 msgstr ""
1759 1761  
1760   -#: app/controllers/public/account_controller.rb:85
  1762 +#: app/controllers/public/account_controller.rb:79
1761 1763 msgid "The supplied current password is incorrect."
1762 1764 msgstr ""
1763 1765  
... ... @@ -3364,50 +3366,24 @@ msgid &quot;&quot;
3364 3366 msgstr ""
3365 3367  
3366 3368 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3369 +#: app/views/account/activate_enterprise.rhtml:15
3367 3370 #: app/views/shared/user_menu.rhtml:54
3368 3371 msgid "Login"
3369 3372 msgstr ""
3370 3373  
3371   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3372   -msgid ""
3373   -"If you are a registered user, enter your username and password to be "
3374   -"authenticated."
3375   -msgstr ""
3376   -
3377   -#: app/views/account/login.rhtml:11
3378   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3379   -msgstr ""
3380   -
3381   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3382   -msgid ""
3383   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3384   -msgstr ""
3385   -
3386   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3387   -msgid "Here goes the nickname that you give on the registration."
3388   -msgstr ""
3389   -
3390   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3391   -msgid "your password is personal, protect it."
3392   -msgstr ""
3393   -
3394   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3395   -msgid "Log in"
3396   -msgstr ""
3397   -
3398   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3374 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3399 3375 msgid "You can recover your password clicking on this link."
3400 3376 msgstr ""
3401 3377  
3402   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3378 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3403 3379 msgid "I forgot my password!"
3404 3380 msgstr ""
3405 3381  
3406   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3382 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3407 3383 msgid "Click here to join to this environment, if you is not already an user."
3408 3384 msgstr ""
3409 3385  
3410   -#: app/views/account/login.rhtml:34
  3386 +#: app/views/account/login.rhtml:12
3411 3387 msgid "I want to be an user!"
3412 3388 msgstr ""
3413 3389  
... ... @@ -3428,9 +3404,37 @@ msgid &quot;Send change password procedure by e-mail&quot;
3428 3404 msgstr ""
3429 3405  
3430 3406 #: app/views/account/login_block.rhtml:13
  3407 +#: app/views/account/_login_form.rhtml:3
  3408 +msgid ""
  3409 +"If you are a registered user, enter your username and password to be "
  3410 +"authenticated."
  3411 +msgstr ""
  3412 +
  3413 +#: app/views/account/login_block.rhtml:13
3431 3414 msgid "To join on this environment, click on \"<b>New user</b>\"."
3432 3415 msgstr ""
3433 3416  
  3417 +#: app/views/account/login_block.rhtml:13
  3418 +#: app/views/account/_login_form.rhtml:3
  3419 +msgid ""
  3420 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3421 +msgstr ""
  3422 +
  3423 +#: app/views/account/login_block.rhtml:17
  3424 +#: app/views/account/_login_form.rhtml:7
  3425 +msgid "Here goes the nickname that you give on the registration."
  3426 +msgstr ""
  3427 +
  3428 +#: app/views/account/login_block.rhtml:21
  3429 +#: app/views/account/_login_form.rhtml:12
  3430 +msgid "your password is personal, protect it."
  3431 +msgstr ""
  3432 +
  3433 +#: app/views/account/login_block.rhtml:24
  3434 +#: app/views/account/_login_form.rhtml:21
  3435 +msgid "Log in"
  3436 +msgstr ""
  3437 +
3434 3438 #: app/views/account/login_block.rhtml:25
3435 3439 msgid "New user"
3436 3440 msgstr ""
... ... @@ -3481,6 +3485,57 @@ msgid &quot;&quot;
3481 3485 "environment."
3482 3486 msgstr ""
3483 3487  
  3488 +#: app/views/account/_signup_form.rhtml:1
  3489 +msgid "Register"
  3490 +msgstr ""
  3491 +
  3492 +#: app/views/account/_signup_form.rhtml:5
  3493 +msgid ""
  3494 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3495 +"password, do not create a new account, click on the \"<b>I forgot my "
  3496 +"password!</b>\" link. ;-)"
  3497 +msgstr ""
  3498 +
  3499 +#: app/views/account/_signup_form.rhtml:11
  3500 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3501 +msgstr ""
  3502 +
  3503 +#: app/views/account/_signup_form.rhtml:16
  3504 +msgid "We'll send you an e-mail to validate your registration."
  3505 +msgstr ""
  3506 +
  3507 +#: app/views/account/_signup_form.rhtml:20
  3508 +msgid "Do not use a obviously password, but try some unforgettable word."
  3509 +msgstr ""
  3510 +
  3511 +#: app/views/account/_signup_form.rhtml:24
  3512 +msgid "We need to be sure that you wrote correctly your password."
  3513 +msgstr ""
  3514 +
  3515 +#: app/views/account/_signup_form.rhtml:35
  3516 +msgid "I accept the terms of use"
  3517 +msgstr ""
  3518 +
  3519 +#: app/views/account/_signup_form.rhtml:47
  3520 +msgid "Sign up"
  3521 +msgstr ""
  3522 +
  3523 +#: app/views/account/activation_question.rhtml:3
  3524 +msgid "What year your enterprise was founded?"
  3525 +msgstr ""
  3526 +
  3527 +#: app/views/account/activation_question.rhtml:3
  3528 +msgid "What is the CNPJ of your enterprise?"
  3529 +msgstr ""
  3530 +
  3531 +#: app/views/account/activation_question.rhtml:3
  3532 +msgid "We need to be sure that this is your enterprise"
  3533 +msgstr ""
  3534 +
  3535 +#: app/views/account/activation_question.rhtml:8
  3536 +msgid "Answer"
  3537 +msgstr ""
  3538 +
3484 3539 #: app/views/account/invalid_enterprise_code.rhtml:1
3485 3540 msgid "Invalid enterprise code"
3486 3541 msgstr ""
... ... @@ -3536,6 +3591,10 @@ msgstr &quot;&quot;
3536 3591 msgid "You can <a href='%s'>login</a> now."
3537 3592 msgstr ""
3538 3593  
  3594 +#: app/views/account/_login_form.rhtml:3
  3595 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3596 +msgstr ""
  3597 +
3539 3598 #: app/views/account/user_info.rhtml:3
3540 3599 msgid "Logged in as %s"
3541 3600 msgstr ""
... ... @@ -3548,68 +3607,24 @@ msgstr &quot;&quot;
3548 3607 msgid "Logout"
3549 3608 msgstr ""
3550 3609  
3551   -#: app/views/account/signup.rhtml:1
3552   -msgid "Register"
3553   -msgstr ""
3554   -
3555   -#: app/views/account/signup.rhtml:5
3556   -msgid ""
3557   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3558   -"password, do not create a new account, click on the \"<b>I forgot my "
3559   -"password!</b>\" link. ;-)"
3560   -msgstr ""
3561   -
3562   -#: app/views/account/signup.rhtml:11
3563   -#: app/views/account/activate_enterprise.rhtml:11
3564   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
3565   -msgstr ""
3566   -
3567   -#: app/views/account/signup.rhtml:16
3568   -#: app/views/account/activate_enterprise.rhtml:16
3569   -msgid "We'll send you an e-mail to validate your registration."
3570   -msgstr ""
3571   -
3572   -#: app/views/account/signup.rhtml:20
3573   -#: app/views/account/activate_enterprise.rhtml:20
3574   -msgid "Do not use a obviously password, but try some unforgettable word."
3575   -msgstr ""
3576   -
3577   -#: app/views/account/signup.rhtml:24
3578   -#: app/views/account/activate_enterprise.rhtml:24
3579   -msgid "We need to be sure that you wrote correctly your password."
3580   -msgstr ""
3581   -
3582   -#: app/views/account/signup.rhtml:35
3583   -#: app/views/account/activate_enterprise.rhtml:37
3584   -msgid "I accept the terms of use"
3585   -msgstr ""
3586   -
3587   -#: app/views/account/signup.rhtml:40
3588   -#: app/views/account/activate_enterprise.rhtml:42
3589   -msgid "Sign up"
3590   -msgstr ""
3591   -
3592 3610 #: app/views/account/activate_enterprise.rhtml:1
3593   -msgid "Register and activate enterprise"
  3611 +msgid "What user should be the admin of the enterprise page"
3594 3612 msgstr ""
3595 3613  
3596   -#: app/views/account/activate_enterprise.rhtml:5
3597   -msgid ""
3598   -"Fill all this fields to activate your enterprise and join in this "
3599   -"environment.<p/>If you forgot your password, do not create a new account, "
3600   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
  3614 +#: app/views/account/activate_enterprise.rhtml:6
  3615 +msgid "Already have user"
3601 3616 msgstr ""
3602 3617  
3603   -#: app/views/account/activate_enterprise.rhtml:27
3604   -msgid "What year your enterprise was founded?"
  3618 +#: app/views/account/activate_enterprise.rhtml:7
  3619 +msgid "Create new user"
3605 3620 msgstr ""
3606 3621  
3607   -#: app/views/account/activate_enterprise.rhtml:27
3608   -msgid "What is the CNPJ of your enterprise?"
  3622 +#: app/views/account/accept_terms.rhtml:4
  3623 +msgid "I accept the terms"
3609 3624 msgstr ""
3610 3625  
3611   -#: app/views/account/activate_enterprise.rhtml:27
3612   -msgid "We need to be sure that this is your enterprise"
  3626 +#: app/views/account/accept_terms.rhtml:5
  3627 +msgid "I do NOT accept the terms"
3613 3628 msgstr ""
3614 3629  
3615 3630 #: app/views/account/change_password.rhtml:5
... ...
po/fr/noosfero.po
  Diff comments   View file @5e5626d
... ... @@ -5,8 +5,8 @@
5 5 #
6 6 msgid ""
7 7 msgstr ""
8   -"Project-Id-Version: noosfero 0.11.0\n"
9   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  8 +"Project-Id-Version: noosfero 0.10.3\n"
  9 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
10 10 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
11 11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
12 12 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -390,7 +390,8 @@ msgstr &quot;Les validateurs sont assignés par région par les administrateurs.&quot;
390 390 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
391 391 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
392 392 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
393   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  393 +#: app/views/account/_login_form.rhtml:22
  394 +#: app/views/shared/_change_image.rhtml:2
394 395 #: app/views/shared/_select_categories.rhtml:22
395 396 msgid "Cancel"
396 397 msgstr "Annuler"
... ... @@ -472,6 +473,7 @@ msgstr &quot;Personnes&quot;
472 473  
473 474 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
474 475 #: app/controllers/public/search_controller.rb:137
  476 +#: app/controllers/public/search_controller.rb:198
475 477 #: app/views/search/_sellers_form.rhtml:8
476 478 msgid "Products"
477 479 msgstr "Produits"
... ... @@ -1704,7 +1706,7 @@ msgstr &quot;&quot;
1704 1706 msgid "Disable search for events"
1705 1707 msgstr "Rechercher :"
1706 1708  
1707   -#: app/models/environment.rb:197
  1709 +#: app/models/environment.rb:214
1708 1710 msgid "Only one Virtual Community can be the default one"
1709 1711 msgstr "Seule une CoVi peut être celle par défaut"
1710 1712  
... ... @@ -1916,15 +1918,15 @@ msgstr &quot;Identifiant ou mot de passe incorrect&quot;
1916 1918 msgid "Thanks for signing up!"
1917 1919 msgstr "Merci de vous être inscrit(e) !"
1918 1920  
1919   -#: app/controllers/public/account_controller.rb:71
  1921 +#: app/controllers/public/account_controller.rb:65
1920 1922 msgid "You have been logged out."
1921 1923 msgstr "Vous avez été déconnecté(e)."
1922 1924  
1923   -#: app/controllers/public/account_controller.rb:82
  1925 +#: app/controllers/public/account_controller.rb:76
1924 1926 msgid "Your password has been changed successfully!"
1925 1927 msgstr "Votre mot de passe a bien été modifié !"
1926 1928  
1927   -#: app/controllers/public/account_controller.rb:85
  1929 +#: app/controllers/public/account_controller.rb:79
1928 1930 msgid "The supplied current password is incorrect."
1929 1931 msgstr "Le mot de passe actuel fourni est incorrect."
1930 1932  
... ... @@ -3680,61 +3682,26 @@ msgstr &quot;&quot;
3680 3682 "pour devenir membre de cette communauté."
3681 3683  
3682 3684 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3685 +#: app/views/account/activate_enterprise.rhtml:15
3683 3686 #: app/views/shared/user_menu.rhtml:54
3684 3687 msgid "Login"
3685 3688 msgstr "Connexion"
3686 3689  
3687   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3688   -msgid ""
3689   -"If you are a registered user, enter your username and password to be "
3690   -"authenticated."
3691   -msgstr ""
3692   -"Si vous êtes un utilisateur enregistré, entrez vos identifiant et mot de "
3693   -"passe pour être authentifié(e)."
3694   -
3695   -# 1- Verify consistency between translations.
3696   -# 2- In English "an user" -> "a user" Cf. http://forum.wordreference.com/showthread.php?t=480322
3697   -#
3698   -#: app/views/account/login.rhtml:11
3699   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3700   -msgstr ""
3701   -"Pour rejoindre cette communauté, cliquez sur \"<b>Je rejoins cette "
3702   -"communauté !</b>\"."
3703   -
3704   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3705   -msgid ""
3706   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3707   -msgstr ""
3708   -"Si vous avez oublié votre mot de passe, cliquez sur le lien «<b>J'ai oublié "
3709   -"mon mot de passe !</b>»."
3710   -
3711   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3712   -msgid "Here goes the nickname that you give on the registration."
3713   -msgstr "Ici, le nom que vous avez donné à l'enregistrement."
3714   -
3715   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3716   -msgid "your password is personal, protect it."
3717   -msgstr "votre mot de passe est personnel, protégez-le."
3718   -
3719   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3720   -msgid "Log in"
3721   -msgstr "Se connecter"
3722   -
3723   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3690 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3724 3691 msgid "You can recover your password clicking on this link."
3725 3692 msgstr "Vous pouvez retrouver votre mot de passe en cliquant sur ce lien."
3726 3693  
3727   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3694 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3728 3695 msgid "I forgot my password!"
3729 3696 msgstr "J'ai oublié mon mot de passe !"
3730 3697  
3731   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3698 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3732 3699 msgid "Click here to join to this environment, if you is not already an user."
3733 3700 msgstr ""
3734 3701 "Cliquez ici pour rejoindre cette communauté, si vous n'en êtes pas déjà "
3735 3702 "membre."
3736 3703  
3737   -#: app/views/account/login.rhtml:34
  3704 +#: app/views/account/login.rhtml:12
3738 3705 msgid "I want to be an user!"
3739 3706 msgstr "Je rejoins cette communauté !"
3740 3707  
... ... @@ -3760,10 +3727,42 @@ msgstr &quot;&quot;
3760 3727 "Envoyer le procédure de changement de mot de passe par courrier électronique"
3761 3728  
3762 3729 #: app/views/account/login_block.rhtml:13
  3730 +#: app/views/account/_login_form.rhtml:3
  3731 +msgid ""
  3732 +"If you are a registered user, enter your username and password to be "
  3733 +"authenticated."
  3734 +msgstr ""
  3735 +"Si vous êtes un utilisateur enregistré, entrez vos identifiant et mot de "
  3736 +"passe pour être authentifié(e)."
  3737 +
  3738 +#: app/views/account/login_block.rhtml:13
3763 3739 msgid "To join on this environment, click on \"<b>New user</b>\"."
3764 3740 msgstr ""
3765 3741 "Pour rejoindre cette communauté, cliquez sur «<b>Nouvel utilisateur</b>»."
3766 3742  
  3743 +#: app/views/account/login_block.rhtml:13
  3744 +#: app/views/account/_login_form.rhtml:3
  3745 +msgid ""
  3746 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3747 +msgstr ""
  3748 +"Si vous avez oublié votre mot de passe, cliquez sur le lien «<b>J'ai oublié "
  3749 +"mon mot de passe !</b>»."
  3750 +
  3751 +#: app/views/account/login_block.rhtml:17
  3752 +#: app/views/account/_login_form.rhtml:7
  3753 +msgid "Here goes the nickname that you give on the registration."
  3754 +msgstr "Ici, le nom que vous avez donné à l'enregistrement."
  3755 +
  3756 +#: app/views/account/login_block.rhtml:21
  3757 +#: app/views/account/_login_form.rhtml:12
  3758 +msgid "your password is personal, protect it."
  3759 +msgstr "votre mot de passe est personnel, protégez-le."
  3760 +
  3761 +#: app/views/account/login_block.rhtml:24
  3762 +#: app/views/account/_login_form.rhtml:21
  3763 +msgid "Log in"
  3764 +msgstr "Se connecter"
  3765 +
3767 3766 #: app/views/account/login_block.rhtml:25
3768 3767 msgid "New user"
3769 3768 msgstr "Nouvel utilisateur"
... ... @@ -3817,6 +3816,72 @@ msgstr &quot;&quot;
3817 3816 "C'est toujours une bonne idée que de se déconnecter explicitement lorsque "
3818 3817 "vous avez terminé d'utiliser l'environnement."
3819 3818  
  3819 +#: app/views/account/_signup_form.rhtml:1
  3820 +msgid "Register"
  3821 +msgstr "S'enregistrer"
  3822 +
  3823 +#: app/views/account/_signup_form.rhtml:5
  3824 +msgid ""
  3825 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3826 +"password, do not create a new account, click on the \"<b>I forgot my "
  3827 +"password!</b>\" link. ;-)"
  3828 +msgstr ""
  3829 +"Remplissez tous ces champs pour rejoindre cette communauté.<p/>Si vous avez "
  3830 +"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
  3831 +"lien «<b>J'ai oublié mon mot de passe</b>»."
  3832 +
  3833 +#: app/views/account/_signup_form.rhtml:11
  3834 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3835 +msgstr ""
  3836 +"«Identifiant» est un simple surnom pour vous reconnaître dans cette "
  3837 +"communauté."
  3838 +
  3839 +#: app/views/account/_signup_form.rhtml:16
  3840 +msgid "We'll send you an e-mail to validate your registration."
  3841 +msgstr ""
  3842 +"Nous vous enverrons un courrier électronique pour valider votre "
  3843 +"enregistrement."
  3844 +
  3845 +#: app/views/account/_signup_form.rhtml:20
  3846 +msgid "Do not use a obviously password, but try some unforgettable word."
  3847 +msgstr ""
  3848 +"Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque "
  3849 +"chose que vous n'oublierez pas."
  3850 +
  3851 +#: app/views/account/_signup_form.rhtml:24
  3852 +msgid "We need to be sure that you wrote correctly your password."
  3853 +msgstr ""
  3854 +"Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
  3855 +
  3856 +#: app/views/account/_signup_form.rhtml:35
  3857 +msgid "I accept the terms of use"
  3858 +msgstr "J'accepte les conditions d'utilisation"
  3859 +
  3860 +# Je ne suis pas sûr de la distinction "sign up" / "register"
  3861 +#: app/views/account/_signup_form.rhtml:47
  3862 +#, fuzzy
  3863 +msgid "Sign up"
  3864 +msgstr "S'enregistrer"
  3865 +
  3866 +#: app/views/account/activation_question.rhtml:3
  3867 +msgid "What year your enterprise was founded?"
  3868 +msgstr ""
  3869 +
  3870 +#: app/views/account/activation_question.rhtml:3
  3871 +msgid "What is the CNPJ of your enterprise?"
  3872 +msgstr ""
  3873 +
  3874 +#: app/views/account/activation_question.rhtml:3
  3875 +#, fuzzy
  3876 +msgid "We need to be sure that this is your enterprise"
  3877 +msgstr ""
  3878 +"Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
  3879 +
  3880 +#: app/views/account/activation_question.rhtml:8
  3881 +#, fuzzy
  3882 +msgid "Answer"
  3883 +msgstr "utilisateur"
  3884 +
3820 3885 #: app/views/account/invalid_enterprise_code.rhtml:1
3821 3886 #, fuzzy
3822 3887 msgid "Invalid enterprise code"
... ... @@ -3881,6 +3946,15 @@ msgstr &quot;%s, votre nouveau mot de passe a bien été installé.&quot;
3881 3946 msgid "You can <a href='%s'>login</a> now."
3882 3947 msgstr "Maintenant, vous pouvez vous <a href='%s'>commecter</a>."
3883 3948  
  3949 +# 1- Verify consistency between translations.
  3950 +# 2- In English "an user" -> "a user" Cf. http://forum.wordreference.com/showthread.php?t=480322
  3951 +#
  3952 +#: app/views/account/_login_form.rhtml:3
  3953 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3954 +msgstr ""
  3955 +"Pour rejoindre cette communauté, cliquez sur \"<b>Je rejoins cette "
  3956 +"communauté !</b>\"."
  3957 +
3884 3958 #: app/views/account/user_info.rhtml:3
3885 3959 msgid "Logged in as %s"
3886 3960 msgstr "Connecté en tant que %s"
... ... @@ -3893,88 +3967,28 @@ msgstr &quot;Utilisateur depuis %{month}/%{year}&quot;
3893 3967 msgid "Logout"
3894 3968 msgstr "Déconnexion"
3895 3969  
3896   -#: app/views/account/signup.rhtml:1
3897   -msgid "Register"
3898   -msgstr "S'enregistrer"
3899   -
3900   -#: app/views/account/signup.rhtml:5
3901   -msgid ""
3902   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3903   -"password, do not create a new account, click on the \"<b>I forgot my "
3904   -"password!</b>\" link. ;-)"
3905   -msgstr ""
3906   -"Remplissez tous ces champs pour rejoindre cette communauté.<p/>Si vous avez "
3907   -"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
3908   -"lien «<b>J'ai oublié mon mot de passe</b>»."
3909   -
3910   -#: app/views/account/signup.rhtml:11
3911   -#: app/views/account/activate_enterprise.rhtml:11
3912   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
3913   -msgstr ""
3914   -"«Identifiant» est un simple surnom pour vous reconnaître dans cette "
3915   -"communauté."
3916   -
3917   -#: app/views/account/signup.rhtml:16
3918   -#: app/views/account/activate_enterprise.rhtml:16
3919   -msgid "We'll send you an e-mail to validate your registration."
3920   -msgstr ""
3921   -"Nous vous enverrons un courrier électronique pour valider votre "
3922   -"enregistrement."
3923   -
3924   -#: app/views/account/signup.rhtml:20
3925   -#: app/views/account/activate_enterprise.rhtml:20
3926   -msgid "Do not use a obviously password, but try some unforgettable word."
  3970 +#: app/views/account/activate_enterprise.rhtml:1
  3971 +msgid "What user should be the admin of the enterprise page"
3927 3972 msgstr ""
3928   -"Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque "
3929   -"chose que vous n'oublierez pas."
3930 3973  
3931   -#: app/views/account/signup.rhtml:24
3932   -#: app/views/account/activate_enterprise.rhtml:24
3933   -msgid "We need to be sure that you wrote correctly your password."
  3974 +#: app/views/account/activate_enterprise.rhtml:6
  3975 +msgid "Already have user"
3934 3976 msgstr ""
3935   -"Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
3936 3977  
3937   -#: app/views/account/signup.rhtml:35
3938   -#: app/views/account/activate_enterprise.rhtml:37
3939   -msgid "I accept the terms of use"
3940   -msgstr "J'accepte les conditions d'utilisation"
3941   -
3942   -# Je ne suis pas sûr de la distinction "sign up" / "register"
3943   -#: app/views/account/signup.rhtml:40
3944   -#: app/views/account/activate_enterprise.rhtml:42
  3978 +#: app/views/account/activate_enterprise.rhtml:7
3945 3979 #, fuzzy
3946   -msgid "Sign up"
3947   -msgstr "S'enregistrer"
3948   -
3949   -#: app/views/account/activate_enterprise.rhtml:1
3950   -#, fuzzy
3951   -msgid "Register and activate enterprise"
3952   -msgstr "Enregistrer une nouvelle entreprise"
  3980 +msgid "Create new user"
  3981 +msgstr "Créer un nouveau groupe"
3953 3982  
3954   -#: app/views/account/activate_enterprise.rhtml:5
  3983 +#: app/views/account/accept_terms.rhtml:4
3955 3984 #, fuzzy
3956   -msgid ""
3957   -"Fill all this fields to activate your enterprise and join in this "
3958   -"environment.<p/>If you forgot your password, do not create a new account, "
3959   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
3960   -msgstr ""
3961   -"Remplissez tous ces champs pour rejoindre cette communauté.<p/>Si vous avez "
3962   -"oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
3963   -"lien «<b>J'ai oublié mon mot de passe</b>»."
3964   -
3965   -#: app/views/account/activate_enterprise.rhtml:27
3966   -msgid "What year your enterprise was founded?"
3967   -msgstr ""
3968   -
3969   -#: app/views/account/activate_enterprise.rhtml:27
3970   -msgid "What is the CNPJ of your enterprise?"
3971   -msgstr ""
  3985 +msgid "I accept the terms"
  3986 +msgstr "J'accepte les conditions d'utilisation"
3972 3987  
3973   -#: app/views/account/activate_enterprise.rhtml:27
  3988 +#: app/views/account/accept_terms.rhtml:5
3974 3989 #, fuzzy
3975   -msgid "We need to be sure that this is your enterprise"
3976   -msgstr ""
3977   -"Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
  3990 +msgid "I do NOT accept the terms"
  3991 +msgstr "J'accepte les conditions d'utilisation"
3978 3992  
3979 3993 #: app/views/account/change_password.rhtml:5
3980 3994 msgid "Current password"
... ... @@ -4222,6 +4236,20 @@ msgstr &quot;Un projet du FBES&quot;
4222 4236 msgid "Developed by Colivre"
4223 4237 msgstr "Développé par Colivre"
4224 4238  
  4239 +#, fuzzy
  4240 +#~ msgid "Register and activate enterprise"
  4241 +#~ msgstr "Enregistrer une nouvelle entreprise"
  4242 +
  4243 +#, fuzzy
  4244 +#~ msgid ""
  4245 +#~ "Fill all this fields to activate your enterprise and join in this "
  4246 +#~ "environment.<p/>If you forgot your password, do not create a new account, "
  4247 +#~ "click on the \"<b>I forgot my password!</b>\" link. ;-)"
  4248 +#~ msgstr ""
  4249 +#~ "Remplissez tous ces champs pour rejoindre cette communauté.<p/>Si vous "
  4250 +#~ "avez oublié votre mot de passe, ne créez pas un nouveau compte, cliquez "
  4251 +#~ "sur le lien «<b>J'ai oublié mon mot de passe</b>»."
  4252 +
4225 4253 #~ msgid "Some feature"
4226 4254 #~ msgstr "Quelques fonctionnalités"
4227 4255  
... ...
po/hy/noosfero.po
  Diff comments   View file @5e5626d
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.11.0\n"
10   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  9 +"Project-Id-Version: noosfero 0.10.3\n"
  10 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -367,7 +367,8 @@ msgstr &quot;&quot;
367 367 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
368 368 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
369 369 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
370   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  370 +#: app/views/account/_login_form.rhtml:22
  371 +#: app/views/shared/_change_image.rhtml:2
371 372 #: app/views/shared/_select_categories.rhtml:22
372 373 msgid "Cancel"
373 374 msgstr ""
... ... @@ -445,6 +446,7 @@ msgstr &quot;&quot;
445 446  
446 447 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
447 448 #: app/controllers/public/search_controller.rb:137
  449 +#: app/controllers/public/search_controller.rb:198
448 450 #: app/views/search/_sellers_form.rhtml:8
449 451 msgid "Products"
450 452 msgstr ""
... ... @@ -1550,7 +1552,7 @@ msgstr &quot;&quot;
1550 1552 msgid "Disable search for events"
1551 1553 msgstr ""
1552 1554  
1553   -#: app/models/environment.rb:197
  1555 +#: app/models/environment.rb:214
1554 1556 msgid "Only one Virtual Community can be the default one"
1555 1557 msgstr ""
1556 1558  
... ... @@ -1749,15 +1751,15 @@ msgstr &quot;&quot;
1749 1751 msgid "Thanks for signing up!"
1750 1752 msgstr ""
1751 1753  
1752   -#: app/controllers/public/account_controller.rb:71
  1754 +#: app/controllers/public/account_controller.rb:65
1753 1755 msgid "You have been logged out."
1754 1756 msgstr ""
1755 1757  
1756   -#: app/controllers/public/account_controller.rb:82
  1758 +#: app/controllers/public/account_controller.rb:76
1757 1759 msgid "Your password has been changed successfully!"
1758 1760 msgstr ""
1759 1761  
1760   -#: app/controllers/public/account_controller.rb:85
  1762 +#: app/controllers/public/account_controller.rb:79
1761 1763 msgid "The supplied current password is incorrect."
1762 1764 msgstr ""
1763 1765  
... ... @@ -3364,50 +3366,24 @@ msgid &quot;&quot;
3364 3366 msgstr ""
3365 3367  
3366 3368 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3369 +#: app/views/account/activate_enterprise.rhtml:15
3367 3370 #: app/views/shared/user_menu.rhtml:54
3368 3371 msgid "Login"
3369 3372 msgstr ""
3370 3373  
3371   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3372   -msgid ""
3373   -"If you are a registered user, enter your username and password to be "
3374   -"authenticated."
3375   -msgstr ""
3376   -
3377   -#: app/views/account/login.rhtml:11
3378   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3379   -msgstr ""
3380   -
3381   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3382   -msgid ""
3383   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3384   -msgstr ""
3385   -
3386   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3387   -msgid "Here goes the nickname that you give on the registration."
3388   -msgstr ""
3389   -
3390   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3391   -msgid "your password is personal, protect it."
3392   -msgstr ""
3393   -
3394   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3395   -msgid "Log in"
3396   -msgstr ""
3397   -
3398   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3374 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3399 3375 msgid "You can recover your password clicking on this link."
3400 3376 msgstr ""
3401 3377  
3402   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3378 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3403 3379 msgid "I forgot my password!"
3404 3380 msgstr ""
3405 3381  
3406   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3382 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3407 3383 msgid "Click here to join to this environment, if you is not already an user."
3408 3384 msgstr ""
3409 3385  
3410   -#: app/views/account/login.rhtml:34
  3386 +#: app/views/account/login.rhtml:12
3411 3387 msgid "I want to be an user!"
3412 3388 msgstr ""
3413 3389  
... ... @@ -3428,9 +3404,37 @@ msgid &quot;Send change password procedure by e-mail&quot;
3428 3404 msgstr ""
3429 3405  
3430 3406 #: app/views/account/login_block.rhtml:13
  3407 +#: app/views/account/_login_form.rhtml:3
  3408 +msgid ""
  3409 +"If you are a registered user, enter your username and password to be "
  3410 +"authenticated."
  3411 +msgstr ""
  3412 +
  3413 +#: app/views/account/login_block.rhtml:13
3431 3414 msgid "To join on this environment, click on \"<b>New user</b>\"."
3432 3415 msgstr ""
3433 3416  
  3417 +#: app/views/account/login_block.rhtml:13
  3418 +#: app/views/account/_login_form.rhtml:3
  3419 +msgid ""
  3420 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3421 +msgstr ""
  3422 +
  3423 +#: app/views/account/login_block.rhtml:17
  3424 +#: app/views/account/_login_form.rhtml:7
  3425 +msgid "Here goes the nickname that you give on the registration."
  3426 +msgstr ""
  3427 +
  3428 +#: app/views/account/login_block.rhtml:21
  3429 +#: app/views/account/_login_form.rhtml:12
  3430 +msgid "your password is personal, protect it."
  3431 +msgstr ""
  3432 +
  3433 +#: app/views/account/login_block.rhtml:24
  3434 +#: app/views/account/_login_form.rhtml:21
  3435 +msgid "Log in"
  3436 +msgstr ""
  3437 +
3434 3438 #: app/views/account/login_block.rhtml:25
3435 3439 msgid "New user"
3436 3440 msgstr ""
... ... @@ -3481,6 +3485,57 @@ msgid &quot;&quot;
3481 3485 "environment."
3482 3486 msgstr ""
3483 3487  
  3488 +#: app/views/account/_signup_form.rhtml:1
  3489 +msgid "Register"
  3490 +msgstr ""
  3491 +
  3492 +#: app/views/account/_signup_form.rhtml:5
  3493 +msgid ""
  3494 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3495 +"password, do not create a new account, click on the \"<b>I forgot my "
  3496 +"password!</b>\" link. ;-)"
  3497 +msgstr ""
  3498 +
  3499 +#: app/views/account/_signup_form.rhtml:11
  3500 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3501 +msgstr ""
  3502 +
  3503 +#: app/views/account/_signup_form.rhtml:16
  3504 +msgid "We'll send you an e-mail to validate your registration."
  3505 +msgstr ""
  3506 +
  3507 +#: app/views/account/_signup_form.rhtml:20
  3508 +msgid "Do not use a obviously password, but try some unforgettable word."
  3509 +msgstr ""
  3510 +
  3511 +#: app/views/account/_signup_form.rhtml:24
  3512 +msgid "We need to be sure that you wrote correctly your password."
  3513 +msgstr ""
  3514 +
  3515 +#: app/views/account/_signup_form.rhtml:35
  3516 +msgid "I accept the terms of use"
  3517 +msgstr ""
  3518 +
  3519 +#: app/views/account/_signup_form.rhtml:47
  3520 +msgid "Sign up"
  3521 +msgstr ""
  3522 +
  3523 +#: app/views/account/activation_question.rhtml:3
  3524 +msgid "What year your enterprise was founded?"
  3525 +msgstr ""
  3526 +
  3527 +#: app/views/account/activation_question.rhtml:3
  3528 +msgid "What is the CNPJ of your enterprise?"
  3529 +msgstr ""
  3530 +
  3531 +#: app/views/account/activation_question.rhtml:3
  3532 +msgid "We need to be sure that this is your enterprise"
  3533 +msgstr ""
  3534 +
  3535 +#: app/views/account/activation_question.rhtml:8
  3536 +msgid "Answer"
  3537 +msgstr ""
  3538 +
3484 3539 #: app/views/account/invalid_enterprise_code.rhtml:1
3485 3540 msgid "Invalid enterprise code"
3486 3541 msgstr ""
... ... @@ -3536,6 +3591,10 @@ msgstr &quot;&quot;
3536 3591 msgid "You can <a href='%s'>login</a> now."
3537 3592 msgstr ""
3538 3593  
  3594 +#: app/views/account/_login_form.rhtml:3
  3595 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3596 +msgstr ""
  3597 +
3539 3598 #: app/views/account/user_info.rhtml:3
3540 3599 msgid "Logged in as %s"
3541 3600 msgstr ""
... ... @@ -3548,68 +3607,24 @@ msgstr &quot;&quot;
3548 3607 msgid "Logout"
3549 3608 msgstr ""
3550 3609  
3551   -#: app/views/account/signup.rhtml:1
3552   -msgid "Register"
3553   -msgstr ""
3554   -
3555   -#: app/views/account/signup.rhtml:5
3556   -msgid ""
3557   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3558   -"password, do not create a new account, click on the \"<b>I forgot my "
3559   -"password!</b>\" link. ;-)"
3560   -msgstr ""
3561   -
3562   -#: app/views/account/signup.rhtml:11
3563   -#: app/views/account/activate_enterprise.rhtml:11
3564   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
3565   -msgstr ""
3566   -
3567   -#: app/views/account/signup.rhtml:16
3568   -#: app/views/account/activate_enterprise.rhtml:16
3569   -msgid "We'll send you an e-mail to validate your registration."
3570   -msgstr ""
3571   -
3572   -#: app/views/account/signup.rhtml:20
3573   -#: app/views/account/activate_enterprise.rhtml:20
3574   -msgid "Do not use a obviously password, but try some unforgettable word."
3575   -msgstr ""
3576   -
3577   -#: app/views/account/signup.rhtml:24
3578   -#: app/views/account/activate_enterprise.rhtml:24
3579   -msgid "We need to be sure that you wrote correctly your password."
3580   -msgstr ""
3581   -
3582   -#: app/views/account/signup.rhtml:35
3583   -#: app/views/account/activate_enterprise.rhtml:37
3584   -msgid "I accept the terms of use"
3585   -msgstr ""
3586   -
3587   -#: app/views/account/signup.rhtml:40
3588   -#: app/views/account/activate_enterprise.rhtml:42
3589   -msgid "Sign up"
3590   -msgstr ""
3591   -
3592 3610 #: app/views/account/activate_enterprise.rhtml:1
3593   -msgid "Register and activate enterprise"
  3611 +msgid "What user should be the admin of the enterprise page"
3594 3612 msgstr ""
3595 3613  
3596   -#: app/views/account/activate_enterprise.rhtml:5
3597   -msgid ""
3598   -"Fill all this fields to activate your enterprise and join in this "
3599   -"environment.<p/>If you forgot your password, do not create a new account, "
3600   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
  3614 +#: app/views/account/activate_enterprise.rhtml:6
  3615 +msgid "Already have user"
3601 3616 msgstr ""
3602 3617  
3603   -#: app/views/account/activate_enterprise.rhtml:27
3604   -msgid "What year your enterprise was founded?"
  3618 +#: app/views/account/activate_enterprise.rhtml:7
  3619 +msgid "Create new user"
3605 3620 msgstr ""
3606 3621  
3607   -#: app/views/account/activate_enterprise.rhtml:27
3608   -msgid "What is the CNPJ of your enterprise?"
  3622 +#: app/views/account/accept_terms.rhtml:4
  3623 +msgid "I accept the terms"
3609 3624 msgstr ""
3610 3625  
3611   -#: app/views/account/activate_enterprise.rhtml:27
3612   -msgid "We need to be sure that this is your enterprise"
  3626 +#: app/views/account/accept_terms.rhtml:5
  3627 +msgid "I do NOT accept the terms"
3613 3628 msgstr ""
3614 3629  
3615 3630 #: app/views/account/change_password.rhtml:5
... ...
po/nl/noosfero.po
  Diff comments   View file @5e5626d
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.11.0\n"
10   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  9 +"Project-Id-Version: noosfero 0.10.3\n"
  10 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -367,7 +367,8 @@ msgstr &quot;&quot;
367 367 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
368 368 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
369 369 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
370   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  370 +#: app/views/account/_login_form.rhtml:22
  371 +#: app/views/shared/_change_image.rhtml:2
371 372 #: app/views/shared/_select_categories.rhtml:22
372 373 msgid "Cancel"
373 374 msgstr ""
... ... @@ -445,6 +446,7 @@ msgstr &quot;&quot;
445 446  
446 447 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
447 448 #: app/controllers/public/search_controller.rb:137
  449 +#: app/controllers/public/search_controller.rb:198
448 450 #: app/views/search/_sellers_form.rhtml:8
449 451 msgid "Products"
450 452 msgstr ""
... ... @@ -1550,7 +1552,7 @@ msgstr &quot;&quot;
1550 1552 msgid "Disable search for events"
1551 1553 msgstr ""
1552 1554  
1553   -#: app/models/environment.rb:197
  1555 +#: app/models/environment.rb:214
1554 1556 msgid "Only one Virtual Community can be the default one"
1555 1557 msgstr ""
1556 1558  
... ... @@ -1749,15 +1751,15 @@ msgstr &quot;&quot;
1749 1751 msgid "Thanks for signing up!"
1750 1752 msgstr ""
1751 1753  
1752   -#: app/controllers/public/account_controller.rb:71
  1754 +#: app/controllers/public/account_controller.rb:65
1753 1755 msgid "You have been logged out."
1754 1756 msgstr ""
1755 1757  
1756   -#: app/controllers/public/account_controller.rb:82
  1758 +#: app/controllers/public/account_controller.rb:76
1757 1759 msgid "Your password has been changed successfully!"
1758 1760 msgstr ""
1759 1761  
1760   -#: app/controllers/public/account_controller.rb:85
  1762 +#: app/controllers/public/account_controller.rb:79
1761 1763 msgid "The supplied current password is incorrect."
1762 1764 msgstr ""
1763 1765  
... ... @@ -3364,50 +3366,24 @@ msgid &quot;&quot;
3364 3366 msgstr ""
3365 3367  
3366 3368 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3369 +#: app/views/account/activate_enterprise.rhtml:15
3367 3370 #: app/views/shared/user_menu.rhtml:54
3368 3371 msgid "Login"
3369 3372 msgstr ""
3370 3373  
3371   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3372   -msgid ""
3373   -"If you are a registered user, enter your username and password to be "
3374   -"authenticated."
3375   -msgstr ""
3376   -
3377   -#: app/views/account/login.rhtml:11
3378   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3379   -msgstr ""
3380   -
3381   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3382   -msgid ""
3383   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3384   -msgstr ""
3385   -
3386   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3387   -msgid "Here goes the nickname that you give on the registration."
3388   -msgstr ""
3389   -
3390   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3391   -msgid "your password is personal, protect it."
3392   -msgstr ""
3393   -
3394   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3395   -msgid "Log in"
3396   -msgstr ""
3397   -
3398   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3374 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3399 3375 msgid "You can recover your password clicking on this link."
3400 3376 msgstr ""
3401 3377  
3402   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3378 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3403 3379 msgid "I forgot my password!"
3404 3380 msgstr ""
3405 3381  
3406   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3382 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3407 3383 msgid "Click here to join to this environment, if you is not already an user."
3408 3384 msgstr ""
3409 3385  
3410   -#: app/views/account/login.rhtml:34
  3386 +#: app/views/account/login.rhtml:12
3411 3387 msgid "I want to be an user!"
3412 3388 msgstr ""
3413 3389  
... ... @@ -3428,9 +3404,37 @@ msgid &quot;Send change password procedure by e-mail&quot;
3428 3404 msgstr ""
3429 3405  
3430 3406 #: app/views/account/login_block.rhtml:13
  3407 +#: app/views/account/_login_form.rhtml:3
  3408 +msgid ""
  3409 +"If you are a registered user, enter your username and password to be "
  3410 +"authenticated."
  3411 +msgstr ""
  3412 +
  3413 +#: app/views/account/login_block.rhtml:13
3431 3414 msgid "To join on this environment, click on \"<b>New user</b>\"."
3432 3415 msgstr ""
3433 3416  
  3417 +#: app/views/account/login_block.rhtml:13
  3418 +#: app/views/account/_login_form.rhtml:3
  3419 +msgid ""
  3420 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3421 +msgstr ""
  3422 +
  3423 +#: app/views/account/login_block.rhtml:17
  3424 +#: app/views/account/_login_form.rhtml:7
  3425 +msgid "Here goes the nickname that you give on the registration."
  3426 +msgstr ""
  3427 +
  3428 +#: app/views/account/login_block.rhtml:21
  3429 +#: app/views/account/_login_form.rhtml:12
  3430 +msgid "your password is personal, protect it."
  3431 +msgstr ""
  3432 +
  3433 +#: app/views/account/login_block.rhtml:24
  3434 +#: app/views/account/_login_form.rhtml:21
  3435 +msgid "Log in"
  3436 +msgstr ""
  3437 +
3434 3438 #: app/views/account/login_block.rhtml:25
3435 3439 msgid "New user"
3436 3440 msgstr ""
... ... @@ -3481,6 +3485,57 @@ msgid &quot;&quot;
3481 3485 "environment."
3482 3486 msgstr ""
3483 3487  
  3488 +#: app/views/account/_signup_form.rhtml:1
  3489 +msgid "Register"
  3490 +msgstr ""
  3491 +
  3492 +#: app/views/account/_signup_form.rhtml:5
  3493 +msgid ""
  3494 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3495 +"password, do not create a new account, click on the \"<b>I forgot my "
  3496 +"password!</b>\" link. ;-)"
  3497 +msgstr ""
  3498 +
  3499 +#: app/views/account/_signup_form.rhtml:11
  3500 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3501 +msgstr ""
  3502 +
  3503 +#: app/views/account/_signup_form.rhtml:16
  3504 +msgid "We'll send you an e-mail to validate your registration."
  3505 +msgstr ""
  3506 +
  3507 +#: app/views/account/_signup_form.rhtml:20
  3508 +msgid "Do not use a obviously password, but try some unforgettable word."
  3509 +msgstr ""
  3510 +
  3511 +#: app/views/account/_signup_form.rhtml:24
  3512 +msgid "We need to be sure that you wrote correctly your password."
  3513 +msgstr ""
  3514 +
  3515 +#: app/views/account/_signup_form.rhtml:35
  3516 +msgid "I accept the terms of use"
  3517 +msgstr ""
  3518 +
  3519 +#: app/views/account/_signup_form.rhtml:47
  3520 +msgid "Sign up"
  3521 +msgstr ""
  3522 +
  3523 +#: app/views/account/activation_question.rhtml:3
  3524 +msgid "What year your enterprise was founded?"
  3525 +msgstr ""
  3526 +
  3527 +#: app/views/account/activation_question.rhtml:3
  3528 +msgid "What is the CNPJ of your enterprise?"
  3529 +msgstr ""
  3530 +
  3531 +#: app/views/account/activation_question.rhtml:3
  3532 +msgid "We need to be sure that this is your enterprise"
  3533 +msgstr ""
  3534 +
  3535 +#: app/views/account/activation_question.rhtml:8
  3536 +msgid "Answer"
  3537 +msgstr ""
  3538 +
3484 3539 #: app/views/account/invalid_enterprise_code.rhtml:1
3485 3540 msgid "Invalid enterprise code"
3486 3541 msgstr ""
... ... @@ -3536,6 +3591,10 @@ msgstr &quot;&quot;
3536 3591 msgid "You can <a href='%s'>login</a> now."
3537 3592 msgstr ""
3538 3593  
  3594 +#: app/views/account/_login_form.rhtml:3
  3595 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3596 +msgstr ""
  3597 +
3539 3598 #: app/views/account/user_info.rhtml:3
3540 3599 msgid "Logged in as %s"
3541 3600 msgstr ""
... ... @@ -3548,68 +3607,24 @@ msgstr &quot;&quot;
3548 3607 msgid "Logout"
3549 3608 msgstr ""
3550 3609  
3551   -#: app/views/account/signup.rhtml:1
3552   -msgid "Register"
3553   -msgstr ""
3554   -
3555   -#: app/views/account/signup.rhtml:5
3556   -msgid ""
3557   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3558   -"password, do not create a new account, click on the \"<b>I forgot my "
3559   -"password!</b>\" link. ;-)"
3560   -msgstr ""
3561   -
3562   -#: app/views/account/signup.rhtml:11
3563   -#: app/views/account/activate_enterprise.rhtml:11
3564   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
3565   -msgstr ""
3566   -
3567   -#: app/views/account/signup.rhtml:16
3568   -#: app/views/account/activate_enterprise.rhtml:16
3569   -msgid "We'll send you an e-mail to validate your registration."
3570   -msgstr ""
3571   -
3572   -#: app/views/account/signup.rhtml:20
3573   -#: app/views/account/activate_enterprise.rhtml:20
3574   -msgid "Do not use a obviously password, but try some unforgettable word."
3575   -msgstr ""
3576   -
3577   -#: app/views/account/signup.rhtml:24
3578   -#: app/views/account/activate_enterprise.rhtml:24
3579   -msgid "We need to be sure that you wrote correctly your password."
3580   -msgstr ""
3581   -
3582   -#: app/views/account/signup.rhtml:35
3583   -#: app/views/account/activate_enterprise.rhtml:37
3584   -msgid "I accept the terms of use"
3585   -msgstr ""
3586   -
3587   -#: app/views/account/signup.rhtml:40
3588   -#: app/views/account/activate_enterprise.rhtml:42
3589   -msgid "Sign up"
3590   -msgstr ""
3591   -
3592 3610 #: app/views/account/activate_enterprise.rhtml:1
3593   -msgid "Register and activate enterprise"
  3611 +msgid "What user should be the admin of the enterprise page"
3594 3612 msgstr ""
3595 3613  
3596   -#: app/views/account/activate_enterprise.rhtml:5
3597   -msgid ""
3598   -"Fill all this fields to activate your enterprise and join in this "
3599   -"environment.<p/>If you forgot your password, do not create a new account, "
3600   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
  3614 +#: app/views/account/activate_enterprise.rhtml:6
  3615 +msgid "Already have user"
3601 3616 msgstr ""
3602 3617  
3603   -#: app/views/account/activate_enterprise.rhtml:27
3604   -msgid "What year your enterprise was founded?"
  3618 +#: app/views/account/activate_enterprise.rhtml:7
  3619 +msgid "Create new user"
3605 3620 msgstr ""
3606 3621  
3607   -#: app/views/account/activate_enterprise.rhtml:27
3608   -msgid "What is the CNPJ of your enterprise?"
  3622 +#: app/views/account/accept_terms.rhtml:4
  3623 +msgid "I accept the terms"
3609 3624 msgstr ""
3610 3625  
3611   -#: app/views/account/activate_enterprise.rhtml:27
3612   -msgid "We need to be sure that this is your enterprise"
  3626 +#: app/views/account/accept_terms.rhtml:5
  3627 +msgid "I do NOT accept the terms"
3613 3628 msgstr ""
3614 3629  
3615 3630 #: app/views/account/change_password.rhtml:5
... ...
po/noosfero.pot
  Diff comments   View file @5e5626d
... ... @@ -6,8 +6,8 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"Project-Id-Version: noosfero 0.11.0\n"
10   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  9 +"Project-Id-Version: noosfero 0.10.3\n"
  10 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
11 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -367,7 +367,8 @@ msgstr &quot;&quot;
367 367 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
368 368 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
369 369 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
370   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  370 +#: app/views/account/_login_form.rhtml:22
  371 +#: app/views/shared/_change_image.rhtml:2
371 372 #: app/views/shared/_select_categories.rhtml:22
372 373 msgid "Cancel"
373 374 msgstr ""
... ... @@ -445,6 +446,7 @@ msgstr &quot;&quot;
445 446  
446 447 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
447 448 #: app/controllers/public/search_controller.rb:137
  449 +#: app/controllers/public/search_controller.rb:198
448 450 #: app/views/search/_sellers_form.rhtml:8
449 451 msgid "Products"
450 452 msgstr ""
... ... @@ -1550,7 +1552,7 @@ msgstr &quot;&quot;
1550 1552 msgid "Disable search for events"
1551 1553 msgstr ""
1552 1554  
1553   -#: app/models/environment.rb:197
  1555 +#: app/models/environment.rb:214
1554 1556 msgid "Only one Virtual Community can be the default one"
1555 1557 msgstr ""
1556 1558  
... ... @@ -1749,15 +1751,15 @@ msgstr &quot;&quot;
1749 1751 msgid "Thanks for signing up!"
1750 1752 msgstr ""
1751 1753  
1752   -#: app/controllers/public/account_controller.rb:71
  1754 +#: app/controllers/public/account_controller.rb:65
1753 1755 msgid "You have been logged out."
1754 1756 msgstr ""
1755 1757  
1756   -#: app/controllers/public/account_controller.rb:82
  1758 +#: app/controllers/public/account_controller.rb:76
1757 1759 msgid "Your password has been changed successfully!"
1758 1760 msgstr ""
1759 1761  
1760   -#: app/controllers/public/account_controller.rb:85
  1762 +#: app/controllers/public/account_controller.rb:79
1761 1763 msgid "The supplied current password is incorrect."
1762 1764 msgstr ""
1763 1765  
... ... @@ -3364,50 +3366,24 @@ msgid &quot;&quot;
3364 3366 msgstr ""
3365 3367  
3366 3368 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3369 +#: app/views/account/activate_enterprise.rhtml:15
3367 3370 #: app/views/shared/user_menu.rhtml:54
3368 3371 msgid "Login"
3369 3372 msgstr ""
3370 3373  
3371   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3372   -msgid ""
3373   -"If you are a registered user, enter your username and password to be "
3374   -"authenticated."
3375   -msgstr ""
3376   -
3377   -#: app/views/account/login.rhtml:11
3378   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3379   -msgstr ""
3380   -
3381   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3382   -msgid ""
3383   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3384   -msgstr ""
3385   -
3386   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3387   -msgid "Here goes the nickname that you give on the registration."
3388   -msgstr ""
3389   -
3390   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3391   -msgid "your password is personal, protect it."
3392   -msgstr ""
3393   -
3394   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3395   -msgid "Log in"
3396   -msgstr ""
3397   -
3398   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3374 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3399 3375 msgid "You can recover your password clicking on this link."
3400 3376 msgstr ""
3401 3377  
3402   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3378 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3403 3379 msgid "I forgot my password!"
3404 3380 msgstr ""
3405 3381  
3406   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3382 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3407 3383 msgid "Click here to join to this environment, if you is not already an user."
3408 3384 msgstr ""
3409 3385  
3410   -#: app/views/account/login.rhtml:34
  3386 +#: app/views/account/login.rhtml:12
3411 3387 msgid "I want to be an user!"
3412 3388 msgstr ""
3413 3389  
... ... @@ -3428,9 +3404,37 @@ msgid &quot;Send change password procedure by e-mail&quot;
3428 3404 msgstr ""
3429 3405  
3430 3406 #: app/views/account/login_block.rhtml:13
  3407 +#: app/views/account/_login_form.rhtml:3
  3408 +msgid ""
  3409 +"If you are a registered user, enter your username and password to be "
  3410 +"authenticated."
  3411 +msgstr ""
  3412 +
  3413 +#: app/views/account/login_block.rhtml:13
3431 3414 msgid "To join on this environment, click on \"<b>New user</b>\"."
3432 3415 msgstr ""
3433 3416  
  3417 +#: app/views/account/login_block.rhtml:13
  3418 +#: app/views/account/_login_form.rhtml:3
  3419 +msgid ""
  3420 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3421 +msgstr ""
  3422 +
  3423 +#: app/views/account/login_block.rhtml:17
  3424 +#: app/views/account/_login_form.rhtml:7
  3425 +msgid "Here goes the nickname that you give on the registration."
  3426 +msgstr ""
  3427 +
  3428 +#: app/views/account/login_block.rhtml:21
  3429 +#: app/views/account/_login_form.rhtml:12
  3430 +msgid "your password is personal, protect it."
  3431 +msgstr ""
  3432 +
  3433 +#: app/views/account/login_block.rhtml:24
  3434 +#: app/views/account/_login_form.rhtml:21
  3435 +msgid "Log in"
  3436 +msgstr ""
  3437 +
3434 3438 #: app/views/account/login_block.rhtml:25
3435 3439 msgid "New user"
3436 3440 msgstr ""
... ... @@ -3481,6 +3485,57 @@ msgid &quot;&quot;
3481 3485 "environment."
3482 3486 msgstr ""
3483 3487  
  3488 +#: app/views/account/_signup_form.rhtml:1
  3489 +msgid "Register"
  3490 +msgstr ""
  3491 +
  3492 +#: app/views/account/_signup_form.rhtml:5
  3493 +msgid ""
  3494 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3495 +"password, do not create a new account, click on the \"<b>I forgot my "
  3496 +"password!</b>\" link. ;-)"
  3497 +msgstr ""
  3498 +
  3499 +#: app/views/account/_signup_form.rhtml:11
  3500 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3501 +msgstr ""
  3502 +
  3503 +#: app/views/account/_signup_form.rhtml:16
  3504 +msgid "We'll send you an e-mail to validate your registration."
  3505 +msgstr ""
  3506 +
  3507 +#: app/views/account/_signup_form.rhtml:20
  3508 +msgid "Do not use a obviously password, but try some unforgettable word."
  3509 +msgstr ""
  3510 +
  3511 +#: app/views/account/_signup_form.rhtml:24
  3512 +msgid "We need to be sure that you wrote correctly your password."
  3513 +msgstr ""
  3514 +
  3515 +#: app/views/account/_signup_form.rhtml:35
  3516 +msgid "I accept the terms of use"
  3517 +msgstr ""
  3518 +
  3519 +#: app/views/account/_signup_form.rhtml:47
  3520 +msgid "Sign up"
  3521 +msgstr ""
  3522 +
  3523 +#: app/views/account/activation_question.rhtml:3
  3524 +msgid "What year your enterprise was founded?"
  3525 +msgstr ""
  3526 +
  3527 +#: app/views/account/activation_question.rhtml:3
  3528 +msgid "What is the CNPJ of your enterprise?"
  3529 +msgstr ""
  3530 +
  3531 +#: app/views/account/activation_question.rhtml:3
  3532 +msgid "We need to be sure that this is your enterprise"
  3533 +msgstr ""
  3534 +
  3535 +#: app/views/account/activation_question.rhtml:8
  3536 +msgid "Answer"
  3537 +msgstr ""
  3538 +
3484 3539 #: app/views/account/invalid_enterprise_code.rhtml:1
3485 3540 msgid "Invalid enterprise code"
3486 3541 msgstr ""
... ... @@ -3536,6 +3591,10 @@ msgstr &quot;&quot;
3536 3591 msgid "You can <a href='%s'>login</a> now."
3537 3592 msgstr ""
3538 3593  
  3594 +#: app/views/account/_login_form.rhtml:3
  3595 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3596 +msgstr ""
  3597 +
3539 3598 #: app/views/account/user_info.rhtml:3
3540 3599 msgid "Logged in as %s"
3541 3600 msgstr ""
... ... @@ -3548,68 +3607,24 @@ msgstr &quot;&quot;
3548 3607 msgid "Logout"
3549 3608 msgstr ""
3550 3609  
3551   -#: app/views/account/signup.rhtml:1
3552   -msgid "Register"
3553   -msgstr ""
3554   -
3555   -#: app/views/account/signup.rhtml:5
3556   -msgid ""
3557   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3558   -"password, do not create a new account, click on the \"<b>I forgot my "
3559   -"password!</b>\" link. ;-)"
3560   -msgstr ""
3561   -
3562   -#: app/views/account/signup.rhtml:11
3563   -#: app/views/account/activate_enterprise.rhtml:11
3564   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
3565   -msgstr ""
3566   -
3567   -#: app/views/account/signup.rhtml:16
3568   -#: app/views/account/activate_enterprise.rhtml:16
3569   -msgid "We'll send you an e-mail to validate your registration."
3570   -msgstr ""
3571   -
3572   -#: app/views/account/signup.rhtml:20
3573   -#: app/views/account/activate_enterprise.rhtml:20
3574   -msgid "Do not use a obviously password, but try some unforgettable word."
3575   -msgstr ""
3576   -
3577   -#: app/views/account/signup.rhtml:24
3578   -#: app/views/account/activate_enterprise.rhtml:24
3579   -msgid "We need to be sure that you wrote correctly your password."
3580   -msgstr ""
3581   -
3582   -#: app/views/account/signup.rhtml:35
3583   -#: app/views/account/activate_enterprise.rhtml:37
3584   -msgid "I accept the terms of use"
3585   -msgstr ""
3586   -
3587   -#: app/views/account/signup.rhtml:40
3588   -#: app/views/account/activate_enterprise.rhtml:42
3589   -msgid "Sign up"
3590   -msgstr ""
3591   -
3592 3610 #: app/views/account/activate_enterprise.rhtml:1
3593   -msgid "Register and activate enterprise"
  3611 +msgid "What user should be the admin of the enterprise page"
3594 3612 msgstr ""
3595 3613  
3596   -#: app/views/account/activate_enterprise.rhtml:5
3597   -msgid ""
3598   -"Fill all this fields to activate your enterprise and join in this "
3599   -"environment.<p/>If you forgot your password, do not create a new account, "
3600   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
  3614 +#: app/views/account/activate_enterprise.rhtml:6
  3615 +msgid "Already have user"
3601 3616 msgstr ""
3602 3617  
3603   -#: app/views/account/activate_enterprise.rhtml:27
3604   -msgid "What year your enterprise was founded?"
  3618 +#: app/views/account/activate_enterprise.rhtml:7
  3619 +msgid "Create new user"
3605 3620 msgstr ""
3606 3621  
3607   -#: app/views/account/activate_enterprise.rhtml:27
3608   -msgid "What is the CNPJ of your enterprise?"
  3622 +#: app/views/account/accept_terms.rhtml:4
  3623 +msgid "I accept the terms"
3609 3624 msgstr ""
3610 3625  
3611   -#: app/views/account/activate_enterprise.rhtml:27
3612   -msgid "We need to be sure that this is your enterprise"
  3626 +#: app/views/account/accept_terms.rhtml:5
  3627 +msgid "I do NOT accept the terms"
3613 3628 msgstr ""
3614 3629  
3615 3630 #: app/views/account/change_password.rhtml:5
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @5e5626d
... ... @@ -11,8 +11,8 @@
11 11 #
12 12 msgid ""
13 13 msgstr ""
14   -"Project-Id-Version: noosfero 0.11.0\n"
15   -"POT-Creation-Date: 2008-07-21 21:21-0300\n"
  14 +"Project-Id-Version: noosfero 0.10.3\n"
  15 +"POT-Creation-Date: 2008-07-31 19:51-0300\n"
16 16 "PO-Revision-Date: 2008-07-21 21:46-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -377,7 +377,8 @@ msgstr &quot;Administrador atribui organizações validadoras por região.&quot;
377 377 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
378 378 #: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
379 379 #: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
380   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  380 +#: app/views/account/_login_form.rhtml:22
  381 +#: app/views/shared/_change_image.rhtml:2
381 382 #: app/views/shared/_select_categories.rhtml:22
382 383 msgid "Cancel"
383 384 msgstr "Cancelar"
... ... @@ -455,6 +456,7 @@ msgstr &quot;Pessoas&quot;
455 456  
456 457 #: app/helpers/assets_helper.rb:9 app/models/products_block.rb:12
457 458 #: app/controllers/public/search_controller.rb:137
  459 +#: app/controllers/public/search_controller.rb:198
458 460 #: app/views/search/_sellers_form.rhtml:8
459 461 msgid "Products"
460 462 msgstr "Produtos"
... ... @@ -1588,7 +1590,7 @@ msgstr &quot;Desabilitar busca por produtos&quot;
1588 1590 msgid "Disable search for events"
1589 1591 msgstr "Desabilitar buscar por eventos"
1590 1592  
1591   -#: app/models/environment.rb:197
  1593 +#: app/models/environment.rb:214
1592 1594 msgid "Only one Virtual Community can be the default one"
1593 1595 msgstr "Apenas uma comunidade virtual pode ser a padrão"
1594 1596  
... ... @@ -1789,15 +1791,15 @@ msgstr &quot;Nome ou senha incorreto&quot;
1789 1791 msgid "Thanks for signing up!"
1790 1792 msgstr "Obrigado por se registrar!"
1791 1793  
1792   -#: app/controllers/public/account_controller.rb:71
  1794 +#: app/controllers/public/account_controller.rb:65
1793 1795 msgid "You have been logged out."
1794 1796 msgstr "Você saiu do sistema."
1795 1797  
1796   -#: app/controllers/public/account_controller.rb:82
  1798 +#: app/controllers/public/account_controller.rb:76
1797 1799 msgid "Your password has been changed successfully!"
1798 1800 msgstr "Sua senha foi alterada com sucesso!"
1799 1801  
1800   -#: app/controllers/public/account_controller.rb:85
  1802 +#: app/controllers/public/account_controller.rb:79
1801 1803 msgid "The supplied current password is incorrect."
1802 1804 msgstr "A senha informada está incorreta"
1803 1805  
... ... @@ -3467,55 +3469,24 @@ msgstr &quot;&quot;
3467 3469 "membro desse comunidade virtual."
3468 3470  
3469 3471 #: app/views/account/login.rhtml:3 app/views/account/login_block.rhtml:4
  3472 +#: app/views/account/activate_enterprise.rhtml:15
3470 3473 #: app/views/shared/user_menu.rhtml:54
3471 3474 msgid "Login"
3472 3475 msgstr "Entrar"
3473 3476  
3474   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3475   -msgid ""
3476   -"If you are a registered user, enter your username and password to be "
3477   -"authenticated."
3478   -msgstr ""
3479   -"Se você é um usuário registrado, informe seu login e senha para ser "
3480   -"autenticado."
3481   -
3482   -#: app/views/account/login.rhtml:11
3483   -msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
3484   -msgstr ""
3485   -"Para entrar neste ambiente, clique em \"<b>Quero ser um usuário!</b>\"."
3486   -
3487   -#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:13
3488   -msgid ""
3489   -"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
3490   -msgstr ""
3491   -"Se você esqueceu sua senha, clique no link \"<b>Eu esqueci a minha senha!</b>"
3492   -"\"."
3493   -
3494   -#: app/views/account/login.rhtml:15 app/views/account/login_block.rhtml:17
3495   -msgid "Here goes the nickname that you give on the registration."
3496   -msgstr "Aqui vai o apelido que você informou no registro."
3497   -
3498   -#: app/views/account/login.rhtml:20 app/views/account/login_block.rhtml:21
3499   -msgid "your password is personal, protect it."
3500   -msgstr "sua senha é pessoal, proteja-a."
3501   -
3502   -#: app/views/account/login.rhtml:23 app/views/account/login_block.rhtml:24
3503   -msgid "Log in"
3504   -msgstr "Entrar"
3505   -
3506   -#: app/views/account/login.rhtml:29 app/views/account/login_block.rhtml:33
  3477 +#: app/views/account/login.rhtml:7 app/views/account/login_block.rhtml:33
3507 3478 msgid "You can recover your password clicking on this link."
3508 3479 msgstr "Você pode recuperar sua senha clicando neste link."
3509 3480  
3510   -#: app/views/account/login.rhtml:30 app/views/account/login_block.rhtml:34
  3481 +#: app/views/account/login.rhtml:8 app/views/account/login_block.rhtml:34
3511 3482 msgid "I forgot my password!"
3512 3483 msgstr "Eu esqueci a minha senha!"
3513 3484  
3514   -#: app/views/account/login.rhtml:33 app/views/account/login_block.rhtml:27
  3485 +#: app/views/account/login.rhtml:11 app/views/account/login_block.rhtml:27
3515 3486 msgid "Click here to join to this environment, if you is not already an user."
3516 3487 msgstr "Clique aqui para entrar neste ambiente, se voce ainda não é um usurio."
3517 3488  
3518   -#: app/views/account/login.rhtml:34
  3489 +#: app/views/account/login.rhtml:12
3519 3490 msgid "I want to be an user!"
3520 3491 msgstr "Quero ser um usuário!"
3521 3492  
... ... @@ -3539,9 +3510,41 @@ msgid &quot;Send change password procedure by e-mail&quot;
3539 3510 msgstr "Mande a mudança da senha pelo e-mail"
3540 3511  
3541 3512 #: app/views/account/login_block.rhtml:13
  3513 +#: app/views/account/_login_form.rhtml:3
  3514 +msgid ""
  3515 +"If you are a registered user, enter your username and password to be "
  3516 +"authenticated."
  3517 +msgstr ""
  3518 +"Se você é um usuário registrado, informe seu login e senha para ser "
  3519 +"autenticado."
  3520 +
  3521 +#: app/views/account/login_block.rhtml:13
3542 3522 msgid "To join on this environment, click on \"<b>New user</b>\"."
3543 3523 msgstr "Para entrar neste ambiente, clique em \"<b>Novo usuário</b>\"."
3544 3524  
  3525 +#: app/views/account/login_block.rhtml:13
  3526 +#: app/views/account/_login_form.rhtml:3
  3527 +msgid ""
  3528 +"If you forgot your password, click on \"<b>I forgot my password!</b>\" link."
  3529 +msgstr ""
  3530 +"Se você esqueceu sua senha, clique no link \"<b>Eu esqueci a minha senha!</b>"
  3531 +"\"."
  3532 +
  3533 +#: app/views/account/login_block.rhtml:17
  3534 +#: app/views/account/_login_form.rhtml:7
  3535 +msgid "Here goes the nickname that you give on the registration."
  3536 +msgstr "Aqui vai o apelido que você informou no registro."
  3537 +
  3538 +#: app/views/account/login_block.rhtml:21
  3539 +#: app/views/account/_login_form.rhtml:12
  3540 +msgid "your password is personal, protect it."
  3541 +msgstr "sua senha é pessoal, proteja-a."
  3542 +
  3543 +#: app/views/account/login_block.rhtml:24
  3544 +#: app/views/account/_login_form.rhtml:21
  3545 +msgid "Log in"
  3546 +msgstr "Entrar"
  3547 +
3545 3548 #: app/views/account/login_block.rhtml:25
3546 3549 msgid "New user"
3547 3550 msgstr "Novo usuário"
... ... @@ -3594,6 +3597,62 @@ msgstr &quot;&quot;
3594 3597 "É sempre uma boa idéia fazer logout quando você terminar de usar a "
3595 3598 "comunidade virtual."
3596 3599  
  3600 +#: app/views/account/_signup_form.rhtml:1
  3601 +msgid "Register"
  3602 +msgstr "Registrar"
  3603 +
  3604 +#: app/views/account/_signup_form.rhtml:5
  3605 +msgid ""
  3606 +"Fill all this fields to join in this environment.<p/>If you forgot your "
  3607 +"password, do not create a new account, click on the \"<b>I forgot my "
  3608 +"password!</b>\" link. ;-)"
  3609 +msgstr ""
  3610 +"Preencha todos os campos para entrar neste ambiente.<p/>Se você esqueceu sua "
  3611 +"senha, não crie uma nova conta, clique no link \"<b>Eu esqueci minha senha!</"
  3612 +"b>\". ;-)"
  3613 +
  3614 +#: app/views/account/_signup_form.rhtml:11
  3615 +msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3616 +msgstr ""
  3617 +"\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente."
  3618 +
  3619 +#: app/views/account/_signup_form.rhtml:16
  3620 +msgid "We'll send you an e-mail to validate your registration."
  3621 +msgstr "Nós iremos lhe enviar um e-mail para validar seu registro."
  3622 +
  3623 +#: app/views/account/_signup_form.rhtml:20
  3624 +msgid "Do not use a obviously password, but try some unforgettable word."
  3625 +msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente."
  3626 +
  3627 +#: app/views/account/_signup_form.rhtml:24
  3628 +msgid "We need to be sure that you wrote correctly your password."
  3629 +msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
  3630 +
  3631 +#: app/views/account/_signup_form.rhtml:35
  3632 +msgid "I accept the terms of use"
  3633 +msgstr "Eu aceito os termos de uso"
  3634 +
  3635 +#: app/views/account/_signup_form.rhtml:47
  3636 +msgid "Sign up"
  3637 +msgstr "Registre-se."
  3638 +
  3639 +#: app/views/account/activation_question.rhtml:3
  3640 +msgid "What year your enterprise was founded?"
  3641 +msgstr "Qual o ano de fundação do seu empreendimento?"
  3642 +
  3643 +#: app/views/account/activation_question.rhtml:3
  3644 +msgid "What is the CNPJ of your enterprise?"
  3645 +msgstr "Qual o CNPJ do seu empreendimento?"
  3646 +
  3647 +#: app/views/account/activation_question.rhtml:3
  3648 +msgid "We need to be sure that this is your enterprise"
  3649 +msgstr "Nós precisamos ter certeza que este empreendimento é seu"
  3650 +
  3651 +#: app/views/account/activation_question.rhtml:8
  3652 +#, fuzzy
  3653 +msgid "Answer"
  3654 +msgstr "usuário"
  3655 +
3597 3656 #: app/views/account/invalid_enterprise_code.rhtml:1
3598 3657 msgid "Invalid enterprise code"
3599 3658 msgstr "Código de empreendimento inválido"
... ... @@ -3656,6 +3715,11 @@ msgstr &quot;%s, sua nova senha foi alterada com sucesso.&quot;
3656 3715 msgid "You can <a href='%s'>login</a> now."
3657 3716 msgstr "Você pode <a href='%s'>logar</a> agora."
3658 3717  
  3718 +#: app/views/account/_login_form.rhtml:3
  3719 +msgid "To join on this environment, click on \"<b>I want to be an user!</b>\"."
  3720 +msgstr ""
  3721 +"Para entrar neste ambiente, clique em \"<b>Quero ser um usuário!</b>\"."
  3722 +
3659 3723 #: app/views/account/user_info.rhtml:3
3660 3724 msgid "Logged in as %s"
3661 3725 msgstr "Identificado(a) como %s"
... ... @@ -3668,76 +3732,28 @@ msgstr &quot;Usuário desde %{month}/%{year}&quot;
3668 3732 msgid "Logout"
3669 3733 msgstr "Sair"
3670 3734  
3671   -#: app/views/account/signup.rhtml:1
3672   -msgid "Register"
3673   -msgstr "Registrar"
3674   -
3675   -#: app/views/account/signup.rhtml:5
3676   -msgid ""
3677   -"Fill all this fields to join in this environment.<p/>If you forgot your "
3678   -"password, do not create a new account, click on the \"<b>I forgot my "
3679   -"password!</b>\" link. ;-)"
  3735 +#: app/views/account/activate_enterprise.rhtml:1
  3736 +msgid "What user should be the admin of the enterprise page"
3680 3737 msgstr ""
3681   -"Preencha todos os campos para entrar neste ambiente.<p/>Se você esqueceu sua "
3682   -"senha, não crie uma nova conta, clique no link \"<b>Eu esqueci minha senha!</"
3683   -"b>\". ;-)"
3684 3738  
3685   -#: app/views/account/signup.rhtml:11
3686   -#: app/views/account/activate_enterprise.rhtml:11
3687   -msgid "\"Username\" is a simple nickname to recognize you on this environment."
  3739 +#: app/views/account/activate_enterprise.rhtml:6
  3740 +msgid "Already have user"
3688 3741 msgstr ""
3689   -"\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente."
3690 3742  
3691   -#: app/views/account/signup.rhtml:16
3692   -#: app/views/account/activate_enterprise.rhtml:16
3693   -msgid "We'll send you an e-mail to validate your registration."
3694   -msgstr "Nós iremos lhe enviar um e-mail para validar seu registro."
3695   -
3696   -#: app/views/account/signup.rhtml:20
3697   -#: app/views/account/activate_enterprise.rhtml:20
3698   -msgid "Do not use a obviously password, but try some unforgettable word."
3699   -msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente."
3700   -
3701   -#: app/views/account/signup.rhtml:24
3702   -#: app/views/account/activate_enterprise.rhtml:24
3703   -msgid "We need to be sure that you wrote correctly your password."
3704   -msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
  3743 +#: app/views/account/activate_enterprise.rhtml:7
  3744 +#, fuzzy
  3745 +msgid "Create new user"
  3746 +msgstr "Criar nova comunidade"
3705 3747  
3706   -#: app/views/account/signup.rhtml:35
3707   -#: app/views/account/activate_enterprise.rhtml:37
3708   -msgid "I accept the terms of use"
  3748 +#: app/views/account/accept_terms.rhtml:4
  3749 +#, fuzzy
  3750 +msgid "I accept the terms"
3709 3751 msgstr "Eu aceito os termos de uso"
3710 3752  
3711   -#: app/views/account/signup.rhtml:40
3712   -#: app/views/account/activate_enterprise.rhtml:42
3713   -msgid "Sign up"
3714   -msgstr "Registre-se."
3715   -
3716   -#: app/views/account/activate_enterprise.rhtml:1
3717   -msgid "Register and activate enterprise"
3718   -msgstr "Registrar e ativar empreendimento"
3719   -
3720   -#: app/views/account/activate_enterprise.rhtml:5
3721   -msgid ""
3722   -"Fill all this fields to activate your enterprise and join in this "
3723   -"environment.<p/>If you forgot your password, do not create a new account, "
3724   -"click on the \"<b>I forgot my password!</b>\" link. ;-)"
3725   -msgstr ""
3726   -"Preencha todos os campos para ativar seu empreendimento e entrar neste "
3727   -"ambiente.<p/>Se você esqueceu sua senha, não crie uma nova conta, clique no "
3728   -"link \"<b>Eu esqueci minha senha!</b>\". ;-)"
3729   -
3730   -#: app/views/account/activate_enterprise.rhtml:27
3731   -msgid "What year your enterprise was founded?"
3732   -msgstr "Qual o ano de fundação do seu empreendimento?"
3733   -
3734   -#: app/views/account/activate_enterprise.rhtml:27
3735   -msgid "What is the CNPJ of your enterprise?"
3736   -msgstr "Qual o CNPJ do seu empreendimento?"
3737   -
3738   -#: app/views/account/activate_enterprise.rhtml:27
3739   -msgid "We need to be sure that this is your enterprise"
3740   -msgstr "Nós precisamos ter certeza que este empreendimento é seu"
  3753 +#: app/views/account/accept_terms.rhtml:5
  3754 +#, fuzzy
  3755 +msgid "I do NOT accept the terms"
  3756 +msgstr "Eu aceito os termos de uso"
3741 3757  
3742 3758 #: app/views/account/change_password.rhtml:5
3743 3759 msgid "Current password"
... ... @@ -3928,10 +3944,10 @@ msgid &quot;&quot;
3928 3944 "methodology, restrictions to the types of organizations the organization "
3929 3945 "validates etc."
3930 3946 msgstr ""
3931   -"Informações de validação são as informações que as organizações verão "
3932   -"sobre como sua organização processa as validações de organizações que ela "
3933   -"recebe: metodologia de validação, restrição de tipos de organizações que "
3934   -"a organização valida etc."
  3947 +"Informações de validação são as informações que as organizações verão sobre "
  3948 +"como sua organização processa as validações de organizações que ela recebe: "
  3949 +"metodologia de validação, restrição de tipos de organizações que a "
  3950 +"organização valida etc."
3935 3951  
3936 3952 #: lib/zen3_terminology.rb:36
3937 3953 msgid "Here all all <b>%s</b>'s organizations."
... ... @@ -3961,6 +3977,18 @@ msgstr &quot;Um projeto FBES&quot;
3961 3977 msgid "Developed by Colivre"
3962 3978 msgstr "Desenvolvimento Colivre"
3963 3979  
  3980 +#~ msgid "Register and activate enterprise"
  3981 +#~ msgstr "Registrar e ativar empreendimento"
  3982 +
  3983 +#~ msgid ""
  3984 +#~ "Fill all this fields to activate your enterprise and join in this "
  3985 +#~ "environment.<p/>If you forgot your password, do not create a new account, "
  3986 +#~ "click on the \"<b>I forgot my password!</b>\" link. ;-)"
  3987 +#~ msgstr ""
  3988 +#~ "Preencha todos os campos para ativar seu empreendimento e entrar neste "
  3989 +#~ "ambiente.<p/>Se você esqueceu sua senha, não crie uma nova conta, clique "
  3990 +#~ "no link \"<b>Eu esqueci minha senha!</b>\". ;-)"
  3991 +
3964 3992 #~ msgid "Some feature"
3965 3993 #~ msgstr "Alguma funcionalidade"
3966 3994  
... ...