Download as
Browse Code »

Commit 096703be6b12bb37c839775876b3a817cf2c586a

Authored by Antonio Terceiro
1 parent 5ec9aa96
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem759: updating translation file; updated pt_BR translation

Showing 7 changed files with 471 additions and 403 deletions   Show diff stats
po/de/noosfero.po
  Diff comments   View file @096703b
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.5\n"
10   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  10 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -721,11 +721,11 @@ msgstr &quot;&quot;
721 721 msgid "user"
722 722 msgstr ""
723 723  
724   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  724 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
725 725 msgid "Username"
726 726 msgstr ""
727 727  
728   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  728 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
729 729 #: app/views/profile_editor/_person.rhtml:11
730 730 msgid "e-Mail"
731 731 msgstr ""
... ... @@ -761,7 +761,7 @@ msgstr &quot;&quot;
761 761 msgid "Terms of use"
762 762 msgstr ""
763 763  
764   -#: app/models/user.rb:-
  764 +#: app/models/user.rb:- app/models/user.rb:9
765 765 msgid "Terms accepted"
766 766 msgstr ""
767 767  
... ... @@ -972,7 +972,7 @@ msgstr &quot;&quot;
972 972 msgid "Password confirmation"
973 973 msgstr ""
974 974  
975   -#: app/models/user.rb:47
  975 +#: app/models/user.rb:48
976 976 msgid "%{fn} must be checked in order to signup."
977 977 msgstr ""
978 978  
... ... @@ -1179,43 +1179,43 @@ msgstr &quot;&quot;
1179 1179 msgid "Not accessible for visually impaired users."
1180 1180 msgstr ""
1181 1181  
1182   -#: app/models/person.rb:10
  1182 +#: app/models/person.rb:12
1183 1183 msgid "friends"
1184 1184 msgstr ""
1185 1185  
1186   -#: app/models/person.rb:10
  1186 +#: app/models/person.rb:12
1187 1187 msgid "work"
1188 1188 msgstr ""
1189 1189  
1190   -#: app/models/person.rb:10
  1190 +#: app/models/person.rb:12
1191 1191 msgid "school"
1192 1192 msgstr ""
1193 1193  
1194   -#: app/models/person.rb:10
  1194 +#: app/models/person.rb:12
1195 1195 msgid "family"
1196 1196 msgstr ""
1197 1197  
1198   -#: app/models/person.rb:29
  1198 +#: app/models/person.rb:31
1199 1199 msgid "Contact information"
1200 1200 msgstr ""
1201 1201  
1202   -#: app/models/person.rb:29
  1202 +#: app/models/person.rb:31
1203 1203 msgid "Birth date"
1204 1204 msgstr ""
1205 1205  
1206   -#: app/models/person.rb:29
  1206 +#: app/models/person.rb:31
1207 1207 msgid "City"
1208 1208 msgstr ""
1209 1209  
1210   -#: app/models/person.rb:29
  1210 +#: app/models/person.rb:31
1211 1211 msgid "State"
1212 1212 msgstr ""
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Country"
1216 1216 msgstr ""
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Sex"
1220 1220 msgstr ""
1221 1221  
... ... @@ -1557,7 +1557,7 @@ msgstr &quot;&quot;
1557 1557 msgid "Tag list"
1558 1558 msgstr ""
1559 1559  
1560   -#: app/models/article.rb:119
  1560 +#: app/models/article.rb:135
1561 1561 msgid "HTML Text document"
1562 1562 msgstr ""
1563 1563  
... ... @@ -1925,7 +1925,7 @@ msgstr &quot;&quot;
1925 1925 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1926 1926 #: app/views/admin_panel/site_info.rhtml:10
1927 1927 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1928   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1928 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1929 1929 #: app/views/profile_editor/header_footer.rhtml:12
1930 1930 #: app/views/mailconf/index.rhtml:14
1931 1931 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -1993,7 +1993,7 @@ msgstr &quot;&quot;
1993 1993 msgid "Want you see other persons on this environment?"
1994 1994 msgstr ""
1995 1995  
1996   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  1996 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
1997 1997 #: app/views/favorite_enterprises/index.rhtml:31
1998 1998 #: app/views/profile/favorite_enterprises.rhtml:13
1999 1999 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2095,7 +2095,7 @@ msgstr &quot;&quot;
2095 2095  
2096 2096 #: app/views/profile_members/index.rhtml:15
2097 2097 #: app/views/shared/_select_categories.rhtml:20
2098   -#: app/views/memberships/index.rhtml:20
  2098 +#: app/views/memberships/index.rhtml:26
2099 2099 #: app/views/content_viewer/_comment.rhtml:5
2100 2100 #: app/views/categories/_category.rhtml:9
2101 2101 #: app/views/manage_products/index.rhtml:41
... ... @@ -2296,10 +2296,10 @@ msgstr &quot;&quot;
2296 2296 #: app/views/profile_editor/edit.rhtml:38
2297 2297 #: app/views/profile_editor/edit.rhtml:41
2298 2298 #: app/views/profile_editor/edit.rhtml:44
2299   -#: app/views/profile_editor/edit.rhtml:51
2300   -#: app/views/profile_editor/edit.rhtml:54
2301   -#: app/views/profile_editor/edit.rhtml:57
2302   -#: app/views/profile_editor/edit.rhtml:60
  2299 +#: app/views/profile_editor/edit.rhtml:61
  2300 +#: app/views/profile_editor/edit.rhtml:64
  2301 +#: app/views/profile_editor/edit.rhtml:67
  2302 +#: app/views/profile_editor/edit.rhtml:70
2303 2303 msgid "Yes"
2304 2304 msgstr ""
2305 2305  
... ... @@ -2426,32 +2426,41 @@ msgstr &quot;&quot;
2426 2426  
2427 2427 #: app/views/account/_signup_form.rhtml:3
2428 2428 msgid ""
2429   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2429 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2430 2430 "password, do not create a new account, click on the \"<b>I forgot my "
2431 2431 "password!</b>\" link. ;-)"
2432 2432 msgstr ""
2433 2433  
2434   -#: app/views/account/_signup_form.rhtml:9
  2434 +#: app/views/account/_signup_form.rhtml:7
2435 2435 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2436 2436 msgstr ""
2437 2437  
2438   -#: app/views/account/_signup_form.rhtml:14
  2438 +#: app/views/account/_signup_form.rhtml:12
2439 2439 msgid "We'll send you an e-mail to validate your registration."
2440 2440 msgstr ""
2441 2441  
2442   -#: app/views/account/_signup_form.rhtml:18
  2442 +#: app/views/account/_signup_form.rhtml:16
2443 2443 msgid "Do not use a obviously password, but try some unforgettable word."
2444 2444 msgstr ""
2445 2445  
2446   -#: app/views/account/_signup_form.rhtml:22
  2446 +#: app/views/account/_signup_form.rhtml:20
2447 2447 msgid "We need to be sure that you wrote correctly your password."
2448 2448 msgstr ""
2449 2449  
2450   -#: app/views/account/_signup_form.rhtml:33
  2450 +#: app/views/account/_signup_form.rhtml:31
2451 2451 msgid "I accept the terms of use"
2452 2452 msgstr ""
2453 2453  
2454 2454 #: app/views/account/_signup_form.rhtml:45
  2455 +msgid ""
  2456 +"Here you can create an account for <b>you as a person</b>.\n"
  2457 +"<p/>\n"
  2458 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2459 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2460 +"accounts through your person control panel."
  2461 +msgstr ""
  2462 +
  2463 +#: app/views/account/_signup_form.rhtml:54
2455 2464 msgid "Sign up"
2456 2465 msgstr ""
2457 2466  
... ... @@ -2596,8 +2605,8 @@ msgstr &quot;&quot;
2596 2605 #: app/views/account/activate_enterprise.rhtml:11
2597 2606 #: app/views/profile_editor/edit.rhtml:38
2598 2607 #: app/views/profile_editor/edit.rhtml:44
2599   -#: app/views/profile_editor/edit.rhtml:54
2600   -#: app/views/profile_editor/edit.rhtml:60
  2608 +#: app/views/profile_editor/edit.rhtml:64
  2609 +#: app/views/profile_editor/edit.rhtml:70
2601 2610 msgid "No"
2602 2611 msgstr ""
2603 2612  
... ... @@ -3189,43 +3198,43 @@ msgstr &quot;&quot;
3189 3198 msgid "Manage my groups"
3190 3199 msgstr ""
3191 3200  
3192   -#: app/views/memberships/index.rhtml:13
  3201 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3202 +msgid "Create a new community"
  3203 +msgstr ""
  3204 +
  3205 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3206 +msgid "Register a new Enterprise"
  3207 +msgstr ""
  3208 +
  3209 +#: app/views/memberships/index.rhtml:19
3193 3210 msgid "Role: %s"
3194 3211 msgstr ""
3195 3212  
3196   -#: app/views/memberships/index.rhtml:14
  3213 +#: app/views/memberships/index.rhtml:20
3197 3214 msgid "Type: %s"
3198 3215 msgstr ""
3199 3216  
3200   -#: app/views/memberships/index.rhtml:15
  3217 +#: app/views/memberships/index.rhtml:21
3201 3218 #: app/views/tasks/ticket_details.rhtml:10
3202 3219 msgid "Description: %s"
3203 3220 msgstr ""
3204 3221  
3205   -#: app/views/memberships/index.rhtml:16
  3222 +#: app/views/memberships/index.rhtml:22
3206 3223 msgid "Members: %s"
3207 3224 msgstr ""
3208 3225  
3209   -#: app/views/memberships/index.rhtml:17
  3226 +#: app/views/memberships/index.rhtml:23
3210 3227 msgid "Created at: %s"
3211 3228 msgstr ""
3212 3229  
3213   -#: app/views/memberships/index.rhtml:18
  3230 +#: app/views/memberships/index.rhtml:24
3214 3231 msgid "Manage"
3215 3232 msgstr ""
3216 3233  
3217   -#: app/views/memberships/index.rhtml:19
  3234 +#: app/views/memberships/index.rhtml:25
3218 3235 msgid "Leave"
3219 3236 msgstr ""
3220 3237  
3221   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3222   -msgid "Create a new community"
3223   -msgstr ""
3224   -
3225   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3226   -msgid "Register a new Enterprise"
3227   -msgstr ""
3228   -
3229 3238 #: app/views/memberships/leave.rhtml:1
3230 3239 msgid "Leaving %s"
3231 3240 msgstr ""
... ... @@ -3516,12 +3525,12 @@ msgid &quot;This profile is:&quot;
3516 3525 msgstr ""
3517 3526  
3518 3527 #: app/views/profile_editor/edit.rhtml:27
3519   -#: app/views/profile_editor/edit.rhtml:49
  3528 +#: app/views/profile_editor/edit.rhtml:53
3520 3529 msgid "Public"
3521 3530 msgstr ""
3522 3531  
3523 3532 #: app/views/profile_editor/edit.rhtml:31
3524   -#: app/views/profile_editor/edit.rhtml:49
  3533 +#: app/views/profile_editor/edit.rhtml:57
3525 3534 msgid "Private"
3526 3535 msgstr ""
3527 3536  
... ... @@ -3541,27 +3550,27 @@ msgstr &quot;&quot;
3541 3550 msgid "Include my contact in directory of people"
3542 3551 msgstr ""
3543 3552  
3544   -#: app/views/profile_editor/edit.rhtml:51
  3553 +#: app/views/profile_editor/edit.rhtml:61
3545 3554 msgid "Activate Intranet access (restricted area only for members)"
3546 3555 msgstr ""
3547 3556  
3548   -#: app/views/profile_editor/edit.rhtml:54
  3557 +#: app/views/profile_editor/edit.rhtml:64
3549 3558 msgid "Show website of this group to all internet users"
3550 3559 msgstr ""
3551 3560  
3552   -#: app/views/profile_editor/edit.rhtml:57
  3561 +#: app/views/profile_editor/edit.rhtml:67
3553 3562 msgid "Show my website to members"
3554 3563 msgstr ""
3555 3564  
3556   -#: app/views/profile_editor/edit.rhtml:60
  3565 +#: app/views/profile_editor/edit.rhtml:70
3557 3566 msgid "Include this group directory of groups"
3558 3567 msgstr ""
3559 3568  
3560   -#: app/views/profile_editor/edit.rhtml:65
  3569 +#: app/views/profile_editor/edit.rhtml:75
3561 3570 msgid "Select the categories of your interest"
3562 3571 msgstr ""
3563 3572  
3564   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3573 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3565 3574 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3566 3575 msgid "Back to control panel"
3567 3576 msgstr ""
... ... @@ -3607,17 +3616,17 @@ msgid &quot;Moderation options&quot;
3607 3616 msgstr ""
3608 3617  
3609 3618 #: app/views/profile_editor/_organization.rhtml:38
3610   -msgid "New articles must be approved:"
  3619 +msgid "New articles posted by members of this group must be approved:"
