Download as
Browse Code »

Commit 5e6db8bc240768d3d285f856eef2920d2f858227

Authored by Antonio Terceiro
1 parent 7c91fe46
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem927: updating translation files 

pt_BR translation completed
Showing 7 changed files with 523 additions and 622 deletions   Show diff stats
po/de/noosfero.po
  Diff comments   View file @5e6db8b
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.15.0\n" 9 "Project-Id-Version: noosfero 0.15.0\n"
10 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 10 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,7 +519,7 @@ msgstr &quot;&quot; @@ -519,7 +519,7 @@ msgstr &quot;&quot;
519 msgid "Previous" 519 msgid "Previous"
520 msgstr "" 520 msgstr ""
521 521
522 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 522 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
523 #: app/views/enterprise_registration/basic_information.rhtml:32 523 #: app/views/enterprise_registration/basic_information.rhtml:32
524 #: app/views/layouts/slideshow.rhtml:19 524 #: app/views/layouts/slideshow.rhtml:19
525 msgid "Next" 525 msgid "Next"
@@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1108 msgstr "" 1108 msgstr ""
1109 1109
1110 #: app/controllers/my_profile/friends_controller.rb:60 1110 #: app/controllers/my_profile/friends_controller.rb:60
1111 -#: app/views/friends/invite.rhtml:56  
1112 msgid "Firstname Lastname <friend@email.com>" 1111 msgid "Firstname Lastname <friend@email.com>"
1113 msgstr "" 1112 msgstr ""
1114 1113
@@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot; @@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot;
1343 msgstr "" 1342 msgstr ""
1344 1343
1345 #: app/models/user.rb:- 1344 #: app/models/user.rb:-
  1345 +msgid "user"
  1346 +msgstr ""
  1347 +
  1348 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1349 +msgid "Username"
  1350 +msgstr ""
  1351 +
  1352 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1353 +#: app/models/change_password.rb:22
  1354 +msgid "e-Mail"
  1355 +msgstr ""
  1356 +
  1357 +#: app/models/user.rb:-
  1358 +msgid "Crypted password"
  1359 +msgstr ""
  1360 +
  1361 +#: app/models/user.rb:-
  1362 +msgid "Salt"
  1363 +msgstr ""
  1364 +
  1365 +#: app/models/user.rb:- app/models/product.rb:-
  1366 +#: app/models/product_categorization.rb:-
  1367 +msgid "Updated at"
  1368 +msgstr ""
  1369 +
  1370 +#: app/models/user.rb:-
  1371 +msgid "Remember token"
  1372 +msgstr ""
  1373 +
  1374 +#: app/models/user.rb:-
  1375 +msgid "Remember token expires at"
  1376 +msgstr ""
  1377 +
  1378 +#: app/models/user.rb:-
  1379 +msgid "Terms of use"
  1380 +msgstr ""
  1381 +
  1382 +#: app/models/user.rb:- app/models/user.rb:9
  1383 +msgid "Terms accepted"
  1384 +msgstr ""
  1385 +
  1386 +#: app/models/user.rb:-
  1387 +msgid "Password type"
  1388 +msgstr ""
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Enable email"
  1392 +msgstr ""
  1393 +
  1394 +#: app/models/user.rb:-
1346 msgid "article" 1395 msgid "article"
1347 msgstr "" 1396 msgstr ""
1348 1397
@@ -1372,11 +1421,6 @@ msgstr &quot;&quot; @@ -1372,11 +1421,6 @@ msgstr &quot;&quot;
1372 msgid "Profile" 1421 msgid "Profile"
1373 msgstr "" 1422 msgstr ""
1374 1423
1375 -#: app/models/user.rb:- app/models/product.rb:-  
1376 -#: app/models/product_categorization.rb:-  
1377 -msgid "Updated at"  
1378 -msgstr ""  
1379 -  
1380 #: app/models/user.rb:- 1424 #: app/models/user.rb:-
1381 msgid "Last changed by" 1425 msgid "Last changed by"
1382 msgstr "" 1426 msgstr ""
@@ -1457,52 +1501,7 @@ msgstr &quot;&quot; @@ -1457,52 +1501,7 @@ msgstr &quot;&quot;
1457 msgid "Hits" 1501 msgid "Hits"
1458 msgstr "" 1502 msgstr ""
1459 1503
1460 -#: app/models/user.rb:-  
1461 -msgid "user"  
1462 -msgstr ""  
1463 -  
1464 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1465 -msgid "Username"  
1466 -msgstr ""  
1467 -  
1468 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1469 -#: app/models/change_password.rb:22  
1470 -msgid "e-Mail"  
1471 -msgstr ""  
1472 -  
1473 -#: app/models/user.rb:-  
1474 -msgid "Crypted password"  
1475 -msgstr ""  
1476 -  
1477 -#: app/models/user.rb:-  
1478 -msgid "Salt"  
1479 -msgstr ""  
1480 -  
1481 -#: app/models/user.rb:-  
1482 -msgid "Remember token"  
1483 -msgstr ""  
1484 -  
1485 -#: app/models/user.rb:-  
1486 -msgid "Remember token expires at"  
1487 -msgstr ""  
1488 -  
1489 -#: app/models/user.rb:-  
1490 -msgid "Terms of use"  
1491 -msgstr ""  
1492 -  
1493 -#: app/models/user.rb:- app/models/user.rb:9  
1494 -msgid "Terms accepted"  
1495 -msgstr ""  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Password type"  
1499 -msgstr ""  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Enable email"  
1503 -msgstr ""  
1504 -  
1505 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1504 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1506 msgid "Password" 1505 msgid "Password"
1507 msgstr "" 1506 msgstr ""
1508 1507
@@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot; @@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot;
2791 msgstr "" 2790 msgstr ""
2792 2791
2793 #: app/views/friends/index.rhtml:40 2792 #: app/views/friends/index.rhtml:40
2794 -msgid "Invite friends from my e-mail contacts" 2793 +msgid "Invite people from my e-mail contacts"
2795 msgstr "" 2794 msgstr ""
2796 2795
2797 #: app/views/friends/add.rhtml:1 2796 #: app/views/friends/add.rhtml:1
@@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot; @@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot;
2848 msgstr "" 2847 msgstr ""
2849 2848
2850 #: app/views/friends/invite.rhtml:6 2849 #: app/views/friends/invite.rhtml:6
2851 -msgid "Step 1 of 1: Accessing your contact list"  
2852 -msgstr ""  
2853 -  
2854 -#: app/views/friends/invite.rhtml:9  
2855 -msgid ""  
2856 -"Choose your webmail provider and enter your login and password so we can "  
2857 -"fetch your contact list. If you only want to invite specific people by "  
2858 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2859 -"\" option." 2850 +msgid "Step 1 of 1: Select address book"
2860 msgstr "" 2851 msgstr ""
2861 2852
2862 -#: app/views/friends/invite.rhtml:15  
2863 -msgid "Select your e-mail provider:" 2853 +#: app/views/friends/invite.rhtml:12
  2854 +msgid "Manually (empty field)"
2864 msgstr "" 2855 msgstr ""
2865 2856
2866 -#: app/views/friends/invite.rhtml:19  
2867 -msgid "Enter e-mail addresses manually"  
2868 -msgstr ""  
2869 -  
2870 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2857 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2871 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2858 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2872 msgid "Login" 2859 msgid "Login"
2873 msgstr "" 2860 msgstr ""
2874 2861
2875 -#: app/views/friends/invite.rhtml:39 2862 +#: app/views/friends/invite.rhtml:35
2876 msgid "We won't store your password or contact anyone without your permission." 2863 msgid "We won't store your password or contact anyone without your permission."
2877 msgstr "" 2864 msgstr ""
2878 2865
2879 -#: app/views/friends/invite.rhtml:45 2866 +#: app/views/friends/invite.rhtml:41
2880 msgid "Step 2 of 2: Selecting Friends" 2867 msgid "Step 2 of 2: Selecting Friends"
2881 msgstr "" 2868 msgstr ""
2882 2869
2883 -#: app/views/friends/invite.rhtml:47 2870 +#: app/views/friends/invite.rhtml:43
2884 msgid "Indicate which friends you want to invite." 2871 msgid "Indicate which friends you want to invite."
2885 msgstr "" 2872 msgstr ""
2886 2873
2887 -#: app/views/friends/invite.rhtml:55  
2888 -msgid "Enter one e-mail address per line, following the example below."  
2889 -msgstr ""  
2890 -  
2891 -#: app/views/friends/invite.rhtml:56  
2892 -msgid "E-mail addresses" 2874 +#: app/views/friends/invite.rhtml:51
  2875 +msgid "Enter one e-mail address per line:"
2893 msgstr "" 2876 msgstr ""
2894 2877
2895 -#: app/views/friends/invite.rhtml:60 2878 +#: app/views/friends/invite.rhtml:55
2896 msgid "Check all" 2879 msgid "Check all"
2897 msgstr "" 2880 msgstr ""
2898 2881
2899 -#: app/views/friends/invite.rhtml:61 2882 +#: app/views/friends/invite.rhtml:56
2900 msgid "Uncheck all" 2883 msgid "Uncheck all"
2901 msgstr "" 2884 msgstr ""
2902 2885
2903 -#: app/views/friends/invite.rhtml:74 2886 +#: app/views/friends/invite.rhtml:70
2904 msgid "" 2887 msgid ""
2905 "Now enter an invitation message. You must keep the <url> code in your " 2888 "Now enter an invitation message. You must keep the <url> code in your "
2906 "invitation message. When your friends receive the invitation e-mail, <url> " 2889 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2909,11 +2892,11 @@ msgid &quot;&quot; @@ -2909,11 +2892,11 @@ msgid &quot;&quot;
2909 "name, but they are optional." 2892 "name, but they are optional."
2910 msgstr "" 2893 msgstr ""
2911 2894
2912 -#: app/views/friends/invite.rhtml:75  
2913 -msgid "Invitation message" 2895 +#: app/views/friends/invite.rhtml:71
  2896 +msgid "Invitation message:"