3611 3620 msgstr ""
3612 3621  
3613   -#: app/views/profile_editor/_organization.rhtml:43
  3622 +#: app/views/profile_editor/_organization.rhtml:44
3614 3623 msgid ""
3615 3624 "<strong>Before</strong> being published in this group (a moderator has to "
3616 3625 "accept the article in pending request before the article be listed as a "
3617 3626 "article of this group."
3618 3627 msgstr ""
3619 3628  
3620   -#: app/views/profile_editor/_organization.rhtml:49
  3629 +#: app/views/profile_editor/_organization.rhtml:50
3621 3630 msgid ""
3622 3631 "<strong>After</strong> being published in this group (a moderator can always "
3623 3632 "remove publicated articles later)."
... ...
po/es/noosfero.po
  Diff comments   View file @096703b
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.5\n"
10   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  10 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -721,11 +721,11 @@ msgstr &quot;&quot;
721 721 msgid "user"
722 722 msgstr ""
723 723  
724   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  724 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
725 725 msgid "Username"
726 726 msgstr ""
727 727  
728   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  728 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
729 729 #: app/views/profile_editor/_person.rhtml:11
730 730 msgid "e-Mail"
731 731 msgstr ""
... ... @@ -761,7 +761,7 @@ msgstr &quot;&quot;
761 761 msgid "Terms of use"
762 762 msgstr ""
763 763  
764   -#: app/models/user.rb:-
  764 +#: app/models/user.rb:- app/models/user.rb:9
765 765 msgid "Terms accepted"
766 766 msgstr ""
767 767  
... ... @@ -972,7 +972,7 @@ msgstr &quot;&quot;
972 972 msgid "Password confirmation"
973 973 msgstr ""
974 974  
975   -#: app/models/user.rb:47
  975 +#: app/models/user.rb:48
976 976 msgid "%{fn} must be checked in order to signup."
977 977 msgstr ""
978 978  
... ... @@ -1179,43 +1179,43 @@ msgstr &quot;&quot;
1179 1179 msgid "Not accessible for visually impaired users."
1180 1180 msgstr ""
1181 1181  
1182   -#: app/models/person.rb:10
  1182 +#: app/models/person.rb:12
1183 1183 msgid "friends"
1184 1184 msgstr ""
1185 1185  
1186   -#: app/models/person.rb:10
  1186 +#: app/models/person.rb:12
1187 1187 msgid "work"
1188 1188 msgstr ""
1189 1189  
1190   -#: app/models/person.rb:10
  1190 +#: app/models/person.rb:12
1191 1191 msgid "school"
1192 1192 msgstr ""
1193 1193  
1194   -#: app/models/person.rb:10
  1194 +#: app/models/person.rb:12
1195 1195 msgid "family"
1196 1196 msgstr ""
1197 1197  
1198   -#: app/models/person.rb:29
  1198 +#: app/models/person.rb:31
1199 1199 msgid "Contact information"
1200 1200 msgstr ""
1201 1201  
1202   -#: app/models/person.rb:29
  1202 +#: app/models/person.rb:31
1203 1203 msgid "Birth date"
1204 1204 msgstr ""
1205 1205  
1206   -#: app/models/person.rb:29
  1206 +#: app/models/person.rb:31
1207 1207 msgid "City"
1208 1208 msgstr ""
1209 1209  
1210   -#: app/models/person.rb:29
  1210 +#: app/models/person.rb:31
1211 1211 msgid "State"
1212 1212 msgstr ""
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Country"
1216 1216 msgstr ""
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Sex"
1220 1220 msgstr ""
1221 1221  
... ... @@ -1557,7 +1557,7 @@ msgstr &quot;&quot;
1557 1557 msgid "Tag list"
1558 1558 msgstr ""
1559 1559  
1560   -#: app/models/article.rb:119
  1560 +#: app/models/article.rb:135
1561 1561 msgid "HTML Text document"
1562 1562 msgstr ""
1563 1563  
... ... @@ -1925,7 +1925,7 @@ msgstr &quot;&quot;
1925 1925 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1926 1926 #: app/views/admin_panel/site_info.rhtml:10
1927 1927 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1928   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1928 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1929 1929 #: app/views/profile_editor/header_footer.rhtml:12
1930 1930 #: app/views/mailconf/index.rhtml:14
1931 1931 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -1993,7 +1993,7 @@ msgstr &quot;&quot;
1993 1993 msgid "Want you see other persons on this environment?"
1994 1994 msgstr ""
1995 1995  
1996   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  1996 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
1997 1997 #: app/views/favorite_enterprises/index.rhtml:31
1998 1998 #: app/views/profile/favorite_enterprises.rhtml:13
1999 1999 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2095,7 +2095,7 @@ msgstr &quot;&quot;
2095 2095  
2096 2096 #: app/views/profile_members/index.rhtml:15
2097 2097 #: app/views/shared/_select_categories.rhtml:20
2098   -#: app/views/memberships/index.rhtml:20
  2098 +#: app/views/memberships/index.rhtml:26
2099 2099 #: app/views/content_viewer/_comment.rhtml:5
2100 2100 #: app/views/categories/_category.rhtml:9
2101 2101 #: app/views/manage_products/index.rhtml:41
... ... @@ -2296,10 +2296,10 @@ msgstr &quot;&quot;
2296 2296 #: app/views/profile_editor/edit.rhtml:38
2297 2297 #: app/views/profile_editor/edit.rhtml:41
2298 2298 #: app/views/profile_editor/edit.rhtml:44
2299   -#: app/views/profile_editor/edit.rhtml:51
2300   -#: app/views/profile_editor/edit.rhtml:54
2301   -#: app/views/profile_editor/edit.rhtml:57
2302   -#: app/views/profile_editor/edit.rhtml:60
  2299 +#: app/views/profile_editor/edit.rhtml:61
  2300 +#: app/views/profile_editor/edit.rhtml:64
  2301 +#: app/views/profile_editor/edit.rhtml:67
  2302 +#: app/views/profile_editor/edit.rhtml:70
2303 2303 msgid "Yes"
2304 2304 msgstr ""
2305 2305  
... ... @@ -2426,32 +2426,41 @@ msgstr &quot;&quot;
2426 2426  
2427 2427 #: app/views/account/_signup_form.rhtml:3
2428 2428 msgid ""
2429   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2429 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2430 2430 "password, do not create a new account, click on the \"<b>I forgot my "
2431 2431 "password!</b>\" link. ;-)"
2432 2432 msgstr ""
2433 2433  
2434   -#: app/views/account/_signup_form.rhtml:9
  2434 +#: app/views/account/_signup_form.rhtml:7
2435 2435 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2436 2436 msgstr ""
2437 2437  
2438   -#: app/views/account/_signup_form.rhtml:14
  2438 +#: app/views/account/_signup_form.rhtml:12
2439 2439 msgid "We'll send you an e-mail to validate your registration."
2440 2440 msgstr ""
2441 2441  
2442   -#: app/views/account/_signup_form.rhtml:18
  2442 +#: app/views/account/_signup_form.rhtml:16
2443 2443 msgid "Do not use a obviously password, but try some unforgettable word."
2444 2444 msgstr ""
2445 2445  
2446   -#: app/views/account/_signup_form.rhtml:22
  2446 +#: app/views/account/_signup_form.rhtml:20
2447 2447 msgid "We need to be sure that you wrote correctly your password."
2448 2448 msgstr ""
2449 2449  
2450   -#: app/views/account/_signup_form.rhtml:33
  2450 +#: app/views/account/_signup_form.rhtml:31
2451 2451 msgid "I accept the terms of use"
2452 2452 msgstr ""
2453 2453  
2454 2454 #: app/views/account/_signup_form.rhtml:45
  2455 +msgid ""
  2456 +"Here you can create an account for <b>you as a person</b>.\n"
  2457 +"<p/>\n"
  2458 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2459 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2460 +"accounts through your person control panel."
  2461 +msgstr ""
  2462 +
  2463 +#: app/views/account/_signup_form.rhtml:54
2455 2464 msgid "Sign up"
2456 2465 msgstr ""
2457 2466  
... ... @@ -2596,8 +2605,8 @@ msgstr &quot;&quot;
2596 2605 #: app/views/account/activate_enterprise.rhtml:11
2597 2606 #: app/views/profile_editor/edit.rhtml:38
2598 2607 #: app/views/profile_editor/edit.rhtml:44
2599   -#: app/views/profile_editor/edit.rhtml:54
2600   -#: app/views/profile_editor/edit.rhtml:60
  2608 +#: app/views/profile_editor/edit.rhtml:64
  2609 +#: app/views/profile_editor/edit.rhtml:70
2601 2610 msgid "No"
2602 2611 msgstr ""
2603 2612  
... ... @@ -3189,43 +3198,43 @@ msgstr &quot;&quot;
3189 3198 msgid "Manage my groups"
3190 3199 msgstr ""
3191 3200  
3192   -#: app/views/memberships/index.rhtml:13
  3201 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3202 +msgid "Create a new community"
  3203 +msgstr ""
  3204 +
  3205 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3206 +msgid "Register a new Enterprise"
  3207 +msgstr ""
  3208 +
  3209 +#: app/views/memberships/index.rhtml:19
3193 3210 msgid "Role: %s"
3194 3211 msgstr ""
3195 3212  
3196   -#: app/views/memberships/index.rhtml:14
  3213 +#: app/views/memberships/index.rhtml:20
3197 3214 msgid "Type: %s"
3198 3215 msgstr ""
3199 3216  
3200   -#: app/views/memberships/index.rhtml:15
  3217 +#: app/views/memberships/index.rhtml:21
3201 3218 #: app/views/tasks/ticket_details.rhtml:10
3202 3219 msgid "Description: %s"
3203 3220 msgstr ""
3204 3221  
3205   -#: app/views/memberships/index.rhtml:16
  3222 +#: app/views/memberships/index.rhtml:22
3206 3223 msgid "Members: %s"
3207 3224 msgstr ""
3208 3225  
3209   -#: app/views/memberships/index.rhtml:17
  3226 +#: app/views/memberships/index.rhtml:23
3210 3227 msgid "Created at: %s"
3211 3228 msgstr ""
3212 3229  
3213   -#: app/views/memberships/index.rhtml:18
  3230 +#: app/views/memberships/index.rhtml:24
3214 3231 msgid "Manage"
3215 3232 msgstr ""
3216 3233  
3217   -#: app/views/memberships/index.rhtml:19
  3234 +#: app/views/memberships/index.rhtml:25
3218 3235 msgid "Leave"
3219 3236 msgstr ""
3220 3237  
3221   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3222   -msgid "Create a new community"
3223   -msgstr ""
3224   -
3225   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3226   -msgid "Register a new Enterprise"
3227   -msgstr ""
3228   -
3229 3238 #: app/views/memberships/leave.rhtml:1
3230 3239 msgid "Leaving %s"
3231 3240 msgstr ""
... ... @@ -3516,12 +3525,12 @@ msgid &quot;This profile is:&quot;
3516 3525 msgstr ""
3517 3526  
3518 3527 #: app/views/profile_editor/edit.rhtml:27
3519   -#: app/views/profile_editor/edit.rhtml:49
  3528 +#: app/views/profile_editor/edit.rhtml:53
3520 3529 msgid "Public"
3521 3530 msgstr ""
3522 3531  
3523 3532 #: app/views/profile_editor/edit.rhtml:31
3524   -#: app/views/profile_editor/edit.rhtml:49
  3533 +#: app/views/profile_editor/edit.rhtml:57
3525 3534 msgid "Private"
3526 3535 msgstr ""
3527 3536  
... ... @@ -3541,27 +3550,27 @@ msgstr &quot;&quot;
3541 3550 msgid "Include my contact in directory of people"
3542 3551 msgstr ""
3543 3552  
3544   -#: app/views/profile_editor/edit.rhtml:51
  3553 +#: app/views/profile_editor/edit.rhtml:61
3545 3554 msgid "Activate Intranet access (restricted area only for members)"
3546 3555 msgstr ""
3547 3556  
3548   -#: app/views/profile_editor/edit.rhtml:54
  3557 +#: app/views/profile_editor/edit.rhtml:64
3549 3558 msgid "Show website of this group to all internet users"
3550 3559 msgstr ""
3551 3560  
3552   -#: app/views/profile_editor/edit.rhtml:57
  3561 +#: app/views/profile_editor/edit.rhtml:67
3553 3562 msgid "Show my website to members"
3554 3563 msgstr ""
3555 3564  
3556   -#: app/views/profile_editor/edit.rhtml:60
  3565 +#: app/views/profile_editor/edit.rhtml:70