2914 msgstr "" 2897 msgstr ""
2915 2898
2916 -#: app/views/friends/invite.rhtml:79 2899 +#: app/views/friends/invite.rhtml:75
2917 msgid "Invite my friends!" 2900 msgid "Invite my friends!"
2918 msgstr "" 2901 msgstr ""
2919 2902
po/es/noosfero.po
  Diff comments   View file @5e6db8b
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.15.0\n" 9 "Project-Id-Version: noosfero 0.15.0\n"
10 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 10 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,7 +519,7 @@ msgstr &quot;&quot; @@ -519,7 +519,7 @@ msgstr &quot;&quot;
519 msgid "Previous" 519 msgid "Previous"
520 msgstr "" 520 msgstr ""
521 521
522 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 522 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
523 #: app/views/enterprise_registration/basic_information.rhtml:32 523 #: app/views/enterprise_registration/basic_information.rhtml:32
524 #: app/views/layouts/slideshow.rhtml:19 524 #: app/views/layouts/slideshow.rhtml:19
525 msgid "Next" 525 msgid "Next"
@@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1108 msgstr "" 1108 msgstr ""
1109 1109
1110 #: app/controllers/my_profile/friends_controller.rb:60 1110 #: app/controllers/my_profile/friends_controller.rb:60
1111 -#: app/views/friends/invite.rhtml:56  
1112 msgid "Firstname Lastname <friend@email.com>" 1111 msgid "Firstname Lastname <friend@email.com>"
1113 msgstr "" 1112 msgstr ""
1114 1113
@@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot; @@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot;
1343 msgstr "" 1342 msgstr ""
1344 1343
1345 #: app/models/user.rb:- 1344 #: app/models/user.rb:-
  1345 +msgid "user"
  1346 +msgstr ""
  1347 +
  1348 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1349 +msgid "Username"
  1350 +msgstr ""
  1351 +
  1352 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1353 +#: app/models/change_password.rb:22
  1354 +msgid "e-Mail"
  1355 +msgstr ""
  1356 +
  1357 +#: app/models/user.rb:-
  1358 +msgid "Crypted password"
  1359 +msgstr ""
  1360 +
  1361 +#: app/models/user.rb:-
  1362 +msgid "Salt"
  1363 +msgstr ""
  1364 +
  1365 +#: app/models/user.rb:- app/models/product.rb:-
  1366 +#: app/models/product_categorization.rb:-
  1367 +msgid "Updated at"
  1368 +msgstr ""
  1369 +
  1370 +#: app/models/user.rb:-
  1371 +msgid "Remember token"
  1372 +msgstr ""
  1373 +
  1374 +#: app/models/user.rb:-
  1375 +msgid "Remember token expires at"
  1376 +msgstr ""
  1377 +
  1378 +#: app/models/user.rb:-
  1379 +msgid "Terms of use"
  1380 +msgstr ""
  1381 +
  1382 +#: app/models/user.rb:- app/models/user.rb:9
  1383 +msgid "Terms accepted"
  1384 +msgstr ""
  1385 +
  1386 +#: app/models/user.rb:-
  1387 +msgid "Password type"
  1388 +msgstr ""
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Enable email"
  1392 +msgstr ""
  1393 +
  1394 +#: app/models/user.rb:-
1346 msgid "article" 1395 msgid "article"
1347 msgstr "" 1396 msgstr ""
1348 1397
@@ -1372,11 +1421,6 @@ msgstr &quot;&quot; @@ -1372,11 +1421,6 @@ msgstr &quot;&quot;
1372 msgid "Profile" 1421 msgid "Profile"
1373 msgstr "" 1422 msgstr ""
1374 1423
1375 -#: app/models/user.rb:- app/models/product.rb:-  
1376 -#: app/models/product_categorization.rb:-  
1377 -msgid "Updated at"  
1378 -msgstr ""  
1379 -  
1380 #: app/models/user.rb:- 1424 #: app/models/user.rb:-
1381 msgid "Last changed by" 1425 msgid "Last changed by"
1382 msgstr "" 1426 msgstr ""
@@ -1457,52 +1501,7 @@ msgstr &quot;&quot; @@ -1457,52 +1501,7 @@ msgstr &quot;&quot;
1457 msgid "Hits" 1501 msgid "Hits"
1458 msgstr "" 1502 msgstr ""
1459 1503
1460 -#: app/models/user.rb:-  
1461 -msgid "user"  
1462 -msgstr ""  
1463 -  
1464 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1465 -msgid "Username"  
1466 -msgstr ""  
1467 -  
1468 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1469 -#: app/models/change_password.rb:22  
1470 -msgid "e-Mail"  
1471 -msgstr ""  
1472 -  
1473 -#: app/models/user.rb:-  
1474 -msgid "Crypted password"  
1475 -msgstr ""  
1476 -  
1477 -#: app/models/user.rb:-  
1478 -msgid "Salt"  
1479 -msgstr ""  
1480 -  
1481 -#: app/models/user.rb:-  
1482 -msgid "Remember token"  
1483 -msgstr ""  
1484 -  
1485 -#: app/models/user.rb:-  
1486 -msgid "Remember token expires at"  
1487 -msgstr ""  
1488 -  
1489 -#: app/models/user.rb:-  
1490 -msgid "Terms of use"  
1491 -msgstr ""  
1492 -  
1493 -#: app/models/user.rb:- app/models/user.rb:9  
1494 -msgid "Terms accepted"  
1495 -msgstr ""  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Password type"  
1499 -msgstr ""  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Enable email"  
1503 -msgstr ""  
1504 -  
1505 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1504 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1506 msgid "Password" 1505 msgid "Password"
1507 msgstr "" 1506 msgstr ""
1508 1507
@@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot; @@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot;
2791 msgstr "" 2790 msgstr ""
2792 2791
2793 #: app/views/friends/index.rhtml:40 2792 #: app/views/friends/index.rhtml:40
2794 -msgid "Invite friends from my e-mail contacts" 2793 +msgid "Invite people from my e-mail contacts"
2795 msgstr "" 2794 msgstr ""
2796 2795
2797 #: app/views/friends/add.rhtml:1 2796 #: app/views/friends/add.rhtml:1
@@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot; @@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot;
2848 msgstr "" 2847 msgstr ""
2849 2848
2850 #: app/views/friends/invite.rhtml:6 2849 #: app/views/friends/invite.rhtml:6
2851 -msgid "Step 1 of 1: Accessing your contact list"  
2852 -msgstr ""  
2853 -  
2854 -#: app/views/friends/invite.rhtml:9  
2855 -msgid ""  
2856 -"Choose your webmail provider and enter your login and password so we can "  
2857 -"fetch your contact list. If you only want to invite specific people by "  
2858 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2859 -"\" option." 2850 +msgid "Step 1 of 1: Select address book"
2860 msgstr "" 2851 msgstr ""
2861 2852
2862 -#: app/views/friends/invite.rhtml:15  
2863 -msgid "Select your e-mail provider:" 2853 +#: app/views/friends/invite.rhtml:12
  2854 +msgid "Manually (empty field)"
2864 msgstr "" 2855 msgstr ""
2865 2856
2866 -#: app/views/friends/invite.rhtml:19  
2867 -msgid "Enter e-mail addresses manually"  
2868 -msgstr ""  
2869 -  
2870 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2857 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2871 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2858 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2872 msgid "Login" 2859 msgid "Login"
2873 msgstr "" 2860 msgstr ""
2874 2861
2875 -#: app/views/friends/invite.rhtml:39 2862 +#: app/views/friends/invite.rhtml:35
2876 msgid "We won't store your password or contact anyone without your permission." 2863 msgid "We won't store your password or contact anyone without your permission."
2877 msgstr "" 2864 msgstr ""
2878 2865
2879 -#: app/views/friends/invite.rhtml:45 2866 +#: app/views/friends/invite.rhtml:41
2880 msgid "Step 2 of 2: Selecting Friends" 2867 msgid "Step 2 of 2: Selecting Friends"
2881 msgstr "" 2868 msgstr ""
2882 2869
2883 -#: app/views/friends/invite.rhtml:47 2870 +#: app/views/friends/invite.rhtml:43
2884 msgid "Indicate which friends you want to invite." 2871 msgid "Indicate which friends you want to invite."
2885 msgstr "" 2872 msgstr ""
2886 2873
2887 -#: app/views/friends/invite.rhtml:55  
2888 -msgid "Enter one e-mail address per line, following the example below."  
2889 -msgstr ""  
2890 -  
2891 -#: app/views/friends/invite.rhtml:56  
2892 -msgid "E-mail addresses" 2874 +#: app/views/friends/invite.rhtml:51
  2875 +msgid "Enter one e-mail address per line:"
2893 msgstr "" 2876 msgstr ""
2894 2877
2895 -#: app/views/friends/invite.rhtml:60 2878 +#: app/views/friends/invite.rhtml:55
2896 msgid "Check all" 2879 msgid "Check all"
2897 msgstr "" 2880 msgstr ""
2898 2881
2899 -#: app/views/friends/invite.rhtml:61 2882 +#: app/views/friends/invite.rhtml:56
2900 msgid "Uncheck all" 2883 msgid "Uncheck all"
2901 msgstr "" 2884 msgstr ""
2902 2885
2903 -#: app/views/friends/invite.rhtml:74 2886 +#: app/views/friends/invite.rhtml:70
2904 msgid "" 2887 msgid ""
2905 "Now enter an invitation message. You must keep the <url> code in your " 2888 "Now enter an invitation message. You must keep the <url> code in your "
2906 "invitation message. When your friends receive the invitation e-mail, <url> " 2889 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2909,11 +2892,11 @@ msgid &quot;&quot; @@ -2909,11 +2892,11 @@ msgid &quot;&quot;
2909 "name, but they are optional." 2892 "name, but they are optional."
2910 msgstr "" 2893 msgstr ""
2911 2894
2912 -#: app/views/friends/invite.rhtml:75  
2913 -msgid "Invitation message" 2895 +#: app/views/friends/invite.rhtml:71
  2896 +msgid "Invitation message:"
2914 msgstr "" 2897 msgstr ""
2915 2898
2916 -#: app/views/friends/invite.rhtml:79 2899 +#: app/views/friends/invite.rhtml:75
2917 msgid "Invite my friends!" 2900 msgid "Invite my friends!"
2918 msgstr "" 2901 msgstr ""
2919 2902
po/fr/noosfero.po
  Diff comments   View file @5e6db8b
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 msgid "" 6 msgid ""
7 msgstr "" 7 msgstr ""
8 "Project-Id-Version: noosfero 0.15.0\n" 8 "Project-Id-Version: noosfero 0.15.0\n"
9 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 9 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
10 "PO-Revision-Date: 2008-06-13 16:15-0300\n" 10 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n" 11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
12 "Language-Team: LANGUAGE <LL@li.org>\n" 12 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -553,7 +553,7 @@ msgstr &quot;Catégorie :&quot; @@ -553,7 +553,7 @@ msgstr &quot;Catégorie :&quot;
553 msgid "Previous" 553 msgid "Previous"
554 msgstr "Produits" 554 msgstr "Produits"
555 555
556 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 556 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
557 #: app/views/enterprise_registration/basic_information.rhtml:32 557 #: app/views/enterprise_registration/basic_information.rhtml:32
558 #: app/views/layouts/slideshow.rhtml:19 558 #: app/views/layouts/slideshow.rhtml:19
559 msgid "Next" 559 msgid "Next"
@@ -1183,7 +1183,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1183,7 +1183,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1183 msgstr "" 1183 msgstr ""
1184 1184
1185 #: app/controllers/my_profile/friends_controller.rb:60 1185 #: app/controllers/my_profile/friends_controller.rb:60
1186 -#: app/views/friends/invite.rhtml:56  
1187 msgid "Firstname Lastname <friend@email.com>" 1186 msgid "Firstname Lastname <friend@email.com>"
1188 msgstr "" 1187 msgstr ""
1189 1188
@@ -1439,6 +1438,65 @@ msgid &quot;Birth date&quot; @@ -1439,6 +1438,65 @@ msgid &quot;Birth date&quot;
1439 msgstr "Date de naissance" 1438 msgstr "Date de naissance"
1440 1439
1441 #: app/models/user.rb:- 1440 #: app/models/user.rb:-
  1441 +msgid "user"
  1442 +msgstr "utilisateur"
  1443 +
  1444 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1445 +msgid "Username"
  1446 +msgstr "Identifiant"
  1447 +
  1448 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1449 +#: app/models/change_password.rb:22
  1450 +msgid "e-Mail"
  1451 +msgstr "Courrier électronique"
  1452 +
  1453 +#: app/models/user.rb:-
  1454 +#, fuzzy
  1455 +msgid "Crypted password"
  1456 +msgstr "Mot de passe crypté"
  1457 +
  1458 +#: app/models/user.rb:-
  1459 +#, fuzzy
  1460 +msgid "Salt"
  1461 +msgstr "Sel"
  1462 +
  1463 +#: app/models/user.rb:- app/models/product.rb:-
  1464 +#: app/models/product_categorization.rb:-
  1465 +#, fuzzy
  1466 +msgid "Updated at"
  1467 +msgstr "Mis à jour le"
  1468 +
  1469 +#: app/models/user.rb:-
  1470 +#, fuzzy
  1471 +msgid "Remember token"
  1472 +msgstr "Mémoriser le token"
  1473 +
  1474 +#: app/models/user.rb:-
  1475 +#, fuzzy
  1476 +msgid "Remember token expires at"
  1477 +msgstr "Le token mémorisé expire le"
  1478 +
  1479 +#: app/models/user.rb:-
  1480 +#, fuzzy
  1481 +msgid "Terms of use"
  1482 +msgstr "Conditions d'utilisation"
  1483 +
  1484 +#: app/models/user.rb:- app/models/user.rb:9
  1485 +#, fuzzy
  1486 +msgid "Terms accepted"
  1487 +msgstr "Conditions acceptées"
  1488 +
  1489 +#: app/models/user.rb:-
  1490 +#, fuzzy
  1491 +msgid "Password type"
  1492 +msgstr "Mot de passe"
  1493 +
  1494 +#: app/models/user.rb:-
  1495 +#, fuzzy
  1496 +msgid "Enable email"
  1497 +msgstr "Adresse e-mail"
  1498 +
  1499 +#: app/models/user.rb:-
1442 msgid "article" 1500 msgid "article"
1443 msgstr "article" 1501 msgstr "article"
1444 1502
@@ -1472,12 +1530,6 @@ msgstr &quot;Résumé&quot; @@ -1472,12 +1530,6 @@ msgstr &quot;Résumé&quot;
1472 msgid "Profile" 1530 msgid "Profile"
1473 msgstr "profil" 1531 msgstr "profil"
1474 1532
1475 -#: app/models/user.rb:- app/models/product.rb:-  
1476 -#: app/models/product_categorization.rb:-  
1477 -#, fuzzy  
1478 -msgid "Updated at"  
1479 -msgstr "Mis à jour le"  
1480 -  
1481 #: app/models/user.rb:- 1533 #: app/models/user.rb:-
1482 #, fuzzy 1534 #, fuzzy
1483 msgid "Last changed by" 1535 msgid "Last changed by"
@@ -1575,60 +1627,7 @@ msgstr &quot;Poster votre commentaire&quot; @@ -1575,60 +1627,7 @@ msgstr &quot;Poster votre commentaire&quot;
1575 msgid "Hits" 1627 msgid "Hits"
1576 msgstr "Hauteur" 1628 msgstr "Hauteur"
1577 1629
1578 -#: app/models/user.rb:-  
1579 -msgid "user"  
1580 -msgstr "utilisateur"  
1581 -  
1582 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1583 -msgid "Username"  
1584 -msgstr "Identifiant"  
1585 -  
1586 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1587 -#: app/models/change_password.rb:22  
1588 -msgid "e-Mail"  
1589 -msgstr "Courrier électronique"  
1590 -  
1591 -#: app/models/user.rb:-  
1592 -#, fuzzy  
1593 -msgid "Crypted password"  
1594 -msgstr "Mot de passe crypté"  
1595 -  
1596 -#: app/models/user.rb:-  
1597 -#, fuzzy  
1598 -msgid "Salt"  
1599 -msgstr "Sel"  
1600 -  
1601 -#: app/models/user.rb:-  
1602 -#, fuzzy  
1603 -msgid "Remember token"  
1604 -msgstr "Mémoriser le token"  
1605 -  
1606 -#: app/models/user.rb:-  
1607 -#, fuzzy  
1608 -msgid "Remember token expires at"  
1609 -msgstr "Le token mémorisé expire le"  
1610 -  
1611 -#: app/models/user.rb:-  
1612 -#, fuzzy  
1613 -msgid "Terms of use"  
1614 -msgstr "Conditions d'utilisation"  
1615 -  
1616 -#: app/models/user.rb:- app/models/user.rb:9  
1617 -#, fuzzy  
1618 -msgid "Terms accepted"  
1619 -msgstr "Conditions acceptées"  
1620 -  
1621 -#: app/models/user.rb:-  
1622 -#, fuzzy  
1623 -msgid "Password type"  
1624 -msgstr "Mot de passe"  
1625 -  
1626 -#: app/models/user.rb:-  
1627 -#, fuzzy  
1628 -msgid "Enable email"  
1629 -msgstr "Adresse e-mail"  
1630 -  
1631 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1630 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1632 msgid "Password" 1631 msgid "Password"
1633 msgstr "Mot de passe" 1632 msgstr "Mot de passe"
1634 1633
@@ -3070,7 +3069,7 @@ msgid &quot;Find people&quot; @@ -3070,7 +3069,7 @@ msgid &quot;Find people&quot;
3070 msgstr "Toutes les personnes" 3069 msgstr "Toutes les personnes"
3071 3070
3072 #: app/views/friends/index.rhtml:40 3071 #: app/views/friends/index.rhtml:40
3073 -msgid "Invite friends from my e-mail contacts" 3072 +msgid "Invite people from my e-mail contacts"
3074 msgstr "" 3073 msgstr ""
3075 3074
3076 #: app/views/friends/add.rhtml:1 3075 #: app/views/friends/add.rhtml:1
@@ -3130,59 +3129,44 @@ msgid &quot;Invite your friends&quot; @@ -3130,59 +3129,44 @@ msgid &quot;Invite your friends&quot;
3130 msgstr "%s veut être votre ami" 3129 msgstr "%s veut être votre ami"
3131 3130
3132 #: app/views/friends/invite.rhtml:6 3131 #: app/views/friends/invite.rhtml:6
3133 -msgid "Step 1 of 1: Accessing your contact list" 3132 +msgid "Step 1 of 1: Select address book"
3134 msgstr "" 3133 msgstr ""
3135 3134
3136 -#: app/views/friends/invite.rhtml:9  
3137 -msgid ""  
3138 -"Choose your webmail provider and enter your login and password so we can "  
3139 -"fetch your contact list. If you only want to invite specific people by "  
3140 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
3141 -"\" option."  
3142 -msgstr ""  
3143 -  
3144 -#: app/views/friends/invite.rhtml:15  
3145 -msgid "Select your e-mail provider:"  
3146 -msgstr ""  
3147 -  
3148 -#: app/views/friends/invite.rhtml:19  
3149 -msgid "Enter e-mail addresses manually"  
3150 -msgstr "" 3135 +#: app/views/friends/invite.rhtml:12
  3136 +#, fuzzy
  3137 +msgid "Manually (empty field)"
  3138 +msgstr "Un groupe"