3557 3566 msgid "Include this group directory of groups"
3558 3567 msgstr ""
3559 3568  
3560   -#: app/views/profile_editor/edit.rhtml:65
  3569 +#: app/views/profile_editor/edit.rhtml:75
3561 3570 msgid "Select the categories of your interest"
3562 3571 msgstr ""
3563 3572  
3564   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3573 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3565 3574 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3566 3575 msgid "Back to control panel"
3567 3576 msgstr ""
... ... @@ -3607,17 +3616,17 @@ msgid &quot;Moderation options&quot;
3607 3616 msgstr ""
3608 3617  
3609 3618 #: app/views/profile_editor/_organization.rhtml:38
3610   -msgid "New articles must be approved:"
  3619 +msgid "New articles posted by members of this group must be approved:"
3611 3620 msgstr ""
3612 3621  
3613   -#: app/views/profile_editor/_organization.rhtml:43
  3622 +#: app/views/profile_editor/_organization.rhtml:44
3614 3623 msgid ""
3615 3624 "<strong>Before</strong> being published in this group (a moderator has to "
3616 3625 "accept the article in pending request before the article be listed as a "
3617 3626 "article of this group."
3618 3627 msgstr ""
3619 3628  
3620   -#: app/views/profile_editor/_organization.rhtml:49
  3629 +#: app/views/profile_editor/_organization.rhtml:50
3621 3630 msgid ""
3622 3631 "<strong>After</strong> being published in this group (a moderator can always "
3623 3632 "remove publicated articles later)."
... ...
po/fr/noosfero.po
  Diff comments   View file @096703b
... ... @@ -6,7 +6,7 @@
6 6 msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: noosfero 0.11.5\n"
9   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  9 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -764,11 +764,11 @@ msgstr &quot;&quot;
764 764 msgid "user"
765 765 msgstr "utilisateur"
766 766  
767   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  767 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
768 768 msgid "Username"
769 769 msgstr "Identifiant"
770 770  
771   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  771 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
772 772 #: app/views/profile_editor/_person.rhtml:11
773 773 msgid "e-Mail"
774 774 msgstr "Courrier électronique"
... ... @@ -811,7 +811,7 @@ msgstr &quot;Le token mémorisé expire le&quot;
811 811 msgid "Terms of use"
812 812 msgstr "Conditions d'utilisation"
813 813  
814   -#: app/models/user.rb:-
  814 +#: app/models/user.rb:- app/models/user.rb:9
815 815 #, fuzzy
816 816 msgid "Terms accepted"
817 817 msgstr "Conditions acceptées"
... ... @@ -1054,7 +1054,7 @@ msgstr &quot;Mot de passe&quot;
1054 1054 msgid "Password confirmation"
1055 1055 msgstr "Mot de passe (confirmation)"
1056 1056  
1057   -#: app/models/user.rb:47
  1057 +#: app/models/user.rb:48
1058 1058 msgid "%{fn} must be checked in order to signup."
1059 1059 msgstr "%{fn} doit être validé avant de pouvoir s'inscrire."
1060 1060  
... ... @@ -1287,48 +1287,48 @@ msgstr &quot;Article de texte avec éditeur visuel.&quot;
1287 1287 msgid "Not accessible for visually impaired users."
1288 1288 msgstr "Non accessible pour les personnes malvoyantes."
1289 1289  
1290   -#: app/models/person.rb:10
  1290 +#: app/models/person.rb:12
1291 1291 msgid "friends"
1292 1292 msgstr "amis"
1293 1293  
1294   -#: app/models/person.rb:10
  1294 +#: app/models/person.rb:12
1295 1295 msgid "work"
1296 1296 msgstr "travail"
1297 1297  
1298   -#: app/models/person.rb:10
  1298 +#: app/models/person.rb:12
1299 1299 msgid "school"
1300 1300 msgstr "école"
1301 1301  
1302   -#: app/models/person.rb:10
  1302 +#: app/models/person.rb:12
1303 1303 msgid "family"
1304 1304 msgstr "famille"
1305 1305  
1306   -#: app/models/person.rb:29
  1306 +#: app/models/person.rb:31
1307 1307 #, fuzzy
1308 1308 msgid "Contact information"
1309 1309 msgstr "Informations de contact"
1310 1310  
1311   -#: app/models/person.rb:29
  1311 +#: app/models/person.rb:31
1312 1312 #, fuzzy
1313 1313 msgid "Birth date"
1314 1314 msgstr "Date de naissance"
1315 1315  
1316   -#: app/models/person.rb:29
  1316 +#: app/models/person.rb:31
1317 1317 #, fuzzy
1318 1318 msgid "City"
1319 1319 msgstr "Groupe"
1320 1320  
1321   -#: app/models/person.rb:29
  1321 +#: app/models/person.rb:31
1322 1322 #, fuzzy
1323 1323 msgid "State"
1324 1324 msgstr "Statut"
1325 1325  
1326   -#: app/models/person.rb:29
  1326 +#: app/models/person.rb:31
1327 1327 #, fuzzy
1328 1328 msgid "Country"
1329 1329 msgstr "Groupe"
1330 1330  
1331   -#: app/models/person.rb:29
  1331 +#: app/models/person.rb:31
1332 1332 #, fuzzy
1333 1333 msgid "Sex"
1334 1334 msgstr "Sexe : "
... ... @@ -1718,7 +1718,7 @@ msgstr &quot;&quot;
1718 1718 msgid "Tag list"
1719 1719 msgstr "Liste de tags"
1720 1720  
1721   -#: app/models/article.rb:119
  1721 +#: app/models/article.rb:135
1722 1722 msgid "HTML Text document"
1723 1723 msgstr "Document texte au format HTML"
1724 1724  
... ... @@ -2117,7 +2117,7 @@ msgstr &quot;Infos du site&quot;
2117 2117 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
2118 2118 #: app/views/admin_panel/site_info.rhtml:10
2119 2119 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
2120   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  2120 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
2121 2121 #: app/views/profile_editor/header_footer.rhtml:12
2122 2122 #: app/views/mailconf/index.rhtml:14
2123 2123 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -2192,7 +2192,7 @@ msgstr &quot;Vous n&#39;avez pas encore d&#39;ami(e). Allez vous en faire.&quot;
2192 2192 msgid "Want you see other persons on this environment?"
2193 2193 msgstr "Vous pouvez continuer à naviguer sur cette communauté."
2194 2194  
2195   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  2195 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
2196 2196 #: app/views/favorite_enterprises/index.rhtml:31
2197 2197 #: app/views/profile/favorite_enterprises.rhtml:13
2198 2198 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2297,7 +2297,7 @@ msgstr &quot;Actions&quot;
2297 2297  
2298 2298 #: app/views/profile_members/index.rhtml:15
2299 2299 #: app/views/shared/_select_categories.rhtml:20
2300   -#: app/views/memberships/index.rhtml:20
  2300 +#: app/views/memberships/index.rhtml:26
2301 2301 #: app/views/content_viewer/_comment.rhtml:5
2302 2302 #: app/views/categories/_category.rhtml:9
2303 2303 #: app/views/manage_products/index.rhtml:41
... ... @@ -2517,10 +2517,10 @@ msgstr &quot;Êtes-vous sûr(e) de vouloir sortir ?&quot;
2517 2517 #: app/views/profile_editor/edit.rhtml:38
2518 2518 #: app/views/profile_editor/edit.rhtml:41
2519 2519 #: app/views/profile_editor/edit.rhtml:44
2520   -#: app/views/profile_editor/edit.rhtml:51
2521   -#: app/views/profile_editor/edit.rhtml:54
2522   -#: app/views/profile_editor/edit.rhtml:57
2523   -#: app/views/profile_editor/edit.rhtml:60
  2520 +#: app/views/profile_editor/edit.rhtml:61
  2521 +#: app/views/profile_editor/edit.rhtml:64
  2522 +#: app/views/profile_editor/edit.rhtml:67
  2523 +#: app/views/profile_editor/edit.rhtml:70
2524 2524 msgid "Yes"
2525 2525 msgstr "Oui"
2526 2526  
... ... @@ -2661,8 +2661,9 @@ msgid &quot;Signup&quot;
2661 2661 msgstr "S'enregistrer"
2662 2662  
2663 2663 #: app/views/account/_signup_form.rhtml:3
  2664 +#, fuzzy
2664 2665 msgid ""
2665   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2666 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2666 2667 "password, do not create a new account, click on the \"<b>I forgot my "
2667 2668 "password!</b>\" link. ;-)"
2668 2669 msgstr ""
... ... @@ -2670,35 +2671,44 @@ msgstr &quot;&quot;
2670 2671 "oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le "
2671 2672 "lien «<b>J'ai oublié mon mot de passe</b>»."
2672 2673  
2673   -#: app/views/account/_signup_form.rhtml:9
  2674 +#: app/views/account/_signup_form.rhtml:7
2674 2675 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2675 2676 msgstr ""
2676 2677 "«Identifiant» est un simple surnom pour vous reconnaître dans cette "
2677 2678 "communauté."
2678 2679  
2679   -#: app/views/account/_signup_form.rhtml:14
  2680 +#: app/views/account/_signup_form.rhtml:12
2680 2681 msgid "We'll send you an e-mail to validate your registration."
2681 2682 msgstr ""
2682 2683 "Nous vous enverrons un courrier électronique pour valider votre "
2683 2684 "enregistrement."
2684 2685  
2685   -#: app/views/account/_signup_form.rhtml:18
  2686 +#: app/views/account/_signup_form.rhtml:16
2686 2687 msgid "Do not use a obviously password, but try some unforgettable word."
2687 2688 msgstr ""
2688 2689 "Ne choisissez pas un mot de passe évident, mais essayez de trouver quelque "
2689 2690 "chose que vous n'oublierez pas."
2690 2691  
2691   -#: app/views/account/_signup_form.rhtml:22
  2692 +#: app/views/account/_signup_form.rhtml:20
2692 2693 msgid "We need to be sure that you wrote correctly your password."
2693 2694 msgstr ""
2694 2695 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
2695 2696  
2696   -#: app/views/account/_signup_form.rhtml:33
  2697 +#: app/views/account/_signup_form.rhtml:31
2697 2698 msgid "I accept the terms of use"
2698 2699 msgstr "J'accepte les conditions d'utilisation"
2699 2700  
2700   -# Je ne suis pas sûr de la distinction "sign up" / "register"
2701 2701 #: app/views/account/_signup_form.rhtml:45
  2702 +msgid ""
  2703 +"Here you can create an account for <b>you as a person</b>.\n"
  2704 +"<p/>\n"
  2705 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2706 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2707 +"accounts through your person control panel."
  2708 +msgstr ""
  2709 +
  2710 +# Je ne suis pas sûr de la distinction "sign up" / "register"
  2711 +#: app/views/account/_signup_form.rhtml:54
2702 2712 #, fuzzy
2703 2713 msgid "Sign up"
2704 2714 msgstr "S'enregistrer"
... ... @@ -2861,8 +2871,8 @@ msgstr &quot;&quot;
2861 2871 #: app/views/account/activate_enterprise.rhtml:11
2862 2872 #: app/views/profile_editor/edit.rhtml:38
2863 2873 #: app/views/profile_editor/edit.rhtml:44
2864   -#: app/views/profile_editor/edit.rhtml:54
2865   -#: app/views/profile_editor/edit.rhtml:60
  2874 +#: app/views/profile_editor/edit.rhtml:64
  2875 +#: app/views/profile_editor/edit.rhtml:70
2866 2876 msgid "No"
2867 2877 msgstr "Non"
2868 2878  
... ... @@ -3520,49 +3530,49 @@ msgstr &quot;Mise à jour&quot;
3520 3530 msgid "Manage my groups"
3521 3531 msgstr "Mes groupes"
3522 3532  
3523   -#: app/views/memberships/index.rhtml:13
  3533 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3534 +msgid "Create a new community"
  3535 +msgstr "Créer un nouveau groupe"
  3536 +
  3537 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3538 +msgid "Register a new Enterprise"
  3539 +msgstr "Enregistrer une nouvelle entreprise"
  3540 +
  3541 +#: app/views/memberships/index.rhtml:19
3524 3542 #, fuzzy
3525 3543 msgid "Role: %s"
3526 3544 msgstr "Rôles :"
3527 3545  
3528   -#: app/views/memberships/index.rhtml:14
  3546 +#: app/views/memberships/index.rhtml:20
3529 3547 #, fuzzy
3530 3548 msgid "Type: %s"
3531 3549 msgstr "Type"
3532 3550  
3533   -#: app/views/memberships/index.rhtml:15
  3551 +#: app/views/memberships/index.rhtml:21
3534 3552 #: app/views/tasks/ticket_details.rhtml:10
3535 3553 #, fuzzy
3536 3554 msgid "Description: %s"
3537 3555 msgstr "Description :"
3538 3556  
3539   -#: app/views/memberships/index.rhtml:16
  3557 +#: app/views/memberships/index.rhtml:22
3540 3558 #, fuzzy
3541 3559 msgid "Members: %s"
3542 3560 msgstr "Membres"
3543 3561  
3544   -#: app/views/memberships/index.rhtml:17
  3562 +#: app/views/memberships/index.rhtml:23
3545 3563 #, fuzzy
3546 3564 msgid "Created at: %s"
3547 3565 msgstr "Créé le :"
3548 3566  
3549   -#: app/views/memberships/index.rhtml:18
  3567 +#: app/views/memberships/index.rhtml:24
3550 3568 msgid "Manage"
3551 3569 msgstr "Gérer"
3552 3570  
3553   -#: app/views/memberships/index.rhtml:19
  3571 +#: app/views/memberships/index.rhtml:25
3554 3572 #, fuzzy
3555 3573 msgid "Leave"
3556 3574 msgstr "Enregistrer"
3557 3575  
3558   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3559   -msgid "Create a new community"
3560   -msgstr "Créer un nouveau groupe"
3561   -
3562   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3563   -msgid "Register a new Enterprise"
3564   -msgstr "Enregistrer une nouvelle entreprise"
3565   -
3566 3576 #: app/views/memberships/leave.rhtml:1
3567 3577 #, fuzzy
3568 3578 msgid "Leaving %s"
... ... @@ -3882,12 +3892,12 @@ msgid &quot;This profile is:&quot;
3882 3892 msgstr "Les tags de cet article :"
3883 3893  
3884 3894 #: app/views/profile_editor/edit.rhtml:27
3885   -#: app/views/profile_editor/edit.rhtml:49
  3895 +#: app/views/profile_editor/edit.rhtml:53
3886 3896 msgid "Public"
3887 3897 msgstr ""
3888 3898  
3889 3899 #: app/views/profile_editor/edit.rhtml:31
3890   -#: app/views/profile_editor/edit.rhtml:49
  3900 +#: app/views/profile_editor/edit.rhtml:57
3891 3901 #, fuzzy
3892 3902 msgid "Private"
3893 3903 msgstr "Activer"
... ... @@ -3908,27 +3918,27 @@ msgstr &quot;&quot;
3908 3918 msgid "Include my contact in directory of people"
3909 3919 msgstr ""
3910 3920  
3911   -#: app/views/profile_editor/edit.rhtml:51
  3921 +#: app/views/profile_editor/edit.rhtml:61
3912 3922 msgid "Activate Intranet access (restricted area only for members)"
3913 3923 msgstr ""
3914 3924  
3915   -#: app/views/profile_editor/edit.rhtml:54
  3925 +#: app/views/profile_editor/edit.rhtml:64
3916 3926 msgid "Show website of this group to all internet users"
3917 3927 msgstr ""
3918 3928  
3919   -#: app/views/profile_editor/edit.rhtml:57
  3929 +#: app/views/profile_editor/edit.rhtml:67
3920 3930 msgid "Show my website to members"
3921 3931 msgstr ""
3922 3932  
3923   -#: app/views/profile_editor/edit.rhtml:60
  3933 +#: app/views/profile_editor/edit.rhtml:70
3924 3934 msgid "Include this group directory of groups"
3925 3935 msgstr ""
3926 3936  
3927   -#: app/views/profile_editor/edit.rhtml:65
  3937 +#: app/views/profile_editor/edit.rhtml:75
3928 3938 msgid "Select the categories of your interest"
3929 3939 msgstr "Choisissez les catégories de vos centres d'intérêt"
3930 3940  
3931   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3941 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3932 3942 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3933 3943 msgid "Back to control panel"
3934 3944 msgstr "Retour au panneau de contrôle"
... ... @@ -3982,17 +3992,17 @@ msgid &quot;Moderation options&quot;
3982 3992 msgstr "Recherche détaillée"
3983 3993  
3984 3994 #: app/views/profile_editor/_organization.rhtml:38
3985   -msgid "New articles must be approved:"
  3995 +msgid "New articles posted by members of this group must be approved:"
3986 3996 msgstr ""
3987 3997  
3988   -#: app/views/profile_editor/_organization.rhtml:43
  3998 +#: app/views/profile_editor/_organization.rhtml:44
3989 3999 msgid ""
3990 4000 "<strong>Before</strong> being published in this group (a moderator has to "
3991 4001 "accept the article in pending request before the article be listed as a "
3992 4002 "article of this group."
3993 4003 msgstr ""
3994 4004  
3995   -#: app/views/profile_editor/_organization.rhtml:49
  4005 +#: app/views/profile_editor/_organization.rhtml:50
3996 4006 msgid ""
3997 4007 "<strong>After</strong> being published in this group (a moderator can always "
3998 4008 "remove publicated articles later)."
... ...
po/hy/noosfero.po
  Diff comments   View file @096703b
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.5\n"
10   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  10 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -721,11 +721,11 @@ msgstr &quot;&quot;
721 721 msgid "user"
722 722 msgstr ""
723 723  
724   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  724 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
725 725 msgid "Username"
726 726 msgstr ""
727 727  
728   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  728 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
729 729 #: app/views/profile_editor/_person.rhtml:11
730 730 msgid "e-Mail"
731 731 msgstr ""
... ... @@ -761,7 +761,7 @@ msgstr &quot;&quot;
761 761 msgid "Terms of use"
762 762 msgstr ""
763 763  
764   -#: app/models/user.rb:-
  764 +#: app/models/user.rb:- app/models/user.rb:9
765 765 msgid "Terms accepted"
766 766 msgstr ""
767 767  
... ... @@ -972,7 +972,7 @@ msgstr &quot;&quot;
972 972 msgid "Password confirmation"
973 973 msgstr ""
974 974  
975   -#: app/models/user.rb:47
  975 +#: app/models/user.rb:48
976 976 msgid "%{fn} must be checked in order to signup."
977 977 msgstr ""
978 978  
... ... @@ -1179,43 +1179,43 @@ msgstr &quot;&quot;
1179 1179 msgid "Not accessible for visually impaired users."
1180 1180 msgstr ""
1181 1181  
1182   -#: app/models/person.rb:10
  1182 +#: app/models/person.rb:12
1183 1183 msgid "friends"
1184 1184 msgstr ""
1185 1185  
1186   -#: app/models/person.rb:10
  1186 +#: app/models/person.rb:12
1187 1187 msgid "work"
1188 1188 msgstr ""
1189 1189  
1190   -#: app/models/person.rb:10
  1190 +#: app/models/person.rb:12
1191 1191 msgid "school"
1192 1192 msgstr ""
1193 1193  
1194   -#: app/models/person.rb:10
  1194 +#: app/models/person.rb:12
1195 1195 msgid "family"
1196 1196 msgstr ""
1197 1197  
1198   -#: app/models/person.rb:29
  1198 +#: app/models/person.rb:31
1199 1199 msgid "Contact information"
1200 1200 msgstr ""
1201 1201  
1202   -#: app/models/person.rb:29
  1202 +#: app/models/person.rb:31
1203 1203 msgid "Birth date"
1204 1204 msgstr ""
1205 1205  
1206   -#: app/models/person.rb:29
  1206 +#: app/models/person.rb:31
1207 1207 msgid "City"
1208 1208 msgstr ""
1209 1209  
1210   -#: app/models/person.rb:29
  1210 +#: app/models/person.rb:31
1211 1211 msgid "State"
1212 1212 msgstr ""
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Country"
1216 1216 msgstr ""
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Sex"
1220 1220 msgstr ""
1221 1221  
... ... @@ -1557,7 +1557,7 @@ msgstr &quot;&quot;
1557 1557 msgid "Tag list"
1558 1558 msgstr ""
1559 1559  
1560   -#: app/models/article.rb:119
  1560 +#: app/models/article.rb:135
1561 1561 msgid "HTML Text document"
1562 1562 msgstr ""
1563 1563  
... ... @@ -1925,7 +1925,7 @@ msgstr &quot;&quot;
1925 1925 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1926 1926 #: app/views/admin_panel/site_info.rhtml:10
1927 1927 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1928   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1928 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1929 1929 #: app/views/profile_editor/header_footer.rhtml:12
1930 1930 #: app/views/mailconf/index.rhtml:14
1931 1931 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -1993,7 +1993,7 @@ msgstr &quot;&quot;
1993 1993 msgid "Want you see other persons on this environment?"
1994 1994 msgstr ""
1995 1995  
1996   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  1996 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
1997 1997 #: app/views/favorite_enterprises/index.rhtml:31
1998 1998 #: app/views/profile/favorite_enterprises.rhtml:13
1999 1999 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2095,7 +2095,7 @@ msgstr &quot;&quot;
2095 2095  
2096 2096 #: app/views/profile_members/index.rhtml:15
2097 2097 #: app/views/shared/_select_categories.rhtml:20
2098   -#: app/views/memberships/index.rhtml:20
  2098 +#: app/views/memberships/index.rhtml:26
2099 2099 #: app/views/content_viewer/_comment.rhtml:5
2100 2100 #: app/views/categories/_category.rhtml:9
2101 2101 #: app/views/manage_products/index.rhtml:41
... ... @@ -2296,10 +2296,10 @@ msgstr &quot;&quot;
2296 2296 #: app/views/profile_editor/edit.rhtml:38
2297 2297 #: app/views/profile_editor/edit.rhtml:41
2298 2298 #: app/views/profile_editor/edit.rhtml:44
2299   -#: app/views/profile_editor/edit.rhtml:51
2300   -#: app/views/profile_editor/edit.rhtml:54
2301   -#: app/views/profile_editor/edit.rhtml:57
2302   -#: app/views/profile_editor/edit.rhtml:60
  2299 +#: app/views/profile_editor/edit.rhtml:61
  2300 +#: app/views/profile_editor/edit.rhtml:64
  2301 +#: app/views/profile_editor/edit.rhtml:67
  2302 +#: app/views/profile_editor/edit.rhtml:70
2303 2303 msgid "Yes"
2304 2304 msgstr ""
2305 2305  
... ... @@ -2426,32 +2426,41 @@ msgstr &quot;&quot;
2426 2426  
2427 2427 #: app/views/account/_signup_form.rhtml:3
2428 2428 msgid ""
2429   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2429 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2430 2430 "password, do not create a new account, click on the \"<b>I forgot my "
2431 2431 "password!</b>\" link. ;-)"
2432 2432 msgstr ""
2433 2433  
2434   -#: app/views/account/_signup_form.rhtml:9
  2434 +#: app/views/account/_signup_form.rhtml:7
2435 2435 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2436 2436 msgstr ""
2437 2437  
2438   -#: app/views/account/_signup_form.rhtml:14
  2438 +#: app/views/account/_signup_form.rhtml:12
2439 2439 msgid "We'll send you an e-mail to validate your registration."
2440 2440 msgstr ""
2441 2441  
2442   -#: app/views/account/_signup_form.rhtml:18
  2442 +#: app/views/account/_signup_form.rhtml:16
2443 2443 msgid "Do not use a obviously password, but try some unforgettable word."
2444 2444 msgstr ""
2445 2445  
2446   -#: app/views/account/_signup_form.rhtml:22
  2446 +#: app/views/account/_signup_form.rhtml:20
2447 2447 msgid "We need to be sure that you wrote correctly your password."
2448 2448 msgstr ""
2449 2449  
2450   -#: app/views/account/_signup_form.rhtml:33
  2450 +#: app/views/account/_signup_form.rhtml:31
2451 2451 msgid "I accept the terms of use"
2452 2452 msgstr ""
2453 2453  
2454 2454 #: app/views/account/_signup_form.rhtml:45
  2455 +msgid ""
  2456 +"Here you can create an account for <b>you as a person</b>.\n"
  2457 +"<p/>\n"
  2458 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2459 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2460 +"accounts through your person control panel."
  2461 +msgstr ""
  2462 +
  2463 +#: app/views/account/_signup_form.rhtml:54
2455 2464 msgid "Sign up"
2456 2465 msgstr ""
2457 2466  
... ... @@ -2596,8 +2605,8 @@ msgstr &quot;&quot;
2596 2605 #: app/views/account/activate_enterprise.rhtml:11
2597 2606 #: app/views/profile_editor/edit.rhtml:38
2598 2607 #: app/views/profile_editor/edit.rhtml:44
2599   -#: app/views/profile_editor/edit.rhtml:54
2600   -#: app/views/profile_editor/edit.rhtml:60
  2608 +#: app/views/profile_editor/edit.rhtml:64
  2609 +#: app/views/profile_editor/edit.rhtml:70