3151 3139
3152 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 3140 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
3153 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 3141 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
3154 msgid "Login" 3142 msgid "Login"
3155 msgstr "Connexion" 3143 msgstr "Connexion"
3156 3144
3157 -#: app/views/friends/invite.rhtml:39 3145 +#: app/views/friends/invite.rhtml:35
3158 msgid "We won't store your password or contact anyone without your permission." 3146 msgid "We won't store your password or contact anyone without your permission."
3159 msgstr "" 3147 msgstr ""
3160 3148
3161 -#: app/views/friends/invite.rhtml:45 3149 +#: app/views/friends/invite.rhtml:41
3162 msgid "Step 2 of 2: Selecting Friends" 3150 msgid "Step 2 of 2: Selecting Friends"
3163 msgstr "" 3151 msgstr ""
3164 3152
3165 -#: app/views/friends/invite.rhtml:47 3153 +#: app/views/friends/invite.rhtml:43
3166 msgid "Indicate which friends you want to invite." 3154 msgid "Indicate which friends you want to invite."
3167 msgstr "" 3155 msgstr ""
3168 3156
3169 -#: app/views/friends/invite.rhtml:55  
3170 -msgid "Enter one e-mail address per line, following the example below."  
3171 -msgstr ""  
3172 -  
3173 -#: app/views/friends/invite.rhtml:56  
3174 -msgid "E-mail addresses" 3157 +#: app/views/friends/invite.rhtml:51
  3158 +msgid "Enter one e-mail address per line:"
3175 msgstr "" 3159 msgstr ""
3176 3160
3177 -#: app/views/friends/invite.rhtml:60 3161 +#: app/views/friends/invite.rhtml:55
3178 msgid "Check all" 3162 msgid "Check all"
3179 msgstr "" 3163 msgstr ""
3180 3164
3181 -#: app/views/friends/invite.rhtml:61 3165 +#: app/views/friends/invite.rhtml:56
3182 msgid "Uncheck all" 3166 msgid "Uncheck all"
3183 msgstr "" 3167 msgstr ""
3184 3168
3185 -#: app/views/friends/invite.rhtml:74 3169 +#: app/views/friends/invite.rhtml:70
3186 msgid "" 3170 msgid ""
3187 "Now enter an invitation message. You must keep the <url> code in your " 3171 "Now enter an invitation message. You must keep the <url> code in your "
3188 "invitation message. When your friends receive the invitation e-mail, <url> " 3172 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -3191,12 +3175,12 @@ msgid &quot;&quot; @@ -3191,12 +3175,12 @@ msgid &quot;&quot;
3191 "name, but they are optional." 3175 "name, but they are optional."
3192 msgstr "" 3176 msgstr ""
3193 3177
3194 -#: app/views/friends/invite.rhtml:75 3178 +#: app/views/friends/invite.rhtml:71
3195 #, fuzzy 3179 #, fuzzy
3196 -msgid "Invitation message" 3180 +msgid "Invitation message:"
3197 msgstr "Restrictions (si fournies) :" 3181 msgstr "Restrictions (si fournies) :"
3198 3182
3199 -#: app/views/friends/invite.rhtml:79 3183 +#: app/views/friends/invite.rhtml:75
3200 #, fuzzy 3184 #, fuzzy
3201 msgid "Invite my friends!" 3185 msgid "Invite my friends!"
3202 msgstr "Nouvel(le) ami(e)" 3186 msgstr "Nouvel(le) ami(e)"
po/hy/noosfero.po
  Diff comments   View file @5e6db8b
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.15.0\n" 9 "Project-Id-Version: noosfero 0.15.0\n"
10 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 10 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,7 +519,7 @@ msgstr &quot;&quot; @@ -519,7 +519,7 @@ msgstr &quot;&quot;
519 msgid "Previous" 519 msgid "Previous"
520 msgstr "" 520 msgstr ""
521 521
522 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 522 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
523 #: app/views/enterprise_registration/basic_information.rhtml:32 523 #: app/views/enterprise_registration/basic_information.rhtml:32
524 #: app/views/layouts/slideshow.rhtml:19 524 #: app/views/layouts/slideshow.rhtml:19
525 msgid "Next" 525 msgid "Next"
@@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1108 msgstr "" 1108 msgstr ""
1109 1109
1110 #: app/controllers/my_profile/friends_controller.rb:60 1110 #: app/controllers/my_profile/friends_controller.rb:60
1111 -#: app/views/friends/invite.rhtml:56  
1112 msgid "Firstname Lastname <friend@email.com>" 1111 msgid "Firstname Lastname <friend@email.com>"
1113 msgstr "" 1112 msgstr ""
1114 1113
@@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot; @@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot;
1343 msgstr "" 1342 msgstr ""
1344 1343
1345 #: app/models/user.rb:- 1344 #: app/models/user.rb:-
  1345 +msgid "user"
  1346 +msgstr ""
  1347 +
  1348 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1349 +msgid "Username"
  1350 +msgstr ""
  1351 +
  1352 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1353 +#: app/models/change_password.rb:22
  1354 +msgid "e-Mail"
  1355 +msgstr ""
  1356 +
  1357 +#: app/models/user.rb:-
  1358 +msgid "Crypted password"
  1359 +msgstr ""
  1360 +
  1361 +#: app/models/user.rb:-
  1362 +msgid "Salt"
  1363 +msgstr ""
  1364 +
  1365 +#: app/models/user.rb:- app/models/product.rb:-
  1366 +#: app/models/product_categorization.rb:-
  1367 +msgid "Updated at"
  1368 +msgstr ""
  1369 +
  1370 +#: app/models/user.rb:-
  1371 +msgid "Remember token"
  1372 +msgstr ""
  1373 +
  1374 +#: app/models/user.rb:-
  1375 +msgid "Remember token expires at"
  1376 +msgstr ""
  1377 +
  1378 +#: app/models/user.rb:-
  1379 +msgid "Terms of use"
  1380 +msgstr ""
  1381 +
  1382 +#: app/models/user.rb:- app/models/user.rb:9
  1383 +msgid "Terms accepted"
  1384 +msgstr ""
  1385 +
  1386 +#: app/models/user.rb:-
  1387 +msgid "Password type"
  1388 +msgstr ""
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Enable email"
  1392 +msgstr ""
  1393 +
  1394 +#: app/models/user.rb:-
1346 msgid "article" 1395 msgid "article"
1347 msgstr "" 1396 msgstr ""
1348 1397
@@ -1372,11 +1421,6 @@ msgstr &quot;&quot; @@ -1372,11 +1421,6 @@ msgstr &quot;&quot;
1372 msgid "Profile" 1421 msgid "Profile"
1373 msgstr "" 1422 msgstr ""
1374 1423
1375 -#: app/models/user.rb:- app/models/product.rb:-  
1376 -#: app/models/product_categorization.rb:-  
1377 -msgid "Updated at"  
1378 -msgstr ""  
1379 -  
1380 #: app/models/user.rb:- 1424 #: app/models/user.rb:-
1381 msgid "Last changed by" 1425 msgid "Last changed by"
1382 msgstr "" 1426 msgstr ""
@@ -1457,52 +1501,7 @@ msgstr &quot;&quot; @@ -1457,52 +1501,7 @@ msgstr &quot;&quot;
1457 msgid "Hits" 1501 msgid "Hits"
1458 msgstr "" 1502 msgstr ""
1459 1503
1460 -#: app/models/user.rb:-  
1461 -msgid "user"  
1462 -msgstr ""  
1463 -  
1464 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1465 -msgid "Username"  
1466 -msgstr ""  
1467 -  
1468 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1469 -#: app/models/change_password.rb:22  
1470 -msgid "e-Mail"  
1471 -msgstr ""  
1472 -  
1473 -#: app/models/user.rb:-  
1474 -msgid "Crypted password"  
1475 -msgstr ""  
1476 -  
1477 -#: app/models/user.rb:-  
1478 -msgid "Salt"  
1479 -msgstr ""  
1480 -  
1481 -#: app/models/user.rb:-  
1482 -msgid "Remember token"  
1483 -msgstr ""  
1484 -  
1485 -#: app/models/user.rb:-  
1486 -msgid "Remember token expires at"  
1487 -msgstr ""  
1488 -  
1489 -#: app/models/user.rb:-  
1490 -msgid "Terms of use"  
1491 -msgstr ""  
1492 -  
1493 -#: app/models/user.rb:- app/models/user.rb:9  
1494 -msgid "Terms accepted"  
1495 -msgstr ""  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Password type"  
1499 -msgstr ""  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Enable email"  
1503 -msgstr ""  
1504 -  
1505 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1504 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1506 msgid "Password" 1505 msgid "Password"
1507 msgstr "" 1506 msgstr ""
1508 1507
@@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot; @@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot;
2791 msgstr "" 2790 msgstr ""
2792 2791
2793 #: app/views/friends/index.rhtml:40 2792 #: app/views/friends/index.rhtml:40
2794 -msgid "Invite friends from my e-mail contacts" 2793 +msgid "Invite people from my e-mail contacts"
2795 msgstr "" 2794 msgstr ""
2796 2795
2797 #: app/views/friends/add.rhtml:1 2796 #: app/views/friends/add.rhtml:1
@@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot; @@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot;
2848 msgstr "" 2847 msgstr ""
2849 2848
2850 #: app/views/friends/invite.rhtml:6 2849 #: app/views/friends/invite.rhtml:6
2851 -msgid "Step 1 of 1: Accessing your contact list"  
2852 -msgstr ""  
2853 -  
2854 -#: app/views/friends/invite.rhtml:9  
2855 -msgid ""  
2856 -"Choose your webmail provider and enter your login and password so we can "  
2857 -"fetch your contact list. If you only want to invite specific people by "  
2858 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2859 -"\" option." 2850 +msgid "Step 1 of 1: Select address book"
2860 msgstr "" 2851 msgstr ""
2861 2852
2862 -#: app/views/friends/invite.rhtml:15  
2863 -msgid "Select your e-mail provider:" 2853 +#: app/views/friends/invite.rhtml:12
  2854 +msgid "Manually (empty field)"