2601 2610 msgid "No"
2602 2611 msgstr ""
2603 2612  
... ... @@ -3189,43 +3198,43 @@ msgstr &quot;&quot;
3189 3198 msgid "Manage my groups"
3190 3199 msgstr ""
3191 3200  
3192   -#: app/views/memberships/index.rhtml:13
  3201 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3202 +msgid "Create a new community"
  3203 +msgstr ""
  3204 +
  3205 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3206 +msgid "Register a new Enterprise"
  3207 +msgstr ""
  3208 +
  3209 +#: app/views/memberships/index.rhtml:19
3193 3210 msgid "Role: %s"
3194 3211 msgstr ""
3195 3212  
3196   -#: app/views/memberships/index.rhtml:14
  3213 +#: app/views/memberships/index.rhtml:20
3197 3214 msgid "Type: %s"
3198 3215 msgstr ""
3199 3216  
3200   -#: app/views/memberships/index.rhtml:15
  3217 +#: app/views/memberships/index.rhtml:21
3201 3218 #: app/views/tasks/ticket_details.rhtml:10
3202 3219 msgid "Description: %s"
3203 3220 msgstr ""
3204 3221  
3205   -#: app/views/memberships/index.rhtml:16
  3222 +#: app/views/memberships/index.rhtml:22
3206 3223 msgid "Members: %s"
3207 3224 msgstr ""
3208 3225  
3209   -#: app/views/memberships/index.rhtml:17
  3226 +#: app/views/memberships/index.rhtml:23
3210 3227 msgid "Created at: %s"
3211 3228 msgstr ""
3212 3229  
3213   -#: app/views/memberships/index.rhtml:18
  3230 +#: app/views/memberships/index.rhtml:24
3214 3231 msgid "Manage"
3215 3232 msgstr ""
3216 3233  
3217   -#: app/views/memberships/index.rhtml:19
  3234 +#: app/views/memberships/index.rhtml:25
3218 3235 msgid "Leave"
3219 3236 msgstr ""
3220 3237  
3221   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3222   -msgid "Create a new community"
3223   -msgstr ""
3224   -
3225   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3226   -msgid "Register a new Enterprise"
3227   -msgstr ""
3228   -
3229 3238 #: app/views/memberships/leave.rhtml:1
3230 3239 msgid "Leaving %s"
3231 3240 msgstr ""
... ... @@ -3516,12 +3525,12 @@ msgid &quot;This profile is:&quot;
3516 3525 msgstr ""
3517 3526  
3518 3527 #: app/views/profile_editor/edit.rhtml:27
3519   -#: app/views/profile_editor/edit.rhtml:49
  3528 +#: app/views/profile_editor/edit.rhtml:53
3520 3529 msgid "Public"
3521 3530 msgstr ""
3522 3531  
3523 3532 #: app/views/profile_editor/edit.rhtml:31
3524   -#: app/views/profile_editor/edit.rhtml:49
  3533 +#: app/views/profile_editor/edit.rhtml:57
3525 3534 msgid "Private"
3526 3535 msgstr ""
3527 3536  
... ... @@ -3541,27 +3550,27 @@ msgstr &quot;&quot;
3541 3550 msgid "Include my contact in directory of people"
3542 3551 msgstr ""
3543 3552  
3544   -#: app/views/profile_editor/edit.rhtml:51
  3553 +#: app/views/profile_editor/edit.rhtml:61
3545 3554 msgid "Activate Intranet access (restricted area only for members)"
3546 3555 msgstr ""
3547 3556  
3548   -#: app/views/profile_editor/edit.rhtml:54
  3557 +#: app/views/profile_editor/edit.rhtml:64
3549 3558 msgid "Show website of this group to all internet users"
3550 3559 msgstr ""
3551 3560  
3552   -#: app/views/profile_editor/edit.rhtml:57
  3561 +#: app/views/profile_editor/edit.rhtml:67
3553 3562 msgid "Show my website to members"
3554 3563 msgstr ""
3555 3564  
3556   -#: app/views/profile_editor/edit.rhtml:60
  3565 +#: app/views/profile_editor/edit.rhtml:70
3557 3566 msgid "Include this group directory of groups"
3558 3567 msgstr ""
3559 3568  
3560   -#: app/views/profile_editor/edit.rhtml:65
  3569 +#: app/views/profile_editor/edit.rhtml:75
3561 3570 msgid "Select the categories of your interest"
3562 3571 msgstr ""
3563 3572  
3564   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3573 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3565 3574 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3566 3575 msgid "Back to control panel"
3567 3576 msgstr ""
... ... @@ -3607,17 +3616,17 @@ msgid &quot;Moderation options&quot;
3607 3616 msgstr ""
3608 3617  
3609 3618 #: app/views/profile_editor/_organization.rhtml:38
3610   -msgid "New articles must be approved:"
  3619 +msgid "New articles posted by members of this group must be approved:"
3611 3620 msgstr ""
3612 3621  
3613   -#: app/views/profile_editor/_organization.rhtml:43
  3622 +#: app/views/profile_editor/_organization.rhtml:44
3614 3623 msgid ""
3615 3624 "<strong>Before</strong> being published in this group (a moderator has to "
3616 3625 "accept the article in pending request before the article be listed as a "
3617 3626 "article of this group."
3618 3627 msgstr ""
3619 3628  
3620   -#: app/views/profile_editor/_organization.rhtml:49
  3629 +#: app/views/profile_editor/_organization.rhtml:50
3621 3630 msgid ""
3622 3631 "<strong>After</strong> being published in this group (a moderator can always "
3623 3632 "remove publicated articles later)."
... ...
po/nl/noosfero.po
  Diff comments   View file @096703b
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.5\n"
10   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  10 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -721,11 +721,11 @@ msgstr &quot;&quot;
721 721 msgid "user"
722 722 msgstr ""
723 723  
724   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  724 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
725 725 msgid "Username"
726 726 msgstr ""
727 727  
728   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  728 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
729 729 #: app/views/profile_editor/_person.rhtml:11
730 730 msgid "e-Mail"
731 731 msgstr ""
... ... @@ -761,7 +761,7 @@ msgstr &quot;&quot;
761 761 msgid "Terms of use"
762 762 msgstr ""
763 763  
764   -#: app/models/user.rb:-
  764 +#: app/models/user.rb:- app/models/user.rb:9
765 765 msgid "Terms accepted"
766 766 msgstr ""
767 767  
... ... @@ -972,7 +972,7 @@ msgstr &quot;&quot;
972 972 msgid "Password confirmation"
973 973 msgstr ""
974 974  
975   -#: app/models/user.rb:47
  975 +#: app/models/user.rb:48
976 976 msgid "%{fn} must be checked in order to signup."
977 977 msgstr ""
978 978  
... ... @@ -1179,43 +1179,43 @@ msgstr &quot;&quot;
1179 1179 msgid "Not accessible for visually impaired users."
1180 1180 msgstr ""
1181 1181  
1182   -#: app/models/person.rb:10
  1182 +#: app/models/person.rb:12
1183 1183 msgid "friends"
1184 1184 msgstr ""
1185 1185  
1186   -#: app/models/person.rb:10
  1186 +#: app/models/person.rb:12
1187 1187 msgid "work"
1188 1188 msgstr ""
1189 1189  
1190   -#: app/models/person.rb:10
  1190 +#: app/models/person.rb:12
1191 1191 msgid "school"
1192 1192 msgstr ""
1193 1193  
1194   -#: app/models/person.rb:10
  1194 +#: app/models/person.rb:12
1195 1195 msgid "family"
1196 1196 msgstr ""
1197 1197  
1198   -#: app/models/person.rb:29
  1198 +#: app/models/person.rb:31
1199 1199 msgid "Contact information"
1200 1200 msgstr ""
1201 1201  
1202   -#: app/models/person.rb:29
  1202 +#: app/models/person.rb:31
1203 1203 msgid "Birth date"
1204 1204 msgstr ""
1205 1205  
1206   -#: app/models/person.rb:29
  1206 +#: app/models/person.rb:31
1207 1207 msgid "City"
1208 1208 msgstr ""
1209 1209  
1210   -#: app/models/person.rb:29
  1210 +#: app/models/person.rb:31
1211 1211 msgid "State"
1212 1212 msgstr ""
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Country"
1216 1216 msgstr ""
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Sex"
1220 1220 msgstr ""
1221 1221  
... ... @@ -1557,7 +1557,7 @@ msgstr &quot;&quot;
1557 1557 msgid "Tag list"
1558 1558 msgstr ""
1559 1559  
1560   -#: app/models/article.rb:119
  1560 +#: app/models/article.rb:135
1561 1561 msgid "HTML Text document"
1562 1562 msgstr ""
1563 1563  
... ... @@ -1925,7 +1925,7 @@ msgstr &quot;&quot;
1925 1925 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1926 1926 #: app/views/admin_panel/site_info.rhtml:10
1927 1927 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1928   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1928 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1929 1929 #: app/views/profile_editor/header_footer.rhtml:12
1930 1930 #: app/views/mailconf/index.rhtml:14
1931 1931 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -1993,7 +1993,7 @@ msgstr &quot;&quot;
1993 1993 msgid "Want you see other persons on this environment?"
1994 1994 msgstr ""
1995 1995  
1996   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  1996 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
1997 1997 #: app/views/favorite_enterprises/index.rhtml:31
1998 1998 #: app/views/profile/favorite_enterprises.rhtml:13
1999 1999 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2095,7 +2095,7 @@ msgstr &quot;&quot;
2095 2095  
2096 2096 #: app/views/profile_members/index.rhtml:15
2097 2097 #: app/views/shared/_select_categories.rhtml:20
2098   -#: app/views/memberships/index.rhtml:20
  2098 +#: app/views/memberships/index.rhtml:26
2099 2099 #: app/views/content_viewer/_comment.rhtml:5
2100 2100 #: app/views/categories/_category.rhtml:9
2101 2101 #: app/views/manage_products/index.rhtml:41
... ... @@ -2296,10 +2296,10 @@ msgstr &quot;&quot;
2296 2296 #: app/views/profile_editor/edit.rhtml:38
2297 2297 #: app/views/profile_editor/edit.rhtml:41
2298 2298 #: app/views/profile_editor/edit.rhtml:44
2299   -#: app/views/profile_editor/edit.rhtml:51
2300   -#: app/views/profile_editor/edit.rhtml:54
2301   -#: app/views/profile_editor/edit.rhtml:57
2302   -#: app/views/profile_editor/edit.rhtml:60
  2299 +#: app/views/profile_editor/edit.rhtml:61
  2300 +#: app/views/profile_editor/edit.rhtml:64
  2301 +#: app/views/profile_editor/edit.rhtml:67
  2302 +#: app/views/profile_editor/edit.rhtml:70
2303 2303 msgid "Yes"
2304 2304 msgstr ""
2305 2305  
... ... @@ -2426,32 +2426,41 @@ msgstr &quot;&quot;
2426 2426  
2427 2427 #: app/views/account/_signup_form.rhtml:3
2428 2428 msgid ""
2429   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2429 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2430 2430 "password, do not create a new account, click on the \"<b>I forgot my "
2431 2431 "password!</b>\" link. ;-)"
2432 2432 msgstr ""
2433 2433  
2434   -#: app/views/account/_signup_form.rhtml:9
  2434 +#: app/views/account/_signup_form.rhtml:7
2435 2435 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2436 2436 msgstr ""
2437 2437  
2438   -#: app/views/account/_signup_form.rhtml:14
  2438 +#: app/views/account/_signup_form.rhtml:12
2439 2439 msgid "We'll send you an e-mail to validate your registration."
2440 2440 msgstr ""
2441 2441  
2442   -#: app/views/account/_signup_form.rhtml:18
  2442 +#: app/views/account/_signup_form.rhtml:16
2443 2443 msgid "Do not use a obviously password, but try some unforgettable word."
2444 2444 msgstr ""
2445 2445  
2446   -#: app/views/account/_signup_form.rhtml:22
  2446 +#: app/views/account/_signup_form.rhtml:20
2447 2447 msgid "We need to be sure that you wrote correctly your password."
2448 2448 msgstr ""
2449 2449  
2450   -#: app/views/account/_signup_form.rhtml:33
  2450 +#: app/views/account/_signup_form.rhtml:31
2451 2451 msgid "I accept the terms of use"
2452 2452 msgstr ""
2453 2453  
2454 2454 #: app/views/account/_signup_form.rhtml:45
  2455 +msgid ""
  2456 +"Here you can create an account for <b>you as a person</b>.\n"
  2457 +"<p/>\n"
  2458 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2459 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2460 +"accounts through your person control panel."
  2461 +msgstr ""
  2462 +
  2463 +#: app/views/account/_signup_form.rhtml:54