2864 msgstr "" 2855 msgstr ""
2865 2856
2866 -#: app/views/friends/invite.rhtml:19  
2867 -msgid "Enter e-mail addresses manually"  
2868 -msgstr ""  
2869 -  
2870 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2857 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2871 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2858 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2872 msgid "Login" 2859 msgid "Login"
2873 msgstr "" 2860 msgstr ""
2874 2861
2875 -#: app/views/friends/invite.rhtml:39 2862 +#: app/views/friends/invite.rhtml:35
2876 msgid "We won't store your password or contact anyone without your permission." 2863 msgid "We won't store your password or contact anyone without your permission."
2877 msgstr "" 2864 msgstr ""
2878 2865
2879 -#: app/views/friends/invite.rhtml:45 2866 +#: app/views/friends/invite.rhtml:41
2880 msgid "Step 2 of 2: Selecting Friends" 2867 msgid "Step 2 of 2: Selecting Friends"
2881 msgstr "" 2868 msgstr ""
2882 2869
2883 -#: app/views/friends/invite.rhtml:47 2870 +#: app/views/friends/invite.rhtml:43
2884 msgid "Indicate which friends you want to invite." 2871 msgid "Indicate which friends you want to invite."
2885 msgstr "" 2872 msgstr ""
2886 2873
2887 -#: app/views/friends/invite.rhtml:55  
2888 -msgid "Enter one e-mail address per line, following the example below."  
2889 -msgstr ""  
2890 -  
2891 -#: app/views/friends/invite.rhtml:56  
2892 -msgid "E-mail addresses" 2874 +#: app/views/friends/invite.rhtml:51
  2875 +msgid "Enter one e-mail address per line:"
2893 msgstr "" 2876 msgstr ""
2894 2877
2895 -#: app/views/friends/invite.rhtml:60 2878 +#: app/views/friends/invite.rhtml:55
2896 msgid "Check all" 2879 msgid "Check all"
2897 msgstr "" 2880 msgstr ""
2898 2881
2899 -#: app/views/friends/invite.rhtml:61 2882 +#: app/views/friends/invite.rhtml:56
2900 msgid "Uncheck all" 2883 msgid "Uncheck all"
2901 msgstr "" 2884 msgstr ""
2902 2885
2903 -#: app/views/friends/invite.rhtml:74 2886 +#: app/views/friends/invite.rhtml:70
2904 msgid "" 2887 msgid ""
2905 "Now enter an invitation message. You must keep the <url> code in your " 2888 "Now enter an invitation message. You must keep the <url> code in your "
2906 "invitation message. When your friends receive the invitation e-mail, <url> " 2889 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2909,11 +2892,11 @@ msgid &quot;&quot; @@ -2909,11 +2892,11 @@ msgid &quot;&quot;
2909 "name, but they are optional." 2892 "name, but they are optional."
2910 msgstr "" 2893 msgstr ""
2911 2894
2912 -#: app/views/friends/invite.rhtml:75  
2913 -msgid "Invitation message" 2895 +#: app/views/friends/invite.rhtml:71
  2896 +msgid "Invitation message:"
2914 msgstr "" 2897 msgstr ""
2915 2898
2916 -#: app/views/friends/invite.rhtml:79 2899 +#: app/views/friends/invite.rhtml:75
2917 msgid "Invite my friends!" 2900 msgid "Invite my friends!"
2918 msgstr "" 2901 msgstr ""
2919 2902
po/nl/noosfero.po
  Diff comments   View file @5e6db8b
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.15.0\n" 9 "Project-Id-Version: noosfero 0.15.0\n"
10 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 10 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,7 +519,7 @@ msgstr &quot;&quot; @@ -519,7 +519,7 @@ msgstr &quot;&quot;
519 msgid "Previous" 519 msgid "Previous"
520 msgstr "" 520 msgstr ""
521 521
522 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 522 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
523 #: app/views/enterprise_registration/basic_information.rhtml:32 523 #: app/views/enterprise_registration/basic_information.rhtml:32
524 #: app/views/layouts/slideshow.rhtml:19 524 #: app/views/layouts/slideshow.rhtml:19
525 msgid "Next" 525 msgid "Next"
@@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1108 msgstr "" 1108 msgstr ""
1109 1109
1110 #: app/controllers/my_profile/friends_controller.rb:60 1110 #: app/controllers/my_profile/friends_controller.rb:60
1111 -#: app/views/friends/invite.rhtml:56  
1112 msgid "Firstname Lastname <friend@email.com>" 1111 msgid "Firstname Lastname <friend@email.com>"
1113 msgstr "" 1112 msgstr ""
1114 1113
@@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot; @@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot;
1343 msgstr "" 1342 msgstr ""
1344 1343
1345 #: app/models/user.rb:- 1344 #: app/models/user.rb:-
  1345 +msgid "user"
  1346 +msgstr ""
  1347 +
  1348 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1349 +msgid "Username"
  1350 +msgstr ""
  1351 +
  1352 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1353 +#: app/models/change_password.rb:22
  1354 +msgid "e-Mail"
  1355 +msgstr ""
  1356 +
  1357 +#: app/models/user.rb:-
  1358 +msgid "Crypted password"
  1359 +msgstr ""
  1360 +
  1361 +#: app/models/user.rb:-
  1362 +msgid "Salt"
  1363 +msgstr ""
  1364 +
  1365 +#: app/models/user.rb:- app/models/product.rb:-
  1366 +#: app/models/product_categorization.rb:-
  1367 +msgid "Updated at"
  1368 +msgstr ""
  1369 +
  1370 +#: app/models/user.rb:-
  1371 +msgid "Remember token"
  1372 +msgstr ""
  1373 +
  1374 +#: app/models/user.rb:-
  1375 +msgid "Remember token expires at"
  1376 +msgstr ""
  1377 +
  1378 +#: app/models/user.rb:-
  1379 +msgid "Terms of use"
  1380 +msgstr ""
  1381 +
  1382 +#: app/models/user.rb:- app/models/user.rb:9
  1383 +msgid "Terms accepted"
  1384 +msgstr ""
  1385 +
  1386 +#: app/models/user.rb:-
  1387 +msgid "Password type"
  1388 +msgstr ""
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Enable email"
  1392 +msgstr ""
  1393 +
  1394 +#: app/models/user.rb:-
1346 msgid "article" 1395 msgid "article"
1347 msgstr "" 1396 msgstr ""
1348 1397
@@ -1372,11 +1421,6 @@ msgstr &quot;&quot; @@ -1372,11 +1421,6 @@ msgstr &quot;&quot;
1372 msgid "Profile" 1421 msgid "Profile"
1373 msgstr "" 1422 msgstr ""
1374 1423
1375 -#: app/models/user.rb:- app/models/product.rb:-  
1376 -#: app/models/product_categorization.rb:-  
1377 -msgid "Updated at"  
1378 -msgstr ""  
1379 -  
1380 #: app/models/user.rb:- 1424 #: app/models/user.rb:-
1381 msgid "Last changed by" 1425 msgid "Last changed by"
1382 msgstr "" 1426 msgstr ""
@@ -1457,52 +1501,7 @@ msgstr &quot;&quot; @@ -1457,52 +1501,7 @@ msgstr &quot;&quot;
1457 msgid "Hits" 1501 msgid "Hits"
1458 msgstr "" 1502 msgstr ""
1459 1503
1460 -#: app/models/user.rb:-  
1461 -msgid "user"  
1462 -msgstr ""  
1463 -  
1464 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1465 -msgid "Username"  
1466 -msgstr ""  
1467 -  
1468 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1469 -#: app/models/change_password.rb:22  
1470 -msgid "e-Mail"  
1471 -msgstr ""  
1472 -  
1473 -#: app/models/user.rb:-  
1474 -msgid "Crypted password"  
1475 -msgstr ""  
1476 -  
1477 -#: app/models/user.rb:-  
1478 -msgid "Salt"  
1479 -msgstr ""  
1480 -  
1481 -#: app/models/user.rb:-  
1482 -msgid "Remember token"  
1483 -msgstr ""  
1484 -  
1485 -#: app/models/user.rb:-  
1486 -msgid "Remember token expires at"  
1487 -msgstr ""  
1488 -  
1489 -#: app/models/user.rb:-  
1490 -msgid "Terms of use"  
1491 -msgstr ""  
1492 -  
1493 -#: app/models/user.rb:- app/models/user.rb:9  
1494 -msgid "Terms accepted"  
1495 -msgstr ""  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Password type"  
1499 -msgstr ""  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Enable email"  
1503 -msgstr ""  
1504 -  
1505 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1504 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1506 msgid "Password" 1505 msgid "Password"
1507 msgstr "" 1506 msgstr ""
1508 1507
@@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot; @@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot;
2791 msgstr "" 2790 msgstr ""
2792 2791
2793 #: app/views/friends/index.rhtml:40 2792 #: app/views/friends/index.rhtml:40
2794 -msgid "Invite friends from my e-mail contacts" 2793 +msgid "Invite people from my e-mail contacts"
2795 msgstr "" 2794 msgstr ""
2796 2795
2797 #: app/views/friends/add.rhtml:1 2796 #: app/views/friends/add.rhtml:1
@@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot; @@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot;
2848 msgstr "" 2847 msgstr ""
2849 2848
2850 #: app/views/friends/invite.rhtml:6 2849 #: app/views/friends/invite.rhtml:6
2851 -msgid "Step 1 of 1: Accessing your contact list"  
2852 -msgstr ""  
2853 -  
2854 -#: app/views/friends/invite.rhtml:9  
2855 -msgid ""  
2856 -"Choose your webmail provider and enter your login and password so we can "  
2857 -"fetch your contact list. If you only want to invite specific people by "  
2858 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2859 -"\" option." 2850 +msgid "Step 1 of 1: Select address book"
2860 msgstr "" 2851 msgstr ""
2861 2852
2862 -#: app/views/friends/invite.rhtml:15  
2863 -msgid "Select your e-mail provider:" 2853 +#: app/views/friends/invite.rhtml:12
  2854 +msgid "Manually (empty field)"