2455 2464 msgid "Sign up"
2456 2465 msgstr ""
2457 2466  
... ... @@ -2596,8 +2605,8 @@ msgstr &quot;&quot;
2596 2605 #: app/views/account/activate_enterprise.rhtml:11
2597 2606 #: app/views/profile_editor/edit.rhtml:38
2598 2607 #: app/views/profile_editor/edit.rhtml:44
2599   -#: app/views/profile_editor/edit.rhtml:54
2600   -#: app/views/profile_editor/edit.rhtml:60
  2608 +#: app/views/profile_editor/edit.rhtml:64
  2609 +#: app/views/profile_editor/edit.rhtml:70
2601 2610 msgid "No"
2602 2611 msgstr ""
2603 2612  
... ... @@ -3189,43 +3198,43 @@ msgstr &quot;&quot;
3189 3198 msgid "Manage my groups"
3190 3199 msgstr ""
3191 3200  
3192   -#: app/views/memberships/index.rhtml:13
  3201 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3202 +msgid "Create a new community"
  3203 +msgstr ""
  3204 +
  3205 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3206 +msgid "Register a new Enterprise"
  3207 +msgstr ""
  3208 +
  3209 +#: app/views/memberships/index.rhtml:19
3193 3210 msgid "Role: %s"
3194 3211 msgstr ""
3195 3212  
3196   -#: app/views/memberships/index.rhtml:14
  3213 +#: app/views/memberships/index.rhtml:20
3197 3214 msgid "Type: %s"
3198 3215 msgstr ""
3199 3216  
3200   -#: app/views/memberships/index.rhtml:15
  3217 +#: app/views/memberships/index.rhtml:21
3201 3218 #: app/views/tasks/ticket_details.rhtml:10
3202 3219 msgid "Description: %s"
3203 3220 msgstr ""
3204 3221  
3205   -#: app/views/memberships/index.rhtml:16
  3222 +#: app/views/memberships/index.rhtml:22
3206 3223 msgid "Members: %s"
3207 3224 msgstr ""
3208 3225  
3209   -#: app/views/memberships/index.rhtml:17
  3226 +#: app/views/memberships/index.rhtml:23
3210 3227 msgid "Created at: %s"
3211 3228 msgstr ""
3212 3229  
3213   -#: app/views/memberships/index.rhtml:18
  3230 +#: app/views/memberships/index.rhtml:24
3214 3231 msgid "Manage"
3215 3232 msgstr ""
3216 3233  
3217   -#: app/views/memberships/index.rhtml:19
  3234 +#: app/views/memberships/index.rhtml:25
3218 3235 msgid "Leave"
3219 3236 msgstr ""
3220 3237  
3221   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3222   -msgid "Create a new community"
3223   -msgstr ""
3224   -
3225   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3226   -msgid "Register a new Enterprise"
3227   -msgstr ""
3228   -
3229 3238 #: app/views/memberships/leave.rhtml:1
3230 3239 msgid "Leaving %s"
3231 3240 msgstr ""
... ... @@ -3516,12 +3525,12 @@ msgid &quot;This profile is:&quot;
3516 3525 msgstr ""
3517 3526  
3518 3527 #: app/views/profile_editor/edit.rhtml:27
3519   -#: app/views/profile_editor/edit.rhtml:49
  3528 +#: app/views/profile_editor/edit.rhtml:53
3520 3529 msgid "Public"
3521 3530 msgstr ""
3522 3531  
3523 3532 #: app/views/profile_editor/edit.rhtml:31
3524   -#: app/views/profile_editor/edit.rhtml:49
  3533 +#: app/views/profile_editor/edit.rhtml:57
3525 3534 msgid "Private"
3526 3535 msgstr ""
3527 3536  
... ... @@ -3541,27 +3550,27 @@ msgstr &quot;&quot;
3541 3550 msgid "Include my contact in directory of people"
3542 3551 msgstr ""
3543 3552  
3544   -#: app/views/profile_editor/edit.rhtml:51
  3553 +#: app/views/profile_editor/edit.rhtml:61
3545 3554 msgid "Activate Intranet access (restricted area only for members)"
3546 3555 msgstr ""
3547 3556  
3548   -#: app/views/profile_editor/edit.rhtml:54
  3557 +#: app/views/profile_editor/edit.rhtml:64
3549 3558 msgid "Show website of this group to all internet users"
3550 3559 msgstr ""
3551 3560  
3552   -#: app/views/profile_editor/edit.rhtml:57
  3561 +#: app/views/profile_editor/edit.rhtml:67
3553 3562 msgid "Show my website to members"
3554 3563 msgstr ""
3555 3564  
3556   -#: app/views/profile_editor/edit.rhtml:60
  3565 +#: app/views/profile_editor/edit.rhtml:70
3557 3566 msgid "Include this group directory of groups"
3558 3567 msgstr ""
3559 3568  
3560   -#: app/views/profile_editor/edit.rhtml:65
  3569 +#: app/views/profile_editor/edit.rhtml:75
3561 3570 msgid "Select the categories of your interest"
3562 3571 msgstr ""
3563 3572  
3564   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3573 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3565 3574 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3566 3575 msgid "Back to control panel"
3567 3576 msgstr ""
... ... @@ -3607,17 +3616,17 @@ msgid &quot;Moderation options&quot;
3607 3616 msgstr ""
3608 3617  
3609 3618 #: app/views/profile_editor/_organization.rhtml:38
3610   -msgid "New articles must be approved:"
  3619 +msgid "New articles posted by members of this group must be approved:"
3611 3620 msgstr ""
3612 3621  
3613   -#: app/views/profile_editor/_organization.rhtml:43
  3622 +#: app/views/profile_editor/_organization.rhtml:44
3614 3623 msgid ""
3615 3624 "<strong>Before</strong> being published in this group (a moderator has to "
3616 3625 "accept the article in pending request before the article be listed as a "
3617 3626 "article of this group."
3618 3627 msgstr ""
3619 3628  
3620   -#: app/views/profile_editor/_organization.rhtml:49
  3629 +#: app/views/profile_editor/_organization.rhtml:50
3621 3630 msgid ""
3622 3631 "<strong>After</strong> being published in this group (a moderator can always "
3623 3632 "remove publicated articles later)."
... ...
po/noosfero.pot
  Diff comments   View file @096703b
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.11.5\n"
10   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
  10 +"POT-Creation-Date: 2008-09-26 17:18-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"
... ... @@ -721,11 +721,11 @@ msgstr &quot;&quot;
721 721 msgid "user"
722 722 msgstr ""
723 723  
724   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  724 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
725 725 msgid "Username"
726 726 msgstr ""
727 727  
728   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  728 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
729 729 #: app/views/profile_editor/_person.rhtml:11
730 730 msgid "e-Mail"
731 731 msgstr ""
... ... @@ -761,7 +761,7 @@ msgstr &quot;&quot;
761 761 msgid "Terms of use"
762 762 msgstr ""
763 763  
764   -#: app/models/user.rb:-
  764 +#: app/models/user.rb:- app/models/user.rb:9
765 765 msgid "Terms accepted"
766 766 msgstr ""
767 767  
... ... @@ -972,7 +972,7 @@ msgstr &quot;&quot;
972 972 msgid "Password confirmation"
973 973 msgstr ""
974 974  
975   -#: app/models/user.rb:47
  975 +#: app/models/user.rb:48
976 976 msgid "%{fn} must be checked in order to signup."
977 977 msgstr ""
978 978  
... ... @@ -1179,43 +1179,43 @@ msgstr &quot;&quot;
1179 1179 msgid "Not accessible for visually impaired users."
1180 1180 msgstr ""
1181 1181  
1182   -#: app/models/person.rb:10
  1182 +#: app/models/person.rb:12
1183 1183 msgid "friends"
1184 1184 msgstr ""
1185 1185  
1186   -#: app/models/person.rb:10
  1186 +#: app/models/person.rb:12
1187 1187 msgid "work"
1188 1188 msgstr ""
1189 1189  
1190   -#: app/models/person.rb:10
  1190 +#: app/models/person.rb:12
1191 1191 msgid "school"
1192 1192 msgstr ""
1193 1193  
1194   -#: app/models/person.rb:10
  1194 +#: app/models/person.rb:12
1195 1195 msgid "family"
1196 1196 msgstr ""
1197 1197  
1198   -#: app/models/person.rb:29
  1198 +#: app/models/person.rb:31
1199 1199 msgid "Contact information"
1200 1200 msgstr ""
1201 1201  
1202   -#: app/models/person.rb:29
  1202 +#: app/models/person.rb:31
1203 1203 msgid "Birth date"
1204 1204 msgstr ""
1205 1205  
1206   -#: app/models/person.rb:29
  1206 +#: app/models/person.rb:31
1207 1207 msgid "City"
1208 1208 msgstr ""
1209 1209  
1210   -#: app/models/person.rb:29
  1210 +#: app/models/person.rb:31
1211 1211 msgid "State"
1212 1212 msgstr ""
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Country"
1216 1216 msgstr ""
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Sex"
1220 1220 msgstr ""
1221 1221  
... ... @@ -1557,7 +1557,7 @@ msgstr &quot;&quot;
1557 1557 msgid "Tag list"
1558 1558 msgstr ""
1559 1559  
1560   -#: app/models/article.rb:119
  1560 +#: app/models/article.rb:135
1561 1561 msgid "HTML Text document"
1562 1562 msgstr ""
1563 1563  
... ... @@ -1925,7 +1925,7 @@ msgstr &quot;&quot;
1925 1925 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1926 1926 #: app/views/admin_panel/site_info.rhtml:10
1927 1927 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1928   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1928 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1929 1929 #: app/views/profile_editor/header_footer.rhtml:12
1930 1930 #: app/views/mailconf/index.rhtml:14
1931 1931 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -1993,7 +1993,7 @@ msgstr &quot;&quot;
1993 1993 msgid "Want you see other persons on this environment?"
1994 1994 msgstr ""
1995 1995  
1996   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  1996 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
1997 1997 #: app/views/favorite_enterprises/index.rhtml:31
1998 1998 #: app/views/profile/favorite_enterprises.rhtml:13
1999 1999 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2095,7 +2095,7 @@ msgstr &quot;&quot;
2095 2095  
2096 2096 #: app/views/profile_members/index.rhtml:15
2097 2097 #: app/views/shared/_select_categories.rhtml:20
2098   -#: app/views/memberships/index.rhtml:20
  2098 +#: app/views/memberships/index.rhtml:26
2099 2099 #: app/views/content_viewer/_comment.rhtml:5
2100 2100 #: app/views/categories/_category.rhtml:9
2101 2101 #: app/views/manage_products/index.rhtml:41
... ... @@ -2296,10 +2296,10 @@ msgstr &quot;&quot;
2296 2296 #: app/views/profile_editor/edit.rhtml:38
2297 2297 #: app/views/profile_editor/edit.rhtml:41
2298 2298 #: app/views/profile_editor/edit.rhtml:44
2299   -#: app/views/profile_editor/edit.rhtml:51
2300   -#: app/views/profile_editor/edit.rhtml:54
2301   -#: app/views/profile_editor/edit.rhtml:57
2302   -#: app/views/profile_editor/edit.rhtml:60
  2299 +#: app/views/profile_editor/edit.rhtml:61
  2300 +#: app/views/profile_editor/edit.rhtml:64
  2301 +#: app/views/profile_editor/edit.rhtml:67
  2302 +#: app/views/profile_editor/edit.rhtml:70
2303 2303 msgid "Yes"
2304 2304 msgstr ""
2305 2305  
... ... @@ -2426,32 +2426,41 @@ msgstr &quot;&quot;
2426 2426  
2427 2427 #: app/views/account/_signup_form.rhtml:3
2428 2428 msgid ""
2429   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2429 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2430 2430 "password, do not create a new account, click on the \"<b>I forgot my "
2431 2431 "password!</b>\" link. ;-)"
2432 2432 msgstr ""
2433 2433  
2434   -#: app/views/account/_signup_form.rhtml:9
  2434 +#: app/views/account/_signup_form.rhtml:7
2435 2435 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2436 2436 msgstr ""
2437 2437  
2438   -#: app/views/account/_signup_form.rhtml:14
  2438 +#: app/views/account/_signup_form.rhtml:12
2439 2439 msgid "We'll send you an e-mail to validate your registration."
2440 2440 msgstr ""
2441 2441  
2442   -#: app/views/account/_signup_form.rhtml:18
  2442 +#: app/views/account/_signup_form.rhtml:16
2443 2443 msgid "Do not use a obviously password, but try some unforgettable word."
2444 2444 msgstr ""
2445 2445  
2446   -#: app/views/account/_signup_form.rhtml:22
  2446 +#: app/views/account/_signup_form.rhtml:20
2447 2447 msgid "We need to be sure that you wrote correctly your password."
2448 2448 msgstr ""
2449 2449  
2450   -#: app/views/account/_signup_form.rhtml:33
  2450 +#: app/views/account/_signup_form.rhtml:31
2451 2451 msgid "I accept the terms of use"
2452 2452 msgstr ""
2453 2453  
2454 2454 #: app/views/account/_signup_form.rhtml:45
  2455 +msgid ""
  2456 +"Here you can create an account for <b>you as a person</b>.\n"
  2457 +"<p/>\n"
  2458 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2459 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2460 +"accounts through your person control panel."
  2461 +msgstr ""
  2462 +
  2463 +#: app/views/account/_signup_form.rhtml:54
2455 2464 msgid "Sign up"
2456 2465 msgstr ""
2457 2466  
... ... @@ -2596,8 +2605,8 @@ msgstr &quot;&quot;
2596 2605 #: app/views/account/activate_enterprise.rhtml:11
2597 2606 #: app/views/profile_editor/edit.rhtml:38
2598 2607 #: app/views/profile_editor/edit.rhtml:44
2599   -#: app/views/profile_editor/edit.rhtml:54
2600   -#: app/views/profile_editor/edit.rhtml:60
  2608 +#: app/views/profile_editor/edit.rhtml:64
  2609 +#: app/views/profile_editor/edit.rhtml:70
2601 2610 msgid "No"
2602 2611 msgstr ""
2603 2612  
... ... @@ -3189,43 +3198,43 @@ msgstr &quot;&quot;
3189 3198 msgid "Manage my groups"
3190 3199 msgstr ""
3191 3200  
3192   -#: app/views/memberships/index.rhtml:13
  3201 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3202 +msgid "Create a new community"
  3203 +msgstr ""
  3204 +
  3205 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3206 +msgid "Register a new Enterprise"
  3207 +msgstr ""
  3208 +
  3209 +#: app/views/memberships/index.rhtml:19
3193 3210 msgid "Role: %s"
3194 3211 msgstr ""
3195 3212  
3196   -#: app/views/memberships/index.rhtml:14
  3213 +#: app/views/memberships/index.rhtml:20
3197 3214 msgid "Type: %s"
3198 3215 msgstr ""
3199 3216  
3200   -#: app/views/memberships/index.rhtml:15
  3217 +#: app/views/memberships/index.rhtml:21
3201 3218 #: app/views/tasks/ticket_details.rhtml:10
3202 3219 msgid "Description: %s"
3203 3220 msgstr ""
3204 3221  
3205   -#: app/views/memberships/index.rhtml:16
  3222 +#: app/views/memberships/index.rhtml:22
3206 3223 msgid "Members: %s"
3207 3224 msgstr ""
3208 3225  
3209   -#: app/views/memberships/index.rhtml:17
  3226 +#: app/views/memberships/index.rhtml:23
3210 3227 msgid "Created at: %s"
3211 3228 msgstr ""
3212 3229  
3213   -#: app/views/memberships/index.rhtml:18
  3230 +#: app/views/memberships/index.rhtml:24
3214 3231 msgid "Manage"
3215 3232 msgstr ""
3216 3233  
3217   -#: app/views/memberships/index.rhtml:19
  3234 +#: app/views/memberships/index.rhtml:25
3218 3235 msgid "Leave"
3219 3236 msgstr ""
3220 3237  
3221   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3222   -msgid "Create a new community"
3223   -msgstr ""
3224   -
3225   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3226   -msgid "Register a new Enterprise"
3227   -msgstr ""
3228   -
3229 3238 #: app/views/memberships/leave.rhtml:1
3230 3239 msgid "Leaving %s"
3231 3240 msgstr ""
... ... @@ -3516,12 +3525,12 @@ msgid &quot;This profile is:&quot;
3516 3525 msgstr ""
3517 3526  
3518 3527 #: app/views/profile_editor/edit.rhtml:27
3519   -#: app/views/profile_editor/edit.rhtml:49
  3528 +#: app/views/profile_editor/edit.rhtml:53
3520 3529 msgid "Public"
3521 3530 msgstr ""
3522 3531  
3523 3532 #: app/views/profile_editor/edit.rhtml:31
3524   -#: app/views/profile_editor/edit.rhtml:49
  3533 +#: app/views/profile_editor/edit.rhtml:57
3525 3534 msgid "Private"
3526 3535 msgstr ""
3527 3536  
... ... @@ -3541,27 +3550,27 @@ msgstr &quot;&quot;
3541 3550 msgid "Include my contact in directory of people"
3542 3551 msgstr ""
3543 3552  
3544   -#: app/views/profile_editor/edit.rhtml:51
  3553 +#: app/views/profile_editor/edit.rhtml:61
3545 3554 msgid "Activate Intranet access (restricted area only for members)"
3546 3555 msgstr ""
3547 3556  
3548   -#: app/views/profile_editor/edit.rhtml:54
  3557 +#: app/views/profile_editor/edit.rhtml:64
3549 3558 msgid "Show website of this group to all internet users"
3550 3559 msgstr ""
3551 3560  
3552   -#: app/views/profile_editor/edit.rhtml:57
  3561 +#: app/views/profile_editor/edit.rhtml:67
3553 3562 msgid "Show my website to members"
3554 3563 msgstr ""
3555 3564  
3556   -#: app/views/profile_editor/edit.rhtml:60
  3565 +#: app/views/profile_editor/edit.rhtml:70
3557 3566 msgid "Include this group directory of groups"
3558 3567 msgstr ""
3559 3568  
3560   -#: app/views/profile_editor/edit.rhtml:65
  3569 +#: app/views/profile_editor/edit.rhtml:75
3561 3570 msgid "Select the categories of your interest"
3562 3571 msgstr ""
3563 3572  
3564   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3573 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3565 3574 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3566 3575 msgid "Back to control panel"
3567 3576 msgstr ""
... ... @@ -3607,17 +3616,17 @@ msgid &quot;Moderation options&quot;
3607 3616 msgstr ""
3608 3617  
3609 3618 #: app/views/profile_editor/_organization.rhtml:38
3610   -msgid "New articles must be approved:"
  3619 +msgid "New articles posted by members of this group must be approved:"
3611 3620 msgstr ""
3612 3621  
3613   -#: app/views/profile_editor/_organization.rhtml:43
  3622 +#: app/views/profile_editor/_organization.rhtml:44
3614 3623 msgid ""
3615 3624 "<strong>Before</strong> being published in this group (a moderator has to "
3616 3625 "accept the article in pending request before the article be listed as a "
3617 3626 "article of this group."
3618 3627 msgstr ""
3619 3628  
3620   -#: app/views/profile_editor/_organization.rhtml:49
  3629 +#: app/views/profile_editor/_organization.rhtml:50
3621 3630 msgid ""
3622 3631 "<strong>After</strong> being published in this group (a moderator can always "
3623 3632 "remove publicated articles later)."
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @096703b
... ... @@ -12,8 +12,8 @@
12 12 msgid ""
13 13 msgstr ""
14 14 "Project-Id-Version: noosfero 0.11.5\n"
15   -"POT-Creation-Date: 2008-09-19 20:39-0300\n"
16   -"PO-Revision-Date: 2008-09-25 16:04-0300\n"
  15 +"POT-Creation-Date: 2008-09-26 17:18-0300\n"
  16 +"PO-Revision-Date: 2008-09-26 17:21-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 19 "MIME-Version: 1.0\n"
... ... @@ -734,11 +734,11 @@ msgstr &quot;Apresenta o resumo do perfil&quot;
734 734 msgid "user"
735 735 msgstr "usuário"
736 736  
737   -#: app/models/user.rb:- app/models/user.rb:13 app/models/change_password.rb:21
  737 +#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:21
738 738 msgid "Username"
739 739 msgstr "Nome de usuário"
740 740  
741   -#: app/models/user.rb:- app/models/user.rb:14 app/models/change_password.rb:22
  741 +#: app/models/user.rb:- app/models/user.rb:15 app/models/change_password.rb:22
742 742 #: app/views/profile_editor/_person.rhtml:11
743 743 msgid "e-Mail"
744 744 msgstr "e-Mail"
... ... @@ -774,7 +774,7 @@ msgstr &quot;Lembre do token que expira em&quot;
774 774 msgid "Terms of use"
775 775 msgstr "Termos de Uso"
776 776  
777   -#: app/models/user.rb:-
  777 +#: app/models/user.rb:- app/models/user.rb:9
778 778 msgid "Terms accepted"
779 779 msgstr "Termos aceitos"
780 780  
... ... @@ -985,7 +985,7 @@ msgstr &quot;Senha&quot;
985 985 msgid "Password confirmation"
986 986 msgstr "Confirmação de senha"
987 987  
988   -#: app/models/user.rb:47
  988 +#: app/models/user.rb:48
989 989 msgid "%{fn} must be checked in order to signup."
990 990 msgstr "%{fn} deve ser verificado para efetivar inscrição"
991 991  
... ... @@ -1195,43 +1195,43 @@ msgstr &quot;Artigo de texto com editor visual.&quot;
1195 1195 msgid "Not accessible for visually impaired users."
1196 1196 msgstr "Não acessível para usuários com deficiência visual."
1197 1197  
1198   -#: app/models/person.rb:10
  1198 +#: app/models/person.rb:12
1199 1199 msgid "friends"
1200 1200 msgstr "amigos"
1201 1201  
1202   -#: app/models/person.rb:10
  1202 +#: app/models/person.rb:12
1203 1203 msgid "work"
1204 1204 msgstr "trabalho"
1205 1205  
1206   -#: app/models/person.rb:10
  1206 +#: app/models/person.rb:12
1207 1207 msgid "school"
1208 1208 msgstr "escola"
1209 1209  
1210   -#: app/models/person.rb:10
  1210 +#: app/models/person.rb:12
1211 1211 msgid "family"
1212 1212 msgstr "família"
1213 1213  
1214   -#: app/models/person.rb:29
  1214 +#: app/models/person.rb:31
1215 1215 msgid "Contact information"
1216 1216 msgstr "Informação de contato"
1217 1217  
1218   -#: app/models/person.rb:29
  1218 +#: app/models/person.rb:31
1219 1219 msgid "Birth date"
1220 1220 msgstr "Data de nascimento"
1221 1221  
1222   -#: app/models/person.rb:29
  1222 +#: app/models/person.rb:31
1223 1223 msgid "City"
1224 1224 msgstr "Cidade"
1225 1225  
1226   -#: app/models/person.rb:29
  1226 +#: app/models/person.rb:31
1227 1227 msgid "State"
1228 1228 msgstr "Estado"
1229 1229  
1230   -#: app/models/person.rb:29
  1230 +#: app/models/person.rb:31
1231 1231 msgid "Country"
1232 1232 msgstr "País"
1233 1233  
1234   -#: app/models/person.rb:29
  1234 +#: app/models/person.rb:31
1235 1235 msgid "Sex"
1236 1236 msgstr "Sexo"
1237 1237  
... ... @@ -1595,7 +1595,7 @@ msgstr &quot;&quot;
1595 1595 msgid "Tag list"
1596 1596 msgstr "Lista de marcadores"
1597 1597  
1598   -#: app/models/article.rb:119
  1598 +#: app/models/article.rb:135
1599 1599 msgid "HTML Text document"
1600 1600 msgstr "Documento de Texto HTML"
1601 1601  
... ... @@ -1970,7 +1970,7 @@ msgstr &quot;Informações do site&quot;
1970 1970 #: app/views/admin_panel/message_for_disabled_enterprise.rhtml:10
1971 1971 #: app/views/admin_panel/site_info.rhtml:10
1972 1972 #: app/views/shared/_select_categories.rhtml:17 app/views/cms/edit.rhtml:14
1973   -#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:68
  1973 +#: app/views/cms/edit.rhtml:37 app/views/profile_editor/edit.rhtml:78
1974 1974 #: app/views/profile_editor/header_footer.rhtml:12
1975 1975 #: app/views/mailconf/index.rhtml:14
1976 1976 #: app/views/enterprise_validation/edit_validation_info.rhtml:9
... ... @@ -2039,7 +2039,7 @@ msgstr &quot;Você não tem amigos ainda.&quot;
2039 2039 msgid "Want you see other persons on this environment?"
2040 2040 msgstr "Você quer ver outras pessoas neste ambiente?"
2041 2041  
2042   -#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:31
  2042 +#: app/views/friends/index.rhtml:31 app/views/memberships/index.rhtml:8