2864 msgstr "" 2855 msgstr ""
2865 2856
2866 -#: app/views/friends/invite.rhtml:19  
2867 -msgid "Enter e-mail addresses manually"  
2868 -msgstr ""  
2869 -  
2870 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2857 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2871 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2858 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2872 msgid "Login" 2859 msgid "Login"
2873 msgstr "" 2860 msgstr ""
2874 2861
2875 -#: app/views/friends/invite.rhtml:39 2862 +#: app/views/friends/invite.rhtml:35
2876 msgid "We won't store your password or contact anyone without your permission." 2863 msgid "We won't store your password or contact anyone without your permission."
2877 msgstr "" 2864 msgstr ""
2878 2865
2879 -#: app/views/friends/invite.rhtml:45 2866 +#: app/views/friends/invite.rhtml:41
2880 msgid "Step 2 of 2: Selecting Friends" 2867 msgid "Step 2 of 2: Selecting Friends"
2881 msgstr "" 2868 msgstr ""
2882 2869
2883 -#: app/views/friends/invite.rhtml:47 2870 +#: app/views/friends/invite.rhtml:43
2884 msgid "Indicate which friends you want to invite." 2871 msgid "Indicate which friends you want to invite."
2885 msgstr "" 2872 msgstr ""
2886 2873
2887 -#: app/views/friends/invite.rhtml:55  
2888 -msgid "Enter one e-mail address per line, following the example below."  
2889 -msgstr ""  
2890 -  
2891 -#: app/views/friends/invite.rhtml:56  
2892 -msgid "E-mail addresses" 2874 +#: app/views/friends/invite.rhtml:51
  2875 +msgid "Enter one e-mail address per line:"
2893 msgstr "" 2876 msgstr ""
2894 2877
2895 -#: app/views/friends/invite.rhtml:60 2878 +#: app/views/friends/invite.rhtml:55
2896 msgid "Check all" 2879 msgid "Check all"
2897 msgstr "" 2880 msgstr ""
2898 2881
2899 -#: app/views/friends/invite.rhtml:61 2882 +#: app/views/friends/invite.rhtml:56
2900 msgid "Uncheck all" 2883 msgid "Uncheck all"
2901 msgstr "" 2884 msgstr ""
2902 2885
2903 -#: app/views/friends/invite.rhtml:74 2886 +#: app/views/friends/invite.rhtml:70
2904 msgid "" 2887 msgid ""
2905 "Now enter an invitation message. You must keep the <url> code in your " 2888 "Now enter an invitation message. You must keep the <url> code in your "
2906 "invitation message. When your friends receive the invitation e-mail, <url> " 2889 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2909,11 +2892,11 @@ msgid &quot;&quot; @@ -2909,11 +2892,11 @@ msgid &quot;&quot;
2909 "name, but they are optional." 2892 "name, but they are optional."
2910 msgstr "" 2893 msgstr ""
2911 2894
2912 -#: app/views/friends/invite.rhtml:75  
2913 -msgid "Invitation message" 2895 +#: app/views/friends/invite.rhtml:71
  2896 +msgid "Invitation message:"
2914 msgstr "" 2897 msgstr ""
2915 2898
2916 -#: app/views/friends/invite.rhtml:79 2899 +#: app/views/friends/invite.rhtml:75
2917 msgid "Invite my friends!" 2900 msgid "Invite my friends!"
2918 msgstr "" 2901 msgstr ""
2919 2902
po/noosfero.pot
  Diff comments   View file @5e6db8b
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.15.0\n" 9 "Project-Id-Version: noosfero 0.15.0\n"
10 -"POT-Creation-Date: 2009-03-05 18:28-0300\n" 10 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -519,7 +519,7 @@ msgstr &quot;&quot; @@ -519,7 +519,7 @@ msgstr &quot;&quot;
519 msgid "Previous" 519 msgid "Previous"
520 msgstr "" 520 msgstr ""
521 521
522 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 522 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
523 #: app/views/enterprise_registration/basic_information.rhtml:32 523 #: app/views/enterprise_registration/basic_information.rhtml:32
524 #: app/views/layouts/slideshow.rhtml:19 524 #: app/views/layouts/slideshow.rhtml:19
525 msgid "Next" 525 msgid "Next"
@@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1108,7 +1108,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1108 msgstr "" 1108 msgstr ""
1109 1109
1110 #: app/controllers/my_profile/friends_controller.rb:60 1110 #: app/controllers/my_profile/friends_controller.rb:60
1111 -#: app/views/friends/invite.rhtml:56  
1112 msgid "Firstname Lastname <friend@email.com>" 1111 msgid "Firstname Lastname <friend@email.com>"
1113 msgstr "" 1112 msgstr ""
1114 1113
@@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot; @@ -1343,6 +1342,56 @@ msgid &quot;Birth date&quot;
1343 msgstr "" 1342 msgstr ""
1344 1343
1345 #: app/models/user.rb:- 1344 #: app/models/user.rb:-
  1345 +msgid "user"
  1346 +msgstr ""
  1347 +
  1348 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1349 +msgid "Username"
  1350 +msgstr ""
  1351 +
  1352 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1353 +#: app/models/change_password.rb:22
  1354 +msgid "e-Mail"
  1355 +msgstr ""
  1356 +
  1357 +#: app/models/user.rb:-
  1358 +msgid "Crypted password"
  1359 +msgstr ""
  1360 +
  1361 +#: app/models/user.rb:-
  1362 +msgid "Salt"
  1363 +msgstr ""
  1364 +
  1365 +#: app/models/user.rb:- app/models/product.rb:-
  1366 +#: app/models/product_categorization.rb:-
  1367 +msgid "Updated at"
  1368 +msgstr ""
  1369 +
  1370 +#: app/models/user.rb:-
  1371 +msgid "Remember token"
  1372 +msgstr ""
  1373 +
  1374 +#: app/models/user.rb:-
  1375 +msgid "Remember token expires at"
  1376 +msgstr ""
  1377 +
  1378 +#: app/models/user.rb:-
  1379 +msgid "Terms of use"
  1380 +msgstr ""
  1381 +
  1382 +#: app/models/user.rb:- app/models/user.rb:9
  1383 +msgid "Terms accepted"
  1384 +msgstr ""
  1385 +
  1386 +#: app/models/user.rb:-
  1387 +msgid "Password type"
  1388 +msgstr ""
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Enable email"
  1392 +msgstr ""
  1393 +
  1394 +#: app/models/user.rb:-
1346 msgid "article" 1395 msgid "article"
1347 msgstr "" 1396 msgstr ""
1348 1397
@@ -1372,11 +1421,6 @@ msgstr &quot;&quot; @@ -1372,11 +1421,6 @@ msgstr &quot;&quot;
1372 msgid "Profile" 1421 msgid "Profile"
1373 msgstr "" 1422 msgstr ""
1374 1423
1375 -#: app/models/user.rb:- app/models/product.rb:-  
1376 -#: app/models/product_categorization.rb:-  
1377 -msgid "Updated at"  
1378 -msgstr ""  
1379 -  
1380 #: app/models/user.rb:- 1424 #: app/models/user.rb:-
1381 msgid "Last changed by" 1425 msgid "Last changed by"
1382 msgstr "" 1426 msgstr ""
@@ -1457,52 +1501,7 @@ msgstr &quot;&quot; @@ -1457,52 +1501,7 @@ msgstr &quot;&quot;
1457 msgid "Hits" 1501 msgid "Hits"
1458 msgstr "" 1502 msgstr ""
1459 1503
1460 -#: app/models/user.rb:-  
1461 -msgid "user"  
1462 -msgstr ""  
1463 -  
1464 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1465 -msgid "Username"  
1466 -msgstr ""  
1467 -  
1468 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1469 -#: app/models/change_password.rb:22  
1470 -msgid "e-Mail"  
1471 -msgstr ""  
1472 -  
1473 -#: app/models/user.rb:-  
1474 -msgid "Crypted password"  
1475 -msgstr ""  
1476 -  
1477 -#: app/models/user.rb:-  
1478 -msgid "Salt"  
1479 -msgstr ""  
1480 -  
1481 -#: app/models/user.rb:-  
1482 -msgid "Remember token"  
1483 -msgstr ""  
1484 -  
1485 -#: app/models/user.rb:-  
1486 -msgid "Remember token expires at"  
1487 -msgstr ""  
1488 -  
1489 -#: app/models/user.rb:-  
1490 -msgid "Terms of use"  
1491 -msgstr ""  
1492 -  
1493 -#: app/models/user.rb:- app/models/user.rb:9  
1494 -msgid "Terms accepted"  
1495 -msgstr ""  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Password type"  
1499 -msgstr ""  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Enable email"  
1503 -msgstr ""  
1504 -  
1505 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1504 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1506 msgid "Password" 1505 msgid "Password"
1507 msgstr "" 1506 msgstr ""
1508 1507
@@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot; @@ -2791,7 +2790,7 @@ msgid &quot;Find people&quot;
2791 msgstr "" 2790 msgstr ""
2792 2791
2793 #: app/views/friends/index.rhtml:40 2792 #: app/views/friends/index.rhtml:40
2794 -msgid "Invite friends from my e-mail contacts" 2793 +msgid "Invite people from my e-mail contacts"
2795 msgstr "" 2794 msgstr ""
2796 2795
2797 #: app/views/friends/add.rhtml:1 2796 #: app/views/friends/add.rhtml:1
@@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot; @@ -2848,59 +2847,43 @@ msgid &quot;Invite your friends&quot;
2848 msgstr "" 2847 msgstr ""
2849 2848
2850 #: app/views/friends/invite.rhtml:6 2849 #: app/views/friends/invite.rhtml:6
2851 -msgid "Step 1 of 1: Accessing your contact list"  
2852 -msgstr ""  
2853 -  
2854 -#: app/views/friends/invite.rhtml:9  
2855 -msgid ""  
2856 -"Choose your webmail provider and enter your login and password so we can "  
2857 -"fetch your contact list. If you only want to invite specific people by "  
2858 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2859 -"\" option." 2850 +msgid "Step 1 of 1: Select address book"
2860 msgstr "" 2851 msgstr ""
2861 2852
2862 -#: app/views/friends/invite.rhtml:15  
2863 -msgid "Select your e-mail provider:" 2853 +#: app/views/friends/invite.rhtml:12
  2854 +msgid "Manually (empty field)"