2043 2043 #: app/views/favorite_enterprises/index.rhtml:31
2044 2044 #: app/views/profile/favorite_enterprises.rhtml:13
2045 2045 #: app/views/profile/communities.rhtml:13 app/views/profile/members.rhtml:13
... ... @@ -2143,7 +2143,7 @@ msgstr &quot;Ações&quot;
2143 2143  
2144 2144 #: app/views/profile_members/index.rhtml:15
2145 2145 #: app/views/shared/_select_categories.rhtml:20
2146   -#: app/views/memberships/index.rhtml:20
  2146 +#: app/views/memberships/index.rhtml:26
2147 2147 #: app/views/content_viewer/_comment.rhtml:5
2148 2148 #: app/views/categories/_category.rhtml:9
2149 2149 #: app/views/manage_products/index.rhtml:41
... ... @@ -2359,10 +2359,10 @@ msgstr &quot;Tem certeza que quer sair?&quot;
2359 2359 #: app/views/profile_editor/edit.rhtml:38
2360 2360 #: app/views/profile_editor/edit.rhtml:41
2361 2361 #: app/views/profile_editor/edit.rhtml:44
2362   -#: app/views/profile_editor/edit.rhtml:51
2363   -#: app/views/profile_editor/edit.rhtml:54
2364   -#: app/views/profile_editor/edit.rhtml:57
2365   -#: app/views/profile_editor/edit.rhtml:60
  2362 +#: app/views/profile_editor/edit.rhtml:61
  2363 +#: app/views/profile_editor/edit.rhtml:64
  2364 +#: app/views/profile_editor/edit.rhtml:67
  2365 +#: app/views/profile_editor/edit.rhtml:70
2366 2366 msgid "Yes"
2367 2367 msgstr "Sim"
2368 2368  
... ... @@ -2497,36 +2497,49 @@ msgstr &quot;Registre-se&quot;
2497 2497  
2498 2498 #: app/views/account/_signup_form.rhtml:3
2499 2499 msgid ""
2500   -"Fill all this fields to join in this environment.<p/>If you forgot your "
  2500 +"Fill all this fields to join in this environment. <p/> If you forgot your "
2501 2501 "password, do not create a new account, click on the \"<b>I forgot my "
2502 2502 "password!</b>\" link. ;-)"
2503 2503 msgstr ""
2504   -"Preencha todos os campos para entrar neste ambiente.<p/>Se você esqueceu sua "
  2504 +"Preencha todos os campos para entrar neste ambiente.<p/> Se você esqueceu sua "
2505 2505 "senha, não crie uma nova conta, clique no link \"<b>Eu esqueci minha senha!</"
2506 2506 "b>\". ;-)"
2507 2507  
2508   -#: app/views/account/_signup_form.rhtml:9
  2508 +#: app/views/account/_signup_form.rhtml:7
2509 2509 msgid "\"Username\" is a simple nickname to recognize you on this environment."
2510 2510 msgstr ""
2511 2511 "\"Nome de usuário\" é um simples apelido para reconhece-lo neste ambiente."
2512 2512  
2513   -#: app/views/account/_signup_form.rhtml:14
  2513 +#: app/views/account/_signup_form.rhtml:12
2514 2514 msgid "We'll send you an e-mail to validate your registration."
2515 2515 msgstr "Nós iremos lhe enviar um e-mail para validar seu registro."
2516 2516  
2517   -#: app/views/account/_signup_form.rhtml:18
  2517 +#: app/views/account/_signup_form.rhtml:16
2518 2518 msgid "Do not use a obviously password, but try some unforgettable word."
2519 2519 msgstr "Não use uma senha óbvia, mas tente algo de ser lembrado facilmente."
2520 2520  
2521   -#: app/views/account/_signup_form.rhtml:22
  2521 +#: app/views/account/_signup_form.rhtml:20
2522 2522 msgid "We need to be sure that you wrote correctly your password."
2523 2523 msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
2524 2524  
2525   -#: app/views/account/_signup_form.rhtml:33
  2525 +#: app/views/account/_signup_form.rhtml:31
2526 2526 msgid "I accept the terms of use"
2527 2527 msgstr "Eu aceito os termos de uso"
2528 2528  
2529 2529 #: app/views/account/_signup_form.rhtml:45
  2530 +msgid ""
  2531 +"Here you can create an account for <b>you as a person</b>.\n"
  2532 +"<p/>\n"
  2533 +"Do <b>not</b> enter a login for a group nor for an entreprise.\n"
  2534 +"With your user account, you can create <em>several</em> group or enterprise\n"
  2535 +"accounts through your person control panel."
  2536 +msgstr ""
  2537 +"Aqui você pode criar uma conta para <b>você como pessoa</b>.\n"
  2538 +"<b>Não</b> coloque um login para um group ou empreendimento.\n"
  2539 +"Com sua conta de usuário, você pode criar <em>vários</em> grupos ou\n"
  2540 +"empreendimentos através do seu painel de controle."
  2541 +
  2542 +#: app/views/account/_signup_form.rhtml:54
2530 2543 msgid "Sign up"
2531 2544 msgstr "Registre-se"
2532 2545  
... ... @@ -2683,8 +2696,8 @@ msgstr &quot;Você já tem uma conta pessoal de usuário no sistema?&quot;
2683 2696 #: app/views/account/activate_enterprise.rhtml:11
2684 2697 #: app/views/profile_editor/edit.rhtml:38
2685 2698 #: app/views/profile_editor/edit.rhtml:44
2686   -#: app/views/profile_editor/edit.rhtml:54
2687   -#: app/views/profile_editor/edit.rhtml:60
  2699 +#: app/views/profile_editor/edit.rhtml:64
  2700 +#: app/views/profile_editor/edit.rhtml:70
2688 2701 msgid "No"
2689 2702 msgstr "Não"
2690 2703  
... ... @@ -3303,43 +3316,43 @@ msgstr &quot;Atualizar&quot;
3303 3316 msgid "Manage my groups"
3304 3317 msgstr "Gerenciar meus grupos"
3305 3318  
3306   -#: app/views/memberships/index.rhtml:13
  3319 +#: app/views/memberships/index.rhtml:6 app/views/profile/communities.rhtml:15
  3320 +msgid "Create a new community"
  3321 +msgstr "Criar nova comunidade"
  3322 +
  3323 +#: app/views/memberships/index.rhtml:7 app/views/profile/enterprises.rhtml:15
  3324 +msgid "Register a new Enterprise"
  3325 +msgstr "Registrar novo Empreendimento"
  3326 +
  3327 +#: app/views/memberships/index.rhtml:19
3307 3328 msgid "Role: %s"
3308 3329 msgstr "Papel: %s"
3309 3330  
3310   -#: app/views/memberships/index.rhtml:14
  3331 +#: app/views/memberships/index.rhtml:20
3311 3332 msgid "Type: %s"
3312 3333 msgstr "Tipo: %s"
3313 3334  
3314   -#: app/views/memberships/index.rhtml:15
  3335 +#: app/views/memberships/index.rhtml:21
3315 3336 #: app/views/tasks/ticket_details.rhtml:10
3316 3337 msgid "Description: %s"
3317 3338 msgstr "Descrição: %s"
3318 3339  
3319   -#: app/views/memberships/index.rhtml:16
  3340 +#: app/views/memberships/index.rhtml:22
3320 3341 msgid "Members: %s"
3321 3342 msgstr "Integrantes: %s"
3322 3343  
3323   -#: app/views/memberships/index.rhtml:17
  3344 +#: app/views/memberships/index.rhtml:23
3324 3345 msgid "Created at: %s"
3325 3346 msgstr "Criado em: %s"
3326 3347  
3327   -#: app/views/memberships/index.rhtml:18
  3348 +#: app/views/memberships/index.rhtml:24
3328 3349 msgid "Manage"
3329 3350 msgstr "Gerenciar"
3330 3351  
3331   -#: app/views/memberships/index.rhtml:19
  3352 +#: app/views/memberships/index.rhtml:25
3332 3353 msgid "Leave"
3333 3354 msgstr "Sair"
3334 3355  
3335   -#: app/views/memberships/index.rhtml:29 app/views/profile/communities.rhtml:15
3336   -msgid "Create a new community"
3337   -msgstr "Criar nova comunidade"
3338   -
3339   -#: app/views/memberships/index.rhtml:30 app/views/profile/enterprises.rhtml:15
3340   -msgid "Register a new Enterprise"
3341   -msgstr "Registrar novo Empreendimento"
3342   -
3343 3356 #: app/views/memberships/leave.rhtml:1
3344 3357 msgid "Leaving %s"
3345 3358 msgstr "Saindo %s"
... ... @@ -3635,12 +3648,12 @@ msgid &quot;This profile is:&quot;
3635 3648 msgstr "Este perfil é:"
3636 3649  
3637 3650 #: app/views/profile_editor/edit.rhtml:27
3638   -#: app/views/profile_editor/edit.rhtml:49
  3651 +#: app/views/profile_editor/edit.rhtml:53
3639 3652 msgid "Public"
3640 3653 msgstr "Público"
3641 3654  
3642 3655 #: app/views/profile_editor/edit.rhtml:31
3643   -#: app/views/profile_editor/edit.rhtml:49
  3656 +#: app/views/profile_editor/edit.rhtml:57
3644 3657 msgid "Private"
3645 3658 msgstr "Privado"
3646 3659  
... ... @@ -3660,27 +3673,27 @@ msgstr &quot;Exibir meu website para meus contatos (pessoas)&quot;
3660 3673 msgid "Include my contact in directory of people"
3661 3674 msgstr "Incluir meu contato no diretório de pessoas"
3662 3675  
3663   -#: app/views/profile_editor/edit.rhtml:51
  3676 +#: app/views/profile_editor/edit.rhtml:61
3664 3677 msgid "Activate Intranet access (restricted area only for members)"
3665 3678 msgstr "Ativar acesso a Intranet (área restrita apenas para membros)"
3666 3679  
3667   -#: app/views/profile_editor/edit.rhtml:54
  3680 +#: app/views/profile_editor/edit.rhtml:64
3668 3681 msgid "Show website of this group to all internet users"
3669 3682 msgstr "Exibir website deste grupo para todos os usuários da internet"
3670 3683  
3671   -#: app/views/profile_editor/edit.rhtml:57
  3684 +#: app/views/profile_editor/edit.rhtml:67
3672 3685 msgid "Show my website to members"
3673 3686 msgstr "Exibir meu website para membros"
3674 3687  
3675   -#: app/views/profile_editor/edit.rhtml:60
  3688 +#: app/views/profile_editor/edit.rhtml:70
3676 3689 msgid "Include this group directory of groups"
3677 3690 msgstr "Incluir este group no diretório de groups"
3678 3691  
3679   -#: app/views/profile_editor/edit.rhtml:65
  3692 +#: app/views/profile_editor/edit.rhtml:75
3680 3693 msgid "Select the categories of your interest"
3681 3694 msgstr "Selecione as categorias de seu interesse"
3682 3695  
3683   -#: app/views/profile_editor/edit.rhtml:69 app/views/mailconf/index.rhtml:15
  3696 +#: app/views/profile_editor/edit.rhtml:79 app/views/mailconf/index.rhtml:15
3684 3697 #: app/views/box_organizer/index.rhtml:5 app/views/tasks/index.rhtml:19
3685 3698 msgid "Back to control panel"
3686 3699 msgstr "Voltar ao painel de controle"
... ... @@ -3726,10 +3739,10 @@ msgid &quot;Moderation options&quot;
3726 3739 msgstr "Opções de moderação"
3727 3740  
3728 3741 #: app/views/profile_editor/_organization.rhtml:38
3729   -msgid "New articles must be approved:"
3730   -msgstr "Novos artigos devem ser aprovados:"
  3742 +msgid "New articles posted by members of this group must be approved:"
  3743 +msgstr "Novos artigos postados por membros deste grupo devem ser aprovados:"
3731 3744  
3732   -#: app/views/profile_editor/_organization.rhtml:43
  3745 +#: app/views/profile_editor/_organization.rhtml:44
3733 3746 msgid ""
3734 3747 "<strong>Before</strong> being published in this group (a moderator has to "
3735 3748 "accept the article in pending request before the article be listed as a "
... ... @@ -3739,7 +3752,7 @@ msgstr &quot;&quot;
3739 3752 "precisa aceitar o artigo numa solicitação pendente antes do artigo ser "
3740 3753 "listado como um artigo deste grupo."
3741 3754  
3742   -#: app/views/profile_editor/_organization.rhtml:49
  3755 +#: app/views/profile_editor/_organization.rhtml:50
3743 3756 msgid ""
3744 3757 "<strong>After</strong> being published in this group (a moderator can always "
3745 3758 "remove publicated articles later)."
... ...