2864 msgstr "" 2855 msgstr ""
2865 2856
2866 -#: app/views/friends/invite.rhtml:19  
2867 -msgid "Enter e-mail addresses manually"  
2868 -msgstr ""  
2869 -  
2870 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2857 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2871 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2858 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2872 msgid "Login" 2859 msgid "Login"
2873 msgstr "" 2860 msgstr ""
2874 2861
2875 -#: app/views/friends/invite.rhtml:39 2862 +#: app/views/friends/invite.rhtml:35
2876 msgid "We won't store your password or contact anyone without your permission." 2863 msgid "We won't store your password or contact anyone without your permission."
2877 msgstr "" 2864 msgstr ""
2878 2865
2879 -#: app/views/friends/invite.rhtml:45 2866 +#: app/views/friends/invite.rhtml:41
2880 msgid "Step 2 of 2: Selecting Friends" 2867 msgid "Step 2 of 2: Selecting Friends"
2881 msgstr "" 2868 msgstr ""
2882 2869
2883 -#: app/views/friends/invite.rhtml:47 2870 +#: app/views/friends/invite.rhtml:43
2884 msgid "Indicate which friends you want to invite." 2871 msgid "Indicate which friends you want to invite."
2885 msgstr "" 2872 msgstr ""
2886 2873
2887 -#: app/views/friends/invite.rhtml:55  
2888 -msgid "Enter one e-mail address per line, following the example below."  
2889 -msgstr ""  
2890 -  
2891 -#: app/views/friends/invite.rhtml:56  
2892 -msgid "E-mail addresses" 2874 +#: app/views/friends/invite.rhtml:51
  2875 +msgid "Enter one e-mail address per line:"
2893 msgstr "" 2876 msgstr ""
2894 2877
2895 -#: app/views/friends/invite.rhtml:60 2878 +#: app/views/friends/invite.rhtml:55
2896 msgid "Check all" 2879 msgid "Check all"
2897 msgstr "" 2880 msgstr ""
2898 2881
2899 -#: app/views/friends/invite.rhtml:61 2882 +#: app/views/friends/invite.rhtml:56
2900 msgid "Uncheck all" 2883 msgid "Uncheck all"
2901 msgstr "" 2884 msgstr ""
2902 2885
2903 -#: app/views/friends/invite.rhtml:74 2886 +#: app/views/friends/invite.rhtml:70
2904 msgid "" 2887 msgid ""
2905 "Now enter an invitation message. You must keep the <url> code in your " 2888 "Now enter an invitation message. You must keep the <url> code in your "
2906 "invitation message. When your friends receive the invitation e-mail, <url> " 2889 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2909,11 +2892,11 @@ msgid &quot;&quot; @@ -2909,11 +2892,11 @@ msgid &quot;&quot;
2909 "name, but they are optional." 2892 "name, but they are optional."
2910 msgstr "" 2893 msgstr ""
2911 2894
2912 -#: app/views/friends/invite.rhtml:75  
2913 -msgid "Invitation message" 2895 +#: app/views/friends/invite.rhtml:71
  2896 +msgid "Invitation message:"
2914 msgstr "" 2897 msgstr ""
2915 2898
2916 -#: app/views/friends/invite.rhtml:79 2899 +#: app/views/friends/invite.rhtml:75
2917 msgid "Invite my friends!" 2900 msgid "Invite my friends!"
2918 msgstr "" 2901 msgstr ""
2919 2902
po/pt_BR/noosfero.po
  Diff comments   View file @5e6db8b
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 msgid "" 12 msgid ""
13 msgstr "" 13 msgstr ""
14 "Project-Id-Version: noosfero 0.15.0\n" 14 "Project-Id-Version: noosfero 0.15.0\n"
15 -"POT-Creation-Date: 2009-03-05 18:28-0300\n"  
16 -"PO-Revision-Date: 2009-03-05 19:00-0300\n" 15 +"POT-Creation-Date: 2009-03-18 11:43-0300\n"
  16 +"PO-Revision-Date: 2009-03-18 11:55-0300\n"
17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n" 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 "Language-Team: LANGUAGE <LL@li.org>\n" 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 "MIME-Version: 1.0\n" 19 "MIME-Version: 1.0\n"
@@ -525,7 +525,7 @@ msgstr &quot;Categoria: &quot; @@ -525,7 +525,7 @@ msgstr &quot;Categoria: &quot;
525 msgid "Previous" 525 msgid "Previous"
526 msgstr "Anterior" 526 msgstr "Anterior"
527 527
528 -#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:37 528 +#: app/helpers/search_helper.rb:99 app/views/friends/invite.rhtml:33
529 #: app/views/enterprise_registration/basic_information.rhtml:32 529 #: app/views/enterprise_registration/basic_information.rhtml:32
530 #: app/views/layouts/slideshow.rhtml:19 530 #: app/views/layouts/slideshow.rhtml:19
531 msgid "Next" 531 msgid "Next"
@@ -1123,7 +1123,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot; @@ -1123,7 +1123,6 @@ msgid &quot;&amp;lt;url&amp;gt; is needed in invitation message.&quot;
1123 msgstr "&lt;url&gt; é necessária na mensagem de convite." 1123 msgstr "&lt;url&gt; é necessária na mensagem de convite."
1124 1124
1125 #: app/controllers/my_profile/friends_controller.rb:60 1125 #: app/controllers/my_profile/friends_controller.rb:60
1126 -#: app/views/friends/invite.rhtml:56  
1127 msgid "Firstname Lastname <friend@email.com>" 1126 msgid "Firstname Lastname <friend@email.com>"
1128 msgstr "Nome Sobrenome <amigo@email.com>" 1127 msgstr "Nome Sobrenome <amigo@email.com>"
1129 1128
@@ -1363,6 +1362,56 @@ msgid &quot;Birth date&quot; @@ -1363,6 +1362,56 @@ msgid &quot;Birth date&quot;
1363 msgstr "Data de nascimento" 1362 msgstr "Data de nascimento"
1364 1363
1365 #: app/models/user.rb:- 1364 #: app/models/user.rb:-
  1365 +msgid "user"
  1366 +msgstr "usuário"
  1367 +
  1368 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
  1369 +msgid "Username"
  1370 +msgstr "Nome de usuário"
  1371 +
  1372 +#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13
  1373 +#: app/models/change_password.rb:22
  1374 +msgid "e-Mail"
  1375 +msgstr "e-Mail"
  1376 +
  1377 +#: app/models/user.rb:-
  1378 +msgid "Crypted password"
  1379 +msgstr "Senha criptografada"
  1380 +
  1381 +#: app/models/user.rb:-
  1382 +msgid "Salt"
  1383 +msgstr "Sal"
  1384 +
  1385 +#: app/models/user.rb:- app/models/product.rb:-
  1386 +#: app/models/product_categorization.rb:-
  1387 +msgid "Updated at"
  1388 +msgstr "Atualizado em"
  1389 +
  1390 +#: app/models/user.rb:-
  1391 +msgid "Remember token"
  1392 +msgstr "Lembrar token"
  1393 +
  1394 +#: app/models/user.rb:-
  1395 +msgid "Remember token expires at"
  1396 +msgstr "Lembre do token que expira em"
  1397 +
  1398 +#: app/models/user.rb:-
  1399 +msgid "Terms of use"
  1400 +msgstr "Termos de Uso"
  1401 +
  1402 +#: app/models/user.rb:- app/models/user.rb:9
  1403 +msgid "Terms accepted"
  1404 +msgstr "Termos aceitos"
  1405 +
  1406 +#: app/models/user.rb:-
  1407 +msgid "Password type"
  1408 +msgstr "Tipo de senha"
  1409 +
  1410 +#: app/models/user.rb:-
  1411 +msgid "Enable email"
  1412 +msgstr "Habilitar e-mail"
  1413 +
  1414 +#: app/models/user.rb:-
1366 msgid "article" 1415 msgid "article"
1367 msgstr "artigo" 1416 msgstr "artigo"
1368 1417
@@ -1392,11 +1441,6 @@ msgstr &quot;Resumo&quot; @@ -1392,11 +1441,6 @@ msgstr &quot;Resumo&quot;
1392 msgid "Profile" 1441 msgid "Profile"
1393 msgstr "Perfil" 1442 msgstr "Perfil"
1394 1443
1395 -#: app/models/user.rb:- app/models/product.rb:-  
1396 -#: app/models/product_categorization.rb:-  
1397 -msgid "Updated at"  
1398 -msgstr "Atualizado em"  
1399 -  
1400 #: app/models/user.rb:- 1444 #: app/models/user.rb:-
1401 msgid "Last changed by" 1445 msgid "Last changed by"
1402 msgstr "Última atualização de" 1446 msgstr "Última atualização de"
@@ -1477,52 +1521,7 @@ msgstr &quot;Notificar comentários&quot; @@ -1477,52 +1521,7 @@ msgstr &quot;Notificar comentários&quot;
1477 msgid "Hits" 1521 msgid "Hits"
1478 msgstr "Visualizações" 1522 msgstr "Visualizações"
1479 1523
1480 -#: app/models/user.rb:-  
1481 -msgid "user"  
1482 -msgstr "usuário"  
1483 -  
1484 -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21  
1485 -msgid "Username"  
1486 -msgstr "Nome de usuário"  
1487 -  
1488 -#: app/models/user.rb:- app/models/user.rb:15 app/models/contact.rb:13  
1489 -#: app/models/change_password.rb:22  
1490 -msgid "e-Mail"  
1491 -msgstr "e-Mail"  
1492 -  
1493 -#: app/models/user.rb:-  
1494 -msgid "Crypted password"  
1495 -msgstr "Senha criptografada"  
1496 -  
1497 -#: app/models/user.rb:-  
1498 -msgid "Salt"  
1499 -msgstr "Sal"  
1500 -  
1501 -#: app/models/user.rb:-  
1502 -msgid "Remember token"  
1503 -msgstr "Lembrar token"  
1504 -  
1505 -#: app/models/user.rb:-  
1506 -msgid "Remember token expires at"  
1507 -msgstr "Lembre do token que expira em"  
1508 -  
1509 -#: app/models/user.rb:-  
1510 -msgid "Terms of use"  
1511 -msgstr "Termos de Uso"  
1512 -  
1513 -#: app/models/user.rb:- app/models/user.rb:9  
1514 -msgid "Terms accepted"  
1515 -msgstr "Termos aceitos"  
1516 -  
1517 -#: app/models/user.rb:-  
1518 -msgid "Password type"  
1519 -msgstr "Tipo de senha"  
1520 -  
1521 -#: app/models/user.rb:-  
1522 -msgid "Enable email"  
1523 -msgstr "Habilitar e-mail"  
1524 -  
1525 -#: app/models/user.rb:7 app/views/friends/invite.rhtml:33 1524 +#: app/models/user.rb:7 app/views/friends/invite.rhtml:29
1526 msgid "Password" 1525 msgid "Password"
1527 msgstr "Senha" 1526 msgstr "Senha"
1528 1527
@@ -2849,8 +2848,8 @@ msgid &quot;Find people&quot; @@ -2849,8 +2848,8 @@ msgid &quot;Find people&quot;
2849 msgstr "Buscar pessoas" 2848 msgstr "Buscar pessoas"
2850 2849
2851 #: app/views/friends/index.rhtml:40 2850 #: app/views/friends/index.rhtml:40
2852 -msgid "Invite friends from my e-mail contacts"  
2853 -msgstr "Convidar amigos dos meus contatos de e-mail" 2851 +msgid "Invite people from my e-mail contacts"
  2852 +msgstr "Convidar pessoas dos meus contatos de e-mail"
2854 2853
2855 #: app/views/friends/add.rhtml:1 2854 #: app/views/friends/add.rhtml:1
2856 msgid "Adding %s as a friend" 2855 msgid "Adding %s as a friend"
@@ -2908,64 +2907,44 @@ msgid &quot;Invite your friends&quot; @@ -2908,64 +2907,44 @@ msgid &quot;Invite your friends&quot;
2908 msgstr "Convide seus amigos" 2907 msgstr "Convide seus amigos"
2909 2908
2910 #: app/views/friends/invite.rhtml:6 2909 #: app/views/friends/invite.rhtml:6
2911 -msgid "Step 1 of 1: Accessing your contact list"  
2912 -msgstr "Passo 1 de 1: Acessando sua lista de contatos"  
2913 -  
2914 -#: app/views/friends/invite.rhtml:9  
2915 -msgid ""  
2916 -"Choose your webmail provider and enter your login and password so we can "  
2917 -"fetch your contact list. If you only want to invite specific people by "  
2918 -"listing their e-mail addresses, select the \"Enter e-mail addresses manually"  
2919 -"\" option."  
2920 -msgstr ""  
2921 -"Escolha seu provedor de webmail e entre seu login e senha para que possamos "  
2922 -"obter sua lista de contatos. Se você quiser convidar pessoas específicas "  
2923 -"informando seus endereços de e-mail, selecione a opção \"Digitar endereços "  
2924 -"de e-mail manualmente\"."  
2925 -  
2926 -#: app/views/friends/invite.rhtml:15  
2927 -msgid "Select your e-mail provider:"  
2928 -msgstr "Selecione seu provedor de e-mail:" 2910 +msgid "Step 1 of 1: Select address book"
  2911 +msgstr "Passo 2 de 2: Selecionar lista de endereços"
2929 2912
2930 -#: app/views/friends/invite.rhtml:19  
2931 -msgid "Enter e-mail addresses manually"  
2932 -msgstr "Digitar endereços de e-mail manualmente" 2913 +#: app/views/friends/invite.rhtml:12
  2914 +msgid "Manually (empty field)"
  2915 +msgstr "Manualmente (campo em branco)"
2933 2916
2934 -#: app/views/friends/invite.rhtml:32 app/views/shared/user_menu.rhtml:60 2917 +#: app/views/friends/invite.rhtml:28 app/views/shared/user_menu.rhtml:60
2935 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3 2918 #: app/views/account/login_block.rhtml:4 app/views/account/login.rhtml:3
2936 msgid "Login" 2919 msgid "Login"
2937 msgstr "Entrar" 2920 msgstr "Entrar"
2938 2921
2939 -#: app/views/friends/invite.rhtml:39 2922 +#: app/views/friends/invite.rhtml:35
2940 msgid "We won't store your password or contact anyone without your permission." 2923 msgid "We won't store your password or contact anyone without your permission."
2941 msgstr "" 2924 msgstr ""
2942 "Nós não armazenamos sua senha nem contactamos ninguém sem sua permissão." 2925 "Nós não armazenamos sua senha nem contactamos ninguém sem sua permissão."
2943 2926
2944 -#: app/views/friends/invite.rhtml:45 2927 +#: app/views/friends/invite.rhtml:41
2945 msgid "Step 2 of 2: Selecting Friends" 2928 msgid "Step 2 of 2: Selecting Friends"
2946 msgstr "Passo 2 de 2: Selecionando Amigos" 2929 msgstr "Passo 2 de 2: Selecionando Amigos"
2947 2930
2948 -#: app/views/friends/invite.rhtml:47 2931 +#: app/views/friends/invite.rhtml:43
2949 msgid "Indicate which friends you want to invite." 2932 msgid "Indicate which friends you want to invite."
2950 msgstr "Indique quais amigos você quer convidar." 2933 msgstr "Indique quais amigos você quer convidar."
2951 2934
2952 -#: app/views/friends/invite.rhtml:55  
2953 -msgid "Enter one e-mail address per line, following the example below."  
2954 -msgstr "Entre um endereço de e-mail por linha, seguindo o exemplo abaixo."  
2955 -  
2956 -#: app/views/friends/invite.rhtml:56  
2957 -msgid "E-mail addresses"  
2958 -msgstr "Endereços de e-mail" 2935 +#: app/views/friends/invite.rhtml:51
  2936 +msgid "Enter one e-mail address per line:"
  2937 +msgstr "Digite um endereço de e-mail por linha:"
2959 2938
2960 -#: app/views/friends/invite.rhtml:60 2939 +#: app/views/friends/invite.rhtml:55
2961 msgid "Check all" 2940 msgid "Check all"
2962 msgstr "Marcar todos" 2941 msgstr "Marcar todos"
2963 2942
2964 -#: app/views/friends/invite.rhtml:61 2943 +#: app/views/friends/invite.rhtml:56
2965 msgid "Uncheck all" 2944 msgid "Uncheck all"
2966 msgstr "Desmarcar todos" 2945 msgstr "Desmarcar todos"
2967 2946
2968 -#: app/views/friends/invite.rhtml:74 2947 +#: app/views/friends/invite.rhtml:70
2969 msgid "" 2948 msgid ""
2970 "Now enter an invitation message. You must keep the <url> code in your " 2949 "Now enter an invitation message. You must keep the <url> code in your "
2971 "invitation message. When your friends receive the invitation e-mail, <url> " 2950 "invitation message. When your friends receive the invitation e-mail, <url> "
@@ -2979,11 +2958,11 @@ msgstr &quot;&quot; @@ -2979,11 +2958,11 @@ msgstr &quot;&quot;
2979 "<user> e <friend> serão substituídos por seu nome e do amigo, mas são " 2958 "<user> e <friend> serão substituídos por seu nome e do amigo, mas são "
2980 "opcionais." 2959 "opcionais."
2981 2960
2982 -#: app/views/friends/invite.rhtml:75  
2983 -msgid "Invitation message"  
2984 -msgstr "Mensagem de convite" 2961 +#: app/views/friends/invite.rhtml:71
  2962 +msgid "Invitation message:"
  2963 +msgstr "Mensagem de convite:"
2985 2964
2986 -#: app/views/friends/invite.rhtml:79 2965 +#: app/views/friends/invite.rhtml:75
2987 msgid "Invite my friends!" 2966 msgid "Invite my friends!"
2988 msgstr "Convidar meus amigos!" 2967 msgstr "Convidar meus amigos!"
2989 2968
@@ -5919,6 +5898,29 @@ msgstr &quot;Criar novo grupo&quot; @@ -5919,6 +5898,29 @@ msgstr &quot;Criar novo grupo&quot;
5919 msgid "Do you want to join this group?" 5898 msgid "Do you want to join this group?"
5920 msgstr "Você quer entrar neste grupo?" 5899 msgstr "Você quer entrar neste grupo?"
5921 5900
  5901 +#~ msgid "Step 1 of 1: Accessing your contact list"
  5902 +#~ msgstr "Passo 1 de 1: Acessando sua lista de contatos"
  5903 +
  5904 +#~ msgid ""
  5905 +#~ "Choose your webmail provider and enter your login and password so we can "
  5906 +#~ "fetch your contact list. If you only want to invite specific people by "
  5907 +#~ "listing their e-mail addresses, select the \"Enter e-mail addresses "
  5908 +#~ "manually\" option."
  5909 +#~ msgstr ""
  5910 +#~ "Escolha seu provedor de webmail e entre seu login e senha para que "
  5911 +#~ "possamos obter sua lista de contatos. Se você quiser convidar pessoas "
  5912 +#~ "específicas informando seus endereços de e-mail, selecione a opção "
  5913 +#~ "\"Digitar endereços de e-mail manualmente\"."
  5914 +
  5915 +#~ msgid "Select your e-mail provider:"
  5916 +#~ msgstr "Selecione seu provedor de e-mail:"
  5917 +
  5918 +#~ msgid "Enter one e-mail address per line, following the example below."
  5919 +#~ msgstr "Entre um endereço de e-mail por linha, seguindo o exemplo abaixo."
  5920 +
  5921 +#~ msgid "E-mail addresses"
  5922 +#~ msgstr "Endereços de e-mail"
  5923 +
5922 #, fuzzy 5924 #, fuzzy
5923 #~ msgid "Password):" 5925 #~ msgid "Password):"
5924 #~ msgstr "Senha" 5926 #~ msgstr "Senha"