Commit d5b65a7379a2ebaf5c1b78d2e1de348f77ee4ad7

Authored by LeandroNunes
1 parent b24a88c0

ActionItem111: updation pot and po file

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@745 3f533792-8f58-4932-b0fe-aaf55b0a4547
app/controllers/application.rb
@@ -46,7 +46,10 @@ class ApplicationController < ActionController::Base @@ -46,7 +46,10 @@ class ApplicationController < ActionController::Base
46 46
47 def load_profile 47 def load_profile
48 @profile = Profile.find_by_identifier(params[:profile]) 48 @profile = Profile.find_by_identifier(params[:profile])
49 - raise "There is no profile with identifier %s" % params[:profile] if @profile.nil? 49 + if @profile.nil?
  50 + flash[:notice] = _('There is no page %s') % params[:profile]
  51 + redirect_to :controller => 'search', :action => 'index', :query => params[:profile]
  52 + end
50 end 53 end
51 54
52 def self.acts_as_environment_admin_controller 55 def self.acts_as_environment_admin_controller
app/helpers/application_helper.rb
@@ -257,7 +257,7 @@ module ApplicationHelper @@ -257,7 +257,7 @@ module ApplicationHelper
257 257
258 def search_box 258 def search_box
259 [form_tag( '/search'), 259 [form_tag( '/search'),
260 - text_field_tag( 'query', _(''), :id => "input_search"), 260 + text_field_tag( 'query', _('Search'), :id => "input_search"),
261 submit_tag(_('Search'), :id => 'button_search'), 261 submit_tag(_('Search'), :id => 'button_search'),
262 '</form>', 262 '</form>',
263 observe_field('input_search', :function => '', :on => :click) 263 observe_field('input_search', :function => '', :on => :click)
lib/noosfero_test.rb 0 → 100644
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +module NoosferoTest
  2 +
  3 + def get(path, parameters = nil, headers = nil)
  4 + super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
  5 + end
  6 +
  7 + def post(path, parameters = nil, headers = nil)
  8 + super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
  9 + end
  10 +
  11 +
  12 +end
po/noosfero.pot
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 msgid "" 7 msgid ""
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: noosfero 0.3.0\n" 9 "Project-Id-Version: noosfero 0.3.0\n"
10 -"POT-Creation-Date: 2007-10-19 13:30-0300\n" 10 +"POT-Creation-Date: 2007-10-19 18:31-0300\n"
11 "PO-Revision-Date: 2007-08-30 18:47-0300\n" 11 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n" 13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr &quot;&quot; @@ -17,7 +17,7 @@ msgstr &quot;&quot;
17 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" 17 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
18 18
19 #: app/controllers/environment_admin/edit_template_controller.rb:10 19 #: app/controllers/environment_admin/edit_template_controller.rb:10
20 -#: app/controllers/profile_admin/profile_editor_controller.rb:10 20 +#: app/controllers/profile_admin/profile_editor_controller.rb:12
21 msgid "Main content block" 21 msgid "Main content block"
22 msgstr "" 22 msgstr ""
23 23
@@ -46,27 +46,27 @@ msgstr &quot;&quot; @@ -46,27 +46,27 @@ msgstr &quot;&quot;
46 msgid "Failed to edit role" 46 msgid "Failed to edit role"
47 msgstr "" 47 msgstr ""
48 48
49 -#: app/controllers/environment_admin/features_controller.rb:12 49 +#: app/controllers/environment_admin/features_controller.rb:13
50 msgid "Features updated successfully." 50 msgid "Features updated successfully."
51 msgstr "" 51 msgstr ""
52 52
53 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:15  
54 -#: app/controllers/profile_admin/profile_members_controller.rb:16 53 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:17
  54 +#: app/controllers/profile_admin/profile_members_controller.rb:18
55 msgid "Roles successfuly updated" 55 msgid "Roles successfuly updated"
56 msgstr "" 56 msgstr ""
57 57
58 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:17  
59 -#: app/controllers/profile_admin/profile_members_controller.rb:18 58 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:19
  59 +#: app/controllers/profile_admin/profile_members_controller.rb:20
60 msgid "Couldn't change the roles" 60 msgid "Couldn't change the roles"
61 msgstr "" 61 msgstr ""
62 62
63 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:46  
64 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:56 63 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:48
  64 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:58
65 msgid "Member succefully unassociated" 65 msgid "Member succefully unassociated"
66 msgstr "" 66 msgstr ""
67 67
68 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:48  
69 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:58 68 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:50
  69 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:60
70 msgid "Failed to unassociate member" 70 msgid "Failed to unassociate member"
71 msgstr "" 71 msgstr ""
72 72
@@ -90,25 +90,25 @@ msgstr &quot;&quot; @@ -90,25 +90,25 @@ msgstr &quot;&quot;
90 msgid "Failed to activate the enterprise" 90 msgid "Failed to activate the enterprise"
91 msgstr "" 91 msgstr ""
92 92
93 -#: app/controllers/profile_admin/membership_editor_controller.rb:21 93 +#: app/controllers/profile_admin/membership_editor_controller.rb:23
94 msgid "" 94 msgid ""
95 "The enterprise was successfully created, the validation entity will cotact " 95 "The enterprise was successfully created, the validation entity will cotact "
96 "you as soon as your enterprise is approved" 96 "you as soon as your enterprise is approved"
97 msgstr "" 97 msgstr ""
98 98
99 -#: app/controllers/profile_admin/membership_editor_controller.rb:24 99 +#: app/controllers/profile_admin/membership_editor_controller.rb:26
100 msgid "Enterprise was not created" 100 msgid "Enterprise was not created"
101 msgstr "" 101 msgstr ""
102 102
103 -#: app/controllers/profile_admin/profile_editor_controller.rb:8 103 +#: app/controllers/profile_admin/profile_editor_controller.rb:10
104 msgid "List Block" 104 msgid "List Block"
105 msgstr "" 105 msgstr ""
106 106
107 -#: app/controllers/profile_admin/profile_editor_controller.rb:9 107 +#: app/controllers/profile_admin/profile_editor_controller.rb:11
108 msgid "Link Block" 108 msgid "Link Block"
109 msgstr "" 109 msgstr ""
110 110
111 -#: app/controllers/profile_admin/profile_editor_controller.rb:11 111 +#: app/controllers/profile_admin/profile_editor_controller.rb:13
112 msgid "Recent documents block" 112 msgid "Recent documents block"
113 msgstr "" 113 msgstr ""
114 114
@@ -120,19 +120,19 @@ msgstr &quot;&quot; @@ -120,19 +120,19 @@ msgstr &quot;&quot;
120 msgid "Incorrect username or password" 120 msgid "Incorrect username or password"
121 msgstr "" 121 msgstr ""
122 122
123 -#: app/controllers/public/account_controller.rb:40 123 +#: app/controllers/public/account_controller.rb:42
124 msgid "Thanks for signing up!" 124 msgid "Thanks for signing up!"
125 msgstr "" 125 msgstr ""
126 126
127 -#: app/controllers/public/account_controller.rb:52 127 +#: app/controllers/public/account_controller.rb:54
128 msgid "You have been logged out." 128 msgid "You have been logged out."
129 msgstr "" 129 msgstr ""
130 130
131 -#: app/controllers/public/account_controller.rb:63 131 +#: app/controllers/public/account_controller.rb:65
132 msgid "Your password has been changed successfully!" 132 msgid "Your password has been changed successfully!"
133 msgstr "" 133 msgstr ""
134 134
135 -#: app/controllers/public/account_controller.rb:66 135 +#: app/controllers/public/account_controller.rb:68
136 msgid "The supplied current password is incorrect." 136 msgid "The supplied current password is incorrect."
137 msgstr "" 137 msgstr ""
138 138
@@ -259,7 +259,7 @@ msgstr &quot;&quot; @@ -259,7 +259,7 @@ msgstr &quot;&quot;
259 msgid "Edit profile design" 259 msgid "Edit profile design"
260 msgstr "" 260 msgstr ""
261 261
262 -#: app/models/profile.rb:62 262 +#: app/models/profile.rb:63
263 msgid "An existing profile cannot be renamed." 263 msgid "An existing profile cannot be renamed."
264 msgstr "" 264 msgstr ""
265 265
@@ -556,34 +556,38 @@ msgid &quot;Environment|Design data&quot; @@ -556,34 +556,38 @@ msgid &quot;Environment|Design data&quot;
556 msgstr "" 556 msgstr ""
557 557
558 #: app/models/environment.rb:7 558 #: app/models/environment.rb:7
559 -msgid "Edit environment features" 559 +msgid "View environment admin panel"
560 msgstr "" 560 msgstr ""
561 561
562 #: app/models/environment.rb:8 562 #: app/models/environment.rb:8
563 -msgid "Edit environment design" 563 +msgid "Edit environment features"
564 msgstr "" 564 msgstr ""
565 565
566 #: app/models/environment.rb:9 566 #: app/models/environment.rb:9
567 -msgid "Manage environment categories" 567 +msgid "Edit environment design"
568 msgstr "" 568 msgstr ""
569 569
570 #: app/models/environment.rb:10 570 #: app/models/environment.rb:10
571 -msgid "Manage environment roles" 571 +msgid "Manage environment categories"
572 msgstr "" 572 msgstr ""
573 573
574 #: app/models/environment.rb:11 574 #: app/models/environment.rb:11
  575 +msgid "Manage environment roles"
  576 +msgstr ""
  577 +
  578 +#: app/models/environment.rb:12
575 msgid "Manage environment validators" 579 msgid "Manage environment validators"
576 msgstr "" 580 msgstr ""
577 581
578 -#: app/models/environment.rb:18 582 +#: app/models/environment.rb:19
579 msgid "Some feature" 583 msgid "Some feature"
580 msgstr "" 584 msgstr ""
581 585
582 -#: app/models/environment.rb:19 586 +#: app/models/environment.rb:20
583 msgid "Other feature" 587 msgid "Other feature"
584 msgstr "" 588 msgstr ""
585 589
586 -#: app/models/environment.rb:142 590 +#: app/models/environment.rb:143
587 msgid "Only one Virtual Community can be the default one" 591 msgid "Only one Virtual Community can be the default one"
588 msgstr "" 592 msgstr ""
589 593
@@ -792,27 +796,34 @@ msgstr &quot;&quot; @@ -792,27 +796,34 @@ msgstr &quot;&quot;
792 msgid "Change icon theme" 796 msgid "Change icon theme"
793 msgstr "" 797 msgstr ""
794 798
795 -#: app/helpers/application_helper.rb:247 app/helpers/application_helper.rb:250 799 +#: app/helpers/application_helper.rb:252 app/helpers/application_helper.rb:255
796 msgid "Accessibility" 800 msgid "Accessibility"
797 msgstr "" 801 msgstr ""
798 802
799 -#: app/helpers/application_helper.rb:257 803 +#: app/helpers/application_helper.rb:260 app/helpers/application_helper.rb:261
  804 +#: app/views/region_validators/region.rhtml:22
  805 +#: app/views/manage_tags/_search_box.rhtml:4
  806 +#: app/views/membership_editor/index.rhtml:4
  807 +msgid "Search"
  808 +msgstr ""
  809 +
  810 +#: app/helpers/application_helper.rb:271
800 msgid "%s, version %s" 811 msgid "%s, version %s"
801 msgstr "" 812 msgstr ""
802 813
803 -#: app/helpers/application_helper.rb:327 814 +#: app/helpers/application_helper.rb:341
804 msgid "No Filter at all" 815 msgid "No Filter at all"
805 msgstr "" 816 msgstr ""
806 817
807 -#: app/helpers/application_helper.rb:328 818 +#: app/helpers/application_helper.rb:342
808 msgid "RDoc filter" 819 msgid "RDoc filter"
809 msgstr "" 820 msgstr ""
810 821
811 -#: app/helpers/application_helper.rb:329 822 +#: app/helpers/application_helper.rb:343
812 msgid "Simple" 823 msgid "Simple"
813 msgstr "" 824 msgstr ""
814 825
815 -#: app/helpers/application_helper.rb:330 826 +#: app/helpers/application_helper.rb:344
816 msgid "Textile" 827 msgid "Textile"
817 msgstr "" 828 msgstr ""
818 829
@@ -864,79 +875,79 @@ msgstr &quot;&quot; @@ -864,79 +875,79 @@ msgstr &quot;&quot;
864 msgid "DRAG" 875 msgid "DRAG"
865 msgstr "" 876 msgstr ""
866 877
867 -#: app/views/cms/_form.rhtml:6 878 +#: app/views/cms/_form.rhtml:9
868 msgid "Title" 879 msgid "Title"
869 msgstr "" 880 msgstr ""
870 881
871 -#: app/views/cms/_form.rhtml:7 882 +#: app/views/cms/_form.rhtml:10
872 msgid "More..." 883 msgid "More..."
873 msgstr "" 884 msgstr ""
874 885
875 -#: app/views/cms/_form.rhtml:7 886 +#: app/views/cms/_form.rhtml:10
876 msgid "Less..." 887 msgid "Less..."
877 msgstr "" 888 msgstr ""
878 889
879 -#: app/views/cms/_form.rhtml:11 890 +#: app/views/cms/_form.rhtml:14
880 msgid "Slug" 891 msgid "Slug"
881 msgstr "" 892 msgstr ""
882 893
883 -#: app/views/cms/_form.rhtml:17 894 +#: app/views/cms/_form.rhtml:20
884 msgid "Keywords" 895 msgid "Keywords"
885 msgstr "" 896 msgstr ""
886 897
887 -#: app/views/cms/_form.rhtml:24 898 +#: app/views/cms/_form.rhtml:27
888 msgid "Parent" 899 msgid "Parent"
889 msgstr "" 900 msgstr ""
890 901
891 -#: app/views/cms/_form.rhtml:26 902 +#: app/views/cms/_form.rhtml:29
892 msgid "%s is a root page" 903 msgid "%s is a root page"
893 msgstr "" 904 msgstr ""
894 905
895 -#: app/views/cms/_form.rhtml:34 906 +#: app/views/cms/_form.rhtml:37
896 msgid "Content" 907 msgid "Content"
897 msgstr "" 908 msgstr ""
898 909
899 -#: app/views/cms/_form.rhtml:40 910 +#: app/views/cms/_form.rhtml:43
900 msgid "Filter" 911 msgid "Filter"
901 msgstr "" 912 msgstr ""
902 913
903 -#: app/views/cms/_form.rhtml:42 914 +#: app/views/cms/_form.rhtml:45
904 msgid "Converts plain text into HTML" 915 msgid "Converts plain text into HTML"
905 msgstr "" 916 msgstr ""
906 917
907 -#: app/views/cms/_form.rhtml:48 918 +#: app/views/cms/_form.rhtml:51
908 msgid "Created" 919 msgid "Created"
909 msgstr "" 920 msgstr ""
910 921
911 -#: app/views/cms/_form.rhtml:57 922 +#: app/views/cms/_form.rhtml:60
912 msgid "One revision" 923 msgid "One revision"
913 msgid_plural "%d revisions" 924 msgid_plural "%d revisions"
914 msgstr[0] "" 925 msgstr[0] ""
915 msgstr[1] "" 926 msgstr[1] ""
916 927
917 -#: app/views/cms/_form.rhtml:63 928 +#: app/views/cms/_form.rhtml:66
918 msgid "Loading preview ..." 929 msgid "Loading preview ..."
919 msgstr "" 930 msgstr ""
920 931
921 -#: app/views/cms/_form.rhtml:64 932 +#: app/views/cms/_form.rhtml:67
922 msgid "Save Changes" 933 msgid "Save Changes"
923 msgstr "" 934 msgstr ""
924 935
925 -#: app/views/cms/_form.rhtml:64 936 +#: app/views/cms/_form.rhtml:67
926 msgid "Create Page" 937 msgid "Create Page"
927 msgstr "" 938 msgstr ""
928 939
929 -#: app/views/cms/_form.rhtml:66 940 +#: app/views/cms/_form.rhtml:69
930 msgid "Revert" 941 msgid "Revert"
931 msgstr "" 942 msgstr ""
932 943
933 -#: app/views/cms/_form.rhtml:69 944 +#: app/views/cms/_form.rhtml:72
934 msgid "" 945 msgid ""
935 "Changes detected. You will lose all the updates you have made if you " 946 "Changes detected. You will lose all the updates you have made if you "
936 "proceed..." 947 "proceed..."
937 msgstr "" 948 msgstr ""
938 949
939 -#: app/views/cms/_form.rhtml:69 app/views/cms/delete.rhtml:16 950 +#: app/views/cms/_form.rhtml:72 app/views/cms/delete.rhtml:16
940 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13 951 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
941 #: app/views/profile_members/change_role.rhtml:12 952 #: app/views/profile_members/change_role.rhtml:12
942 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6 953 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
@@ -948,23 +959,23 @@ msgstr &quot;&quot; @@ -948,23 +959,23 @@ msgstr &quot;&quot;
948 msgid "Cancel" 959 msgid "Cancel"
949 msgstr "" 960 msgstr ""
950 961
951 -#: app/views/cms/_form.rhtml:75 962 +#: app/views/cms/_form.rhtml:78
952 msgid "Page Preview" 963 msgid "Page Preview"
953 msgstr "" 964 msgstr ""
954 965
955 -#: app/views/cms/_form.rhtml:77 966 +#: app/views/cms/_form.rhtml:80
956 msgid "Loading Preview..." 967 msgid "Loading Preview..."
957 msgstr "" 968 msgstr ""
958 969
959 -#: app/views/cms/_form.rhtml:82 970 +#: app/views/cms/_form.rhtml:85
960 msgid "Close Preview" 971 msgid "Close Preview"
961 msgstr "" 972 msgstr ""
962 973
963 -#: app/views/cms/_form.rhtml:82 app/views/cms/versions.rhtml:24 974 +#: app/views/cms/_form.rhtml:85 app/views/cms/versions.rhtml:24
964 msgid "or" 975 msgid "or"
965 msgstr "" 976 msgstr ""
966 977
967 -#: app/views/cms/_form.rhtml:82 978 +#: app/views/cms/_form.rhtml:85
968 msgid "Back to top" 979 msgid "Back to top"
969 msgstr "" 980 msgstr ""
970 981
@@ -1032,7 +1043,7 @@ msgstr &quot;&quot; @@ -1032,7 +1043,7 @@ msgstr &quot;&quot;
1032 msgid "Current Version" 1043 msgid "Current Version"
1033 msgstr "" 1044 msgstr ""
1034 1045
1035 -#: app/views/cms/edit.rhtml:2 1046 +#: app/views/cms/edit.rhtml:20
1036 msgid "Edit Page" 1047 msgid "Edit Page"
1037 msgstr "" 1048 msgstr ""
1038 1049
@@ -1085,8 +1096,9 @@ msgstr &quot;&quot; @@ -1085,8 +1096,9 @@ msgstr &quot;&quot;
1085 msgid "New role" 1096 msgid "New role"
1086 msgstr "" 1097 msgstr ""
1087 1098
1088 -#: app/views/role/index.rhtml:6 app/views/manage_tags/_a_tag.rhtml:3  
1089 -#: app/views/profile_editor/index.rhtml:5 1099 +#: app/views/role/index.rhtml:6 app/views/content_viewer/view_page.rhtml:7
  1100 +#: app/views/manage_tags/_a_tag.rhtml:3 app/views/profile_editor/index.rhtml:6
  1101 +#: app/views/profile_editor/index.rhtml:8
1090 #: app/views/categories/_category.rhtml:8 1102 #: app/views/categories/_category.rhtml:8
1091 msgid "Edit" 1103 msgid "Edit"
1092 msgstr "" 1104 msgstr ""
@@ -1167,14 +1179,6 @@ msgid &quot;&quot; @@ -1167,14 +1179,6 @@ msgid &quot;&quot;
1167 "result to add them as validators for this region. " 1179 "result to add them as validators for this region. "
1168 msgstr "" 1180 msgstr ""
1169 1181
1170 -#: app/views/region_validators/region.rhtml:22  
1171 -#: app/views/layouts/application.rhtml:82  
1172 -#: app/views/layouts/comatose_admin.rhtml:82  
1173 -#: app/views/manage_tags/_search_box.rhtml:4  
1174 -#: app/views/membership_editor/index.rhtml:4  
1175 -msgid "Search"  
1176 -msgstr ""  
1177 -  
1178 #: app/views/region_validators/_region.rhtml:5 1182 #: app/views/region_validators/_region.rhtml:5
1179 msgid "1 validator" 1183 msgid "1 validator"
1180 msgid_plural "%{num} validators." 1184 msgid_plural "%{num} validators."
@@ -1194,16 +1198,11 @@ msgstr &quot;&quot; @@ -1194,16 +1198,11 @@ msgstr &quot;&quot;
1194 msgid "There is no such page: %s" 1198 msgid "There is no such page: %s"
1195 msgstr "" 1199 msgstr ""
1196 1200
1197 -#: app/views/layouts/application.rhtml:60  
1198 -#: app/views/layouts/comatose_admin.rhtml:60 1201 +#: app/views/layouts/application.rhtml:21
  1202 +#: app/views/layouts/comatose_admin.rhtml:21
1199 msgid "Image for Loading..." 1203 msgid "Image for Loading..."
1200 msgstr "" 1204 msgstr ""
1201 1205
1202 -#: app/views/layouts/application.rhtml:81  
1203 -#: app/views/layouts/comatose_admin.rhtml:81  
1204 -msgid "Your search here ..."  
1205 -msgstr ""  
1206 -  
1207 #: app/views/enterprise_editor/_form.rhtml:1 1206 #: app/views/enterprise_editor/_form.rhtml:1
1208 #: app/views/manage_tags/_form.rhtml:1 1207 #: app/views/manage_tags/_form.rhtml:1
1209 #: app/views/membership_editor/_form.rhtml:1 1208 #: app/views/membership_editor/_form.rhtml:1
@@ -1656,6 +1655,14 @@ msgid &quot;&quot; @@ -1656,6 +1655,14 @@ msgid &quot;&quot;
1656 "environment." 1655 "environment."
1657 msgstr "" 1656 msgstr ""
1658 1657
  1658 +#: app/views/search/index.rhtml:1
  1659 +msgid "Listing articles found"
  1660 +msgstr ""
  1661 +
  1662 +#: app/views/search/index.rhtml:3
  1663 +msgid "Searching for "
  1664 +msgstr ""
  1665 +
1659 #: app/views/features/_features_table.rhtml:12 1666 #: app/views/features/_features_table.rhtml:12
1660 msgid "Organization Approval Method" 1667 msgid "Organization Approval Method"
1661 msgstr "" 1668 msgstr ""
@@ -1700,15 +1707,15 @@ msgstr &quot;&quot; @@ -1700,15 +1707,15 @@ msgstr &quot;&quot;
1700 msgid "My profile" 1707 msgid "My profile"
1701 msgstr "" 1708 msgstr ""
1702 1709
1703 -#: app/views/profile_editor/index.rhtml:7 1710 +#: app/views/profile_editor/index.rhtml:13
1704 msgid "Edit Visual Design" 1711 msgid "Edit Visual Design"
1705 msgstr "" 1712 msgstr ""
1706 1713
1707 -#: app/views/profile_editor/index.rhtml:9 1714 +#: app/views/profile_editor/index.rhtml:15
1708 msgid "Menage content" 1715 msgid "Menage content"
1709 msgstr "" 1716 msgstr ""
1710 1717
1711 -#: app/views/profile_editor/index.rhtml:12 1718 +#: app/views/profile_editor/index.rhtml:18
1712 msgid "Edit enterprise info" 1719 msgid "Edit enterprise info"
1713 msgstr "" 1720 msgstr ""
1714 1721
po/pt_BR/noosfero.po
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 msgid "" 9 msgid ""
10 msgstr "" 10 msgstr ""
11 "Project-Id-Version: noosfero 0.3.0\n" 11 "Project-Id-Version: noosfero 0.3.0\n"
12 -"POT-Creation-Date: 2007-10-19 13:30-0300\n" 12 +"POT-Creation-Date: 2007-10-19 18:31-0300\n"
13 "PO-Revision-Date: 2007-10-19 13:30-0300\n" 13 "PO-Revision-Date: 2007-10-19 13:30-0300\n"
14 "Last-Translator: Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop." 14 "Last-Translator: Krishnamurti Lelis Lima Vieira Nunes <krishna@colivre.coop."
15 "br>\n" 15 "br>\n"
@@ -21,7 +21,7 @@ msgstr &quot;&quot; @@ -21,7 +21,7 @@ msgstr &quot;&quot;
21 "X-Generator: KBabel 1.11.4\n" 21 "X-Generator: KBabel 1.11.4\n"
22 22
23 #: app/controllers/environment_admin/edit_template_controller.rb:10 23 #: app/controllers/environment_admin/edit_template_controller.rb:10
24 -#: app/controllers/profile_admin/profile_editor_controller.rb:10 24 +#: app/controllers/profile_admin/profile_editor_controller.rb:12
25 msgid "Main content block" 25 msgid "Main content block"
26 msgstr "Bloco de conteúdo principal" 26 msgstr "Bloco de conteúdo principal"
27 27
@@ -50,44 +50,39 @@ msgstr &quot;Falhou em criar papel&quot; @@ -50,44 +50,39 @@ msgstr &quot;Falhou em criar papel&quot;
50 msgid "Failed to edit role" 50 msgid "Failed to edit role"
51 msgstr "Falhou em editar papel" 51 msgstr "Falhou em editar papel"
52 52
53 -#: app/controllers/environment_admin/features_controller.rb:12 53 +#: app/controllers/environment_admin/features_controller.rb:13
54 msgid "Features updated successfully." 54 msgid "Features updated successfully."
55 msgstr "Funcionalidades alterada com sucesso" 55 msgstr "Funcionalidades alterada com sucesso"
56 56
57 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:15  
58 -#: app/controllers/profile_admin/profile_members_controller.rb:16  
59 -#, fuzzy  
60 -msgid "Roles successfuly updated"  
61 -msgstr "Marcador alterado com sucesso"  
62 -  
63 #: app/controllers/environment_admin/environment_role_manager_controller.rb:17 57 #: app/controllers/environment_admin/environment_role_manager_controller.rb:17
64 #: app/controllers/profile_admin/profile_members_controller.rb:18 58 #: app/controllers/profile_admin/profile_members_controller.rb:18
65 -#, fuzzy  
66 -msgid "Couldn't change the roles"  
67 -msgstr "Não pôde modificar o empreendimento" 59 +msgid "Roles successfuly updated"
  60 +msgstr "Papéis alterado com sucesso"
68 61
69 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:46  
70 -#: app/controllers/environment_admin/environment_role_manager_controller.rb:56  
71 -#, fuzzy  
72 -msgid "Member succefully unassociated"  
73 -msgstr "Empreendimento ativado com sucesso" 62 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:19
  63 +#: app/controllers/profile_admin/profile_members_controller.rb:20
  64 +msgid "Couldn't change the roles"
  65 +msgstr "Não pôde modificar os papéis"
74 66
75 #: app/controllers/environment_admin/environment_role_manager_controller.rb:48 67 #: app/controllers/environment_admin/environment_role_manager_controller.rb:48
76 #: app/controllers/environment_admin/environment_role_manager_controller.rb:58 68 #: app/controllers/environment_admin/environment_role_manager_controller.rb:58
77 -#, fuzzy 69 +msgid "Member succefully unassociated"
  70 +msgstr "Membro desassociado com sucesso"
  71 +
  72 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:50
  73 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:60
78 msgid "Failed to unassociate member" 74 msgid "Failed to unassociate member"
79 -msgstr "Falhou em ativar o empreendimento" 75 +msgstr "Falhou em desassociar membro"
80 76
81 #: app/controllers/profile_admin_controller.rb:15 77 #: app/controllers/profile_admin_controller.rb:15
82 msgid "This action is not available for \"%s\"." 78 msgid "This action is not available for \"%s\"."
83 -msgstr "" 79 +msgstr "Esta ação não está disponível para \"%s\"."
84 80
85 #: app/controllers/profile_admin/enterprise_editor_controller.rb:25 81 #: app/controllers/profile_admin/enterprise_editor_controller.rb:25
86 msgid "Could not update the enterprise" 82 msgid "Could not update the enterprise"
87 msgstr "Não pôde modificar o empreendimento" 83 msgstr "Não pôde modificar o empreendimento"
88 84
89 #: app/controllers/profile_admin/enterprise_editor_controller.rb:34 85 #: app/controllers/profile_admin/enterprise_editor_controller.rb:34
90 -#, fuzzy  
91 msgid "Enterprise sucessfully erased from the system" 86 msgid "Enterprise sucessfully erased from the system"
92 msgstr "Empreendimento ativado com sucesso" 87 msgstr "Empreendimento ativado com sucesso"
93 88
@@ -99,7 +94,7 @@ msgstr &quot;Empreendimento ativado com sucesso&quot; @@ -99,7 +94,7 @@ msgstr &quot;Empreendimento ativado com sucesso&quot;
99 msgid "Failed to activate the enterprise" 94 msgid "Failed to activate the enterprise"
100 msgstr "Falhou em ativar o empreendimento" 95 msgstr "Falhou em ativar o empreendimento"
101 96
102 -#: app/controllers/profile_admin/membership_editor_controller.rb:21 97 +#: app/controllers/profile_admin/membership_editor_controller.rb:23
103 msgid "" 98 msgid ""
104 "The enterprise was successfully created, the validation entity will cotact " 99 "The enterprise was successfully created, the validation entity will cotact "
105 "you as soon as your enterprise is approved" 100 "you as soon as your enterprise is approved"
@@ -107,22 +102,21 @@ msgstr &quot;&quot; @@ -107,22 +102,21 @@ msgstr &quot;&quot;
107 "O empreendimento foi criado com sucesso, a entidade de validação irá entrar " 102 "O empreendimento foi criado com sucesso, a entidade de validação irá entrar "
108 "em contato com você assim que seu empreendimento for aprovado" 103 "em contato com você assim que seu empreendimento for aprovado"
109 104
110 -#: app/controllers/profile_admin/membership_editor_controller.rb:24 105 +#: app/controllers/profile_admin/membership_editor_controller.rb:26
111 msgid "Enterprise was not created" 106 msgid "Enterprise was not created"
112 msgstr "Empreendimento não foi criado" 107 msgstr "Empreendimento não foi criado"
113 108
114 -#: app/controllers/profile_admin/profile_editor_controller.rb:8 109 +#: app/controllers/profile_admin/profile_editor_controller.rb:10
115 msgid "List Block" 110 msgid "List Block"
116 -msgstr "" 111 +msgstr "Bloco de Lista"
117 112
118 -#: app/controllers/profile_admin/profile_editor_controller.rb:9 113 +#: app/controllers/profile_admin/profile_editor_controller.rb:11
119 msgid "Link Block" 114 msgid "Link Block"
120 -msgstr "" 115 +msgstr "Bloco de Link"
121 116
122 -#: app/controllers/profile_admin/profile_editor_controller.rb:11  
123 -#, fuzzy 117 +#: app/controllers/profile_admin/profile_editor_controller.rb:13
124 msgid "Recent documents block" 118 msgid "Recent documents block"
125 -msgstr "Bloco de conteúdo principal" 119 +msgstr "Bloco de documentos recentes"
126 120
127 #: app/controllers/public/account_controller.rb:21 121 #: app/controllers/public/account_controller.rb:21
128 msgid "Logged in successfully" 122 msgid "Logged in successfully"
@@ -132,78 +126,69 @@ msgstr &quot;Login bem sucedido&quot; @@ -132,78 +126,69 @@ msgstr &quot;Login bem sucedido&quot;
132 msgid "Incorrect username or password" 126 msgid "Incorrect username or password"
133 msgstr "Nome ou senha incorreto" 127 msgstr "Nome ou senha incorreto"
134 128
135 -#: app/controllers/public/account_controller.rb:40 129 +#: app/controllers/public/account_controller.rb:42
136 msgid "Thanks for signing up!" 130 msgid "Thanks for signing up!"
137 msgstr "Obrigado por se registrar!" 131 msgstr "Obrigado por se registrar!"
138 132
139 -#: app/controllers/public/account_controller.rb:52 133 +#: app/controllers/public/account_controller.rb:54
140 msgid "You have been logged out." 134 msgid "You have been logged out."
141 msgstr "Você se saiu do sistema" 135 msgstr "Você se saiu do sistema"
142 136
143 -#: app/controllers/public/account_controller.rb:63 137 +#: app/controllers/public/account_controller.rb:65
144 msgid "Your password has been changed successfully!" 138 msgid "Your password has been changed successfully!"
145 msgstr "Sua senha foi alterada com sucesso!" 139 msgstr "Sua senha foi alterada com sucesso!"
146 140
147 -#: app/controllers/public/account_controller.rb:66 141 +#: app/controllers/public/account_controller.rb:68
148 msgid "The supplied current password is incorrect." 142 msgid "The supplied current password is incorrect."
149 msgstr "A senha informada está incorreta" 143 msgstr "A senha informada está incorreta"
150 144
151 #: app/models/validation_info.rb:- 145 #: app/models/validation_info.rb:-
152 -#, fuzzy  
153 msgid "validation info" 146 msgid "validation info"
154 -msgstr "informação da organização" 147 +msgstr "informação de validação"
155 148
156 #: app/models/validation_info.rb:- 149 #: app/models/validation_info.rb:-
157 -#, fuzzy  
158 msgid "ValidationInfo|Validation methodology" 150 msgid "ValidationInfo|Validation methodology"
159 -msgstr "Validado" 151 +msgstr "Metodologia de validação"
160 152
161 #: app/models/validation_info.rb:- 153 #: app/models/validation_info.rb:-
162 -#, fuzzy  
163 msgid "ValidationInfo|Restrictions" 154 msgid "ValidationInfo|Restrictions"
164 -msgstr "Organização" 155 +msgstr "Restrições"
165 156
166 #: app/models/validation_info.rb:- 157 #: app/models/validation_info.rb:-
167 -#, fuzzy  
168 msgid "ValidationInfo|Organization" 158 msgid "ValidationInfo|Organization"
169 msgstr "Organização" 159 msgstr "Organização"
170 160
171 #: app/models/change_password.rb:13 161 #: app/models/change_password.rb:13
172 -#, fuzzy  
173 msgid "ChangePassword|Login" 162 msgid "ChangePassword|Login"
174 -msgstr "Alterar senha" 163 +msgstr "Login"
175 164
176 #: app/models/change_password.rb:14 165 #: app/models/change_password.rb:14
177 -#, fuzzy  
178 msgid "ChangePassword|Email" 166 msgid "ChangePassword|Email"
179 -msgstr "Alterar senha" 167 +msgstr "Email"
180 168
181 #: app/models/change_password.rb:15 169 #: app/models/change_password.rb:15
182 -#, fuzzy  
183 msgid "ChangePassword|Password" 170 msgid "ChangePassword|Password"
184 -msgstr "Alterar senha" 171 +msgstr "Senha"
185 172
186 #: app/models/change_password.rb:16 173 #: app/models/change_password.rb:16
187 -#, fuzzy  
188 msgid "ChangePassword|Password Confirmation" 174 msgid "ChangePassword|Password Confirmation"
189 msgstr "Confirmação de senha" 175 msgstr "Confirmação de senha"
190 176
191 #: app/models/change_password.rb:31 177 #: app/models/change_password.rb:31
192 msgid "%{fn} is not a valid username." 178 msgid "%{fn} is not a valid username."
193 -msgstr "" 179 +msgstr "%{fn} não é um nome de usuário válido"
194 180
195 #: app/models/change_password.rb:34 181 #: app/models/change_password.rb:34
196 msgid "%{fn} is invalid." 182 msgid "%{fn} is invalid."
197 -msgstr "" 183 +msgstr "%{fn} é inválido"
198 184
199 #: app/models/change_password.rb:65 185 #: app/models/change_password.rb:65
200 msgid "Your password change request was cancelled at %s." 186 msgid "Your password change request was cancelled at %s."
201 -msgstr "" 187 +msgstr "Seu pedido de alteração de senha foi cancelado em %s."
202 188
203 #: app/models/change_password.rb:69 189 #: app/models/change_password.rb:69
204 -#, fuzzy  
205 msgid "Your password was changed successfully." 190 msgid "Your password was changed successfully."
206 -msgstr "Sua senha foi alterada com sucesso!" 191 +msgstr "Sua senha foi alterada com sucesso."
207 192
208 #: app/models/change_password.rb:78 193 #: app/models/change_password.rb:78
209 msgid "" 194 msgid ""
@@ -211,10 +196,13 @@ msgid &quot;&quot; @@ -211,10 +196,13 @@ msgid &quot;&quot;
211 "\n" 196 "\n"
212 "%s" 197 "%s"
213 msgstr "" 198 msgstr ""
  199 +"Para alterar sua senha, por favor visite o seguinte endereço:\n"
  200 +"\n"
  201 +"%s"
214 202
215 #: app/models/change_password.rb:83 203 #: app/models/change_password.rb:83
216 msgid "Password change request" 204 msgid "Password change request"
217 -msgstr "" 205 +msgstr "Pedido de alteração de senha"
218 206
219 #: app/models/profile.rb:- 207 #: app/models/profile.rb:-
220 msgid "profile" 208 msgid "profile"
@@ -233,13 +221,12 @@ msgid &quot;Profile|Identifier&quot; @@ -233,13 +221,12 @@ msgid &quot;Profile|Identifier&quot;
233 msgstr "Identificador" 221 msgstr "Identificador"
234 222
235 #: app/models/profile.rb:- 223 #: app/models/profile.rb:-
236 -#, fuzzy  
237 msgid "Profile|Environment" 224 msgid "Profile|Environment"
238 -msgstr "comunidade virtual" 225 +msgstr "Ambiente"
239 226
240 #: app/models/profile.rb:- 227 #: app/models/profile.rb:-
241 msgid "Profile|Design data" 228 msgid "Profile|Design data"
242 -msgstr "" 229 +msgstr "Dados de design"
243 230
244 #: app/models/profile.rb:- 231 #: app/models/profile.rb:-
245 msgid "Profile|Active" 232 msgid "Profile|Active"
@@ -258,9 +245,8 @@ msgid &quot;Profile|User&quot; @@ -258,9 +245,8 @@ msgid &quot;Profile|User&quot;
258 msgstr "Usuário" 245 msgstr "Usuário"
259 246
260 #: app/models/profile.rb:- 247 #: app/models/profile.rb:-
261 -#, fuzzy  
262 msgid "Profile|Region" 248 msgid "Profile|Region"
263 -msgstr "Nome" 249 +msgstr "Região"
264 250
265 #: app/models/profile.rb:7 app/helpers/application_helper.rb:183 251 #: app/models/profile.rb:7 app/helpers/application_helper.rb:183
266 msgid "Edit profile" 252 msgid "Edit profile"
@@ -279,11 +265,10 @@ msgid &quot;Post content&quot; @@ -279,11 +265,10 @@ msgid &quot;Post content&quot;
279 msgstr "Conteúdo da postagem" 265 msgstr "Conteúdo da postagem"
280 266
281 #: app/models/profile.rb:11 267 #: app/models/profile.rb:11
282 -#, fuzzy  
283 msgid "Edit profile design" 268 msgid "Edit profile design"
284 -msgstr "perfil" 269 +msgstr "Editar design de perfil"
285 270
286 -#: app/models/profile.rb:62 271 +#: app/models/profile.rb:63
287 msgid "An existing profile cannot be renamed." 272 msgid "An existing profile cannot be renamed."
288 msgstr "Um perfil existente não pode ser renomeado" 273 msgstr "Um perfil existente não pode ser renomeado"
289 274
@@ -325,47 +310,47 @@ msgstr &quot;Validado&quot; @@ -325,47 +310,47 @@ msgstr &quot;Validado&quot;
325 310
326 #: app/models/task.rb:- 311 #: app/models/task.rb:-
327 msgid "task" 312 msgid "task"
328 -msgstr "" 313 +msgstr "tarefa"
329 314
330 #: app/models/task.rb:- 315 #: app/models/task.rb:-
331 msgid "Task|Data" 316 msgid "Task|Data"
332 -msgstr "" 317 +msgstr "Dados"
333 318
334 #: app/models/task.rb:- 319 #: app/models/task.rb:-
335 msgid "Task|Status" 320 msgid "Task|Status"
336 -msgstr "" 321 +msgstr "Estado"
337 322
338 #: app/models/task.rb:- 323 #: app/models/task.rb:-
339 msgid "Task|End date" 324 msgid "Task|End date"
340 -msgstr "" 325 +msgstr "Data de término"
341 326
342 #: app/models/task.rb:- 327 #: app/models/task.rb:-
343 msgid "Task|Requestor" 328 msgid "Task|Requestor"
344 -msgstr "" 329 +msgstr "Solicitante"
345 330
346 #: app/models/task.rb:- 331 #: app/models/task.rb:-
347 msgid "Task|Target" 332 msgid "Task|Target"
348 -msgstr "" 333 +msgstr "Alvo"
349 334
350 #: app/models/task.rb:- 335 #: app/models/task.rb:-
351 msgid "Task|Code" 336 msgid "Task|Code"
352 -msgstr "" 337 +msgstr "Código"
353 338
354 #: app/models/task.rb:81 339 #: app/models/task.rb:81
355 msgid "Generic task" 340 msgid "Generic task"
356 -msgstr "" 341 +msgstr "Tarefa genérica"
357 342
358 #: app/models/task.rb:88 343 #: app/models/task.rb:88
359 msgid "The task was created at %s" 344 msgid "The task was created at %s"
360 -msgstr "" 345 +msgstr "A tarefa foi criada em %s"
361 346
362 #: app/models/task.rb:94 347 #: app/models/task.rb:94
363 msgid "The task was finished at %s" 348 msgid "The task was finished at %s"
364 -msgstr "" 349 +msgstr "A tarefa foi finalizada em %s"
365 350
366 #: app/models/task.rb:100 351 #: app/models/task.rb:100
367 msgid "The task was cancelled at %s" 352 msgid "The task was cancelled at %s"
368 -msgstr "" 353 +msgstr "A tarefa foi cancelada em %s"
369 354
370 #: app/models/person_info.rb:- 355 #: app/models/person_info.rb:-
371 msgid "person info" 356 msgid "person info"
@@ -473,11 +458,11 @@ msgstr &quot;Token lembrado expira em&quot; @@ -473,11 +458,11 @@ msgstr &quot;Token lembrado expira em&quot;
473 458
474 #: app/models/user.rb:- 459 #: app/models/user.rb:-
475 msgid "User|Terms of use" 460 msgid "User|Terms of use"
476 -msgstr "" 461 +msgstr "Termos de Uso"
477 462
478 #: app/models/user.rb:- 463 #: app/models/user.rb:-
479 msgid "User|Terms accepted" 464 msgid "User|Terms accepted"
480 -msgstr "" 465 +msgstr "Termos aceitos"
481 466
482 #: app/models/user.rb:7 467 #: app/models/user.rb:7
483 msgid "User|Password" 468 msgid "User|Password"
@@ -492,57 +477,48 @@ msgid &quot;%{fn} must be checked in order to signup.&quot; @@ -492,57 +477,48 @@ msgid &quot;%{fn} must be checked in order to signup.&quot;
492 msgstr "%{fn} deve ser verificado para efetivar inscrição" 477 msgstr "%{fn} deve ser verificado para efetivar inscrição"
493 478
494 #: app/models/create_enterprise.rb:3 479 #: app/models/create_enterprise.rb:3
495 -#, fuzzy  
496 msgid "CreateEnterprise|Identifier" 480 msgid "CreateEnterprise|Identifier"
497 msgstr "Identificador" 481 msgstr "Identificador"
498 482
499 #: app/models/create_enterprise.rb:4 483 #: app/models/create_enterprise.rb:4
500 -#, fuzzy  
501 msgid "CreateEnterprise|Name" 484 msgid "CreateEnterprise|Name"
502 -msgstr "Excluir empreendimento" 485 +msgstr "Nome"
503 486
504 #: app/models/create_enterprise.rb:5 487 #: app/models/create_enterprise.rb:5
505 msgid "CreateEnterprise|Address" 488 msgid "CreateEnterprise|Address"
506 -msgstr "" 489 +msgstr "Endereço"
507 490
508 #: app/models/create_enterprise.rb:6 491 #: app/models/create_enterprise.rb:6
509 -#, fuzzy  
510 msgid "CreateEnterprise|Contact phone" 492 msgid "CreateEnterprise|Contact phone"
511 msgstr "Telefone de contato" 493 msgstr "Telefone de contato"
512 494
513 #: app/models/create_enterprise.rb:7 495 #: app/models/create_enterprise.rb:7
514 -#, fuzzy  
515 msgid "CreateEnterprise|Contact person" 496 msgid "CreateEnterprise|Contact person"
516 msgstr "Pessoa de contato" 497 msgstr "Pessoa de contato"
517 498
518 #: app/models/create_enterprise.rb:8 499 #: app/models/create_enterprise.rb:8
519 msgid "CreateEnterprise|Acronym" 500 msgid "CreateEnterprise|Acronym"
520 -msgstr "" 501 +msgstr "Sigla"
521 502
522 #: app/models/create_enterprise.rb:9 503 #: app/models/create_enterprise.rb:9
523 -#, fuzzy  
524 msgid "CreateEnterprise|Foundation year" 504 msgid "CreateEnterprise|Foundation year"
525 msgstr "Ano de fundação" 505 msgstr "Ano de fundação"
526 506
527 #: app/models/create_enterprise.rb:10 507 #: app/models/create_enterprise.rb:10
528 -#, fuzzy  
529 msgid "CreateEnterprise|Legal form" 508 msgid "CreateEnterprise|Legal form"
530 -msgstr "informação de empreendimento" 509 +msgstr "Formulário legal"
531 510
532 #: app/models/create_enterprise.rb:11 511 #: app/models/create_enterprise.rb:11
533 -#, fuzzy  
534 msgid "CreateEnterprise|Economic activity" 512 msgid "CreateEnterprise|Economic activity"
535 msgstr "Atividade econômica" 513 msgstr "Atividade econômica"
536 514
537 #: app/models/create_enterprise.rb:12 515 #: app/models/create_enterprise.rb:12
538 -#, fuzzy  
539 msgid "CreateEnterprise|Management information" 516 msgid "CreateEnterprise|Management information"
540 msgstr "Informação de gerenciamento" 517 msgstr "Informação de gerenciamento"
541 518
542 #: app/models/create_enterprise.rb:108 519 #: app/models/create_enterprise.rb:108
543 -#, fuzzy  
544 msgid "Enterprise registration: \"%s\"" 520 msgid "Enterprise registration: \"%s\""
545 -msgstr "Editar informações do empreendimento" 521 +msgstr "Cadastro de empreendimento: \"%s\""
546 522
547 #: app/models/create_enterprise.rb:112 523 #: app/models/create_enterprise.rb:112
548 msgid "" 524 msgid ""
@@ -553,18 +529,28 @@ msgid &quot;&quot; @@ -553,18 +529,28 @@ msgid &quot;&quot;
553 " You will be notified as soon as the validator organization has a " 529 " You will be notified as soon as the validator organization has a "
554 "position about your request." 530 "position about your request."
555 msgstr "" 531 msgstr ""
  532 +"Seu pedido para cadastro de empreendimento \"%{enterprise}\" em %{environment}"
  533 +"foi recebido. Ele será revisado por um organização validadora"
  534 +"que você escolheu, de acordo com seu métodos e critério.\n"
  535 +"\n"
  536 +"Você será notificado assim que a organização validadora tiver uma"
  537 +"posição sobre seu pedido."
556 538
557 #: app/models/create_enterprise.rb:118 539 #: app/models/create_enterprise.rb:118
558 msgid "" 540 msgid ""
559 "Your request fo registering the enterprise \"%{enterprise}\" was approved. " 541 "Your request fo registering the enterprise \"%{enterprise}\" was approved. "
560 "You can access %{environment} now and start entering " 542 "You can access %{environment} now and start entering "
561 msgstr "" 543 msgstr ""
  544 +"Sua requisição para registrar o empreendimento \"%{enterprise}\" foi aprovada. "
  545 +"Você pode acessar %{environment} agora e acessar as informações"
562 546
563 #: app/models/create_enterprise.rb:122 547 #: app/models/create_enterprise.rb:122
564 msgid "" 548 msgid ""
565 "Your request for registering the enterprise %{enterprise} at %{environment} " 549 "Your request for registering the enterprise %{enterprise} at %{environment} "
566 "was NOT approved by the validator organization." 550 "was NOT approved by the validator organization."
567 msgstr "" 551 msgstr ""
  552 +"Sua requisição para registrar o empreendimento %{enterprise} em %{environment} "
  553 +"NÃO foi aprovada pelo validador de organização"
568 554
569 #: app/models/environment.rb:- 555 #: app/models/environment.rb:-
570 msgid "environment" 556 msgid "environment"
@@ -592,41 +578,46 @@ msgstr &quot;comunidade virtual&quot; @@ -592,41 +578,46 @@ msgstr &quot;comunidade virtual&quot;
592 578
593 #: app/models/environment.rb:- 579 #: app/models/environment.rb:-
594 msgid "Environment|Design data" 580 msgid "Environment|Design data"
595 -msgstr "" 581 +msgstr "Informações de design"
596 582
597 #: app/models/environment.rb:7 583 #: app/models/environment.rb:7
598 #, fuzzy 584 #, fuzzy
599 -msgid "Edit environment features" 585 +msgid "View environment admin panel"
600 msgstr "comunidade virtual" 586 msgstr "comunidade virtual"
601 587
602 #: app/models/environment.rb:8 588 #: app/models/environment.rb:8
603 #, fuzzy 589 #, fuzzy
604 -msgid "Edit environment design" 590 +msgid "Edit environment features"
605 msgstr "comunidade virtual" 591 msgstr "comunidade virtual"
606 592
607 #: app/models/environment.rb:9 593 #: app/models/environment.rb:9
608 #, fuzzy 594 #, fuzzy
  595 +msgid "Edit environment design"
  596 +msgstr "comunidade virtual"
  597 +
  598 +#: app/models/environment.rb:10
  599 +#, fuzzy
609 msgid "Manage environment categories" 600 msgid "Manage environment categories"
610 msgstr "Gerenciar categorias" 601 msgstr "Gerenciar categorias"
611 602
612 -#: app/models/environment.rb:10 603 +#: app/models/environment.rb:11
613 #, fuzzy 604 #, fuzzy
614 msgid "Manage environment roles" 605 msgid "Manage environment roles"
615 msgstr "Gerencias papéis de usuários" 606 msgstr "Gerencias papéis de usuários"
616 607
617 -#: app/models/environment.rb:11 608 +#: app/models/environment.rb:12
618 msgid "Manage environment validators" 609 msgid "Manage environment validators"
619 -msgstr "" 610 +msgstr "Gerenciar ambiente de validadores"
620 611
621 -#: app/models/environment.rb:18 612 +#: app/models/environment.rb:19
622 msgid "Some feature" 613 msgid "Some feature"
623 msgstr "Alguma funcionalidade" 614 msgstr "Alguma funcionalidade"
624 615
625 -#: app/models/environment.rb:19 616 +#: app/models/environment.rb:20
626 msgid "Other feature" 617 msgid "Other feature"
627 msgstr "Outra funcionalidade" 618 msgstr "Outra funcionalidade"
628 619
629 -#: app/models/environment.rb:142 620 +#: app/models/environment.rb:143
630 msgid "Only one Virtual Community can be the default one" 621 msgid "Only one Virtual Community can be the default one"
631 msgstr "Apenas uma comunidade virtual pode ser a padrão" 622 msgstr "Apenas uma comunidade virtual pode ser a padrão"
632 623
@@ -651,7 +642,7 @@ msgstr &quot;categoria&quot; @@ -651,7 +642,7 @@ msgstr &quot;categoria&quot;
651 642
652 #: app/models/category.rb:- 643 #: app/models/category.rb:-
653 msgid "Category|Display color" 644 msgid "Category|Display color"
654 -msgstr "" 645 +msgstr "Mostrar cor"
655 646
656 #: app/models/category.rb:- 647 #: app/models/category.rb:-
657 #, fuzzy 648 #, fuzzy
@@ -682,11 +673,11 @@ msgstr &quot;%{fn} já foi atribuído a outra categoria.&quot; @@ -682,11 +673,11 @@ msgstr &quot;%{fn} já foi atribuído a outra categoria.&quot;
682 673
683 #: app/models/category.rb:13 674 #: app/models/category.rb:13
684 msgid "%{fn} must be the same as the parents'" 675 msgid "%{fn} must be the same as the parents'"
685 -msgstr "" 676 +msgstr "%{fn} tem que ser o mesmo que o dos pais'"
686 677
687 #: app/models/organization.rb:11 app/models/organization.rb:16 678 #: app/models/organization.rb:11 app/models/organization.rb:16
688 msgid "(not informed)" 679 msgid "(not informed)"
689 -msgstr "" 680 +msgstr "(não informado)"
690 681
691 #: app/helpers/categories_helper.rb:6 682 #: app/helpers/categories_helper.rb:6
692 msgid "Do not display at the menu" 683 msgid "Do not display at the menu"
@@ -721,7 +712,7 @@ msgstr &quot;categoria&quot; @@ -721,7 +712,7 @@ msgstr &quot;categoria&quot;
721 712
722 #: app/helpers/categories_helper.rb:16 713 #: app/helpers/categories_helper.rb:16
723 msgid "Region" 714 msgid "Region"
724 -msgstr "" 715 +msgstr "Região"
725 716
726 #: app/helpers/categories_helper.rb:21 717 #: app/helpers/categories_helper.rb:21
727 msgid "Display at the menu?" 718 msgid "Display at the menu?"
@@ -738,11 +729,11 @@ msgstr &quot;Este perfil não tem nenhuma informação pública&quot; @@ -738,11 +729,11 @@ msgstr &quot;Este perfil não tem nenhuma informação pública&quot;
738 729
739 #: app/helpers/features_helper.rb:4 730 #: app/helpers/features_helper.rb:4
740 msgid "Administrator must approve all new organizations" 731 msgid "Administrator must approve all new organizations"
741 -msgstr "" 732 +msgstr "Administrador tem que aprovar todas as novas organizações"
742 733
743 #: app/helpers/features_helper.rb:5 734 #: app/helpers/features_helper.rb:5
744 msgid "Administrator assigns validator organizations per region." 735 msgid "Administrator assigns validator organizations per region."
745 -msgstr "" 736 +msgstr "Administrador atribui organizações validadoras por região."
746 737
747 #: app/helpers/application_helper.rb:60 738 #: app/helpers/application_helper.rb:60
748 msgid "Help" 739 msgid "Help"
@@ -829,7 +820,7 @@ msgstr &quot;Editar informações do empreendimento&quot; @@ -829,7 +820,7 @@ msgstr &quot;Editar informações do empreendimento&quot;
829 820
830 #: app/helpers/application_helper.rb:194 821 #: app/helpers/application_helper.rb:194
831 msgid "Exclude" 822 msgid "Exclude"
832 -msgstr "" 823 +msgstr "Excluir"
833 824
834 #: app/helpers/application_helper.rb:200 825 #: app/helpers/application_helper.rb:200
835 #: app/views/account/new_password.rhtml:13 826 #: app/views/account/new_password.rhtml:13
@@ -840,7 +831,7 @@ msgstr &quot;Alterar senha&quot; @@ -840,7 +831,7 @@ msgstr &quot;Alterar senha&quot;
840 831
841 #: app/helpers/application_helper.rb:206 832 #: app/helpers/application_helper.rb:206
842 msgid "Report bug" 833 msgid "Report bug"
843 -msgstr "" 834 +msgstr "Reportar bug"
844 835
845 #: app/helpers/application_helper.rb:212 836 #: app/helpers/application_helper.rb:212
846 #, fuzzy 837 #, fuzzy
@@ -849,34 +840,41 @@ msgstr &quot;Alterar senha&quot; @@ -849,34 +840,41 @@ msgstr &quot;Alterar senha&quot;
849 840
850 #: app/helpers/application_helper.rb:213 841 #: app/helpers/application_helper.rb:213
851 msgid "Change block theme" 842 msgid "Change block theme"
852 -msgstr "" 843 +msgstr "Mude o tema de bloco"
853 844
854 #: app/helpers/application_helper.rb:214 845 #: app/helpers/application_helper.rb:214
855 #, fuzzy 846 #, fuzzy
856 msgid "Change icon theme" 847 msgid "Change icon theme"
857 msgstr "Gerenciar conteúdo." 848 msgstr "Gerenciar conteúdo."
858 849
859 -#: app/helpers/application_helper.rb:247 app/helpers/application_helper.rb:250 850 +#: app/helpers/application_helper.rb:252 app/helpers/application_helper.rb:255
860 msgid "Accessibility" 851 msgid "Accessibility"
861 -msgstr "" 852 +msgstr "Acessibilidade"
862 853
863 -#: app/helpers/application_helper.rb:257 854 +#: app/helpers/application_helper.rb:260 app/helpers/application_helper.rb:261
  855 +#: app/views/region_validators/region.rhtml:22
  856 +#: app/views/manage_tags/_search_box.rhtml:4
  857 +#: app/views/membership_editor/index.rhtml:4
  858 +msgid "Search"
  859 +msgstr "Busca"
  860 +
  861 +#: app/helpers/application_helper.rb:271
864 msgid "%s, version %s" 862 msgid "%s, version %s"
865 msgstr "%s, versão %s" 863 msgstr "%s, versão %s"
866 864
867 -#: app/helpers/application_helper.rb:327 865 +#: app/helpers/application_helper.rb:341
868 msgid "No Filter at all" 866 msgid "No Filter at all"
869 msgstr "Sem qualquer filtro" 867 msgstr "Sem qualquer filtro"
870 868
871 -#: app/helpers/application_helper.rb:328 869 +#: app/helpers/application_helper.rb:342
872 msgid "RDoc filter" 870 msgid "RDoc filter"
873 msgstr "Filtro RDoc" 871 msgstr "Filtro RDoc"
874 872
875 -#: app/helpers/application_helper.rb:329 873 +#: app/helpers/application_helper.rb:343
876 msgid "Simple" 874 msgid "Simple"
877 msgstr "Simples" 875 msgstr "Simples"
878 876
879 -#: app/helpers/application_helper.rb:330 877 +#: app/helpers/application_helper.rb:344
880 msgid "Textile" 878 msgid "Textile"
881 msgstr "Textile" 879 msgstr "Textile"
882 880
@@ -928,73 +926,73 @@ msgstr &quot;Excluir página &#39;%s&#39; e todos seus filhos&quot; @@ -928,73 +926,73 @@ msgstr &quot;Excluir página &#39;%s&#39; e todos seus filhos&quot;
928 msgid "DRAG" 926 msgid "DRAG"
929 msgstr "ARRASTE" 927 msgstr "ARRASTE"
930 928
931 -#: app/views/cms/_form.rhtml:6 929 +#: app/views/cms/_form.rhtml:9
932 msgid "Title" 930 msgid "Title"
933 msgstr "Título" 931 msgstr "Título"
934 932
935 -#: app/views/cms/_form.rhtml:7 933 +#: app/views/cms/_form.rhtml:10
936 msgid "More..." 934 msgid "More..."
937 msgstr "Mais..." 935 msgstr "Mais..."
938 936
939 -#: app/views/cms/_form.rhtml:7 937 +#: app/views/cms/_form.rhtml:10
940 msgid "Less..." 938 msgid "Less..."
941 msgstr "Menos..." 939 msgstr "Menos..."
942 940
943 -#: app/views/cms/_form.rhtml:11 941 +#: app/views/cms/_form.rhtml:14
944 msgid "Slug" 942 msgid "Slug"
945 msgstr "Atalho" 943 msgstr "Atalho"
946 944
947 -#: app/views/cms/_form.rhtml:17 945 +#: app/views/cms/_form.rhtml:20
948 msgid "Keywords" 946 msgid "Keywords"
949 msgstr "Palvras-chave" 947 msgstr "Palvras-chave"
950 948
951 -#: app/views/cms/_form.rhtml:24 949 +#: app/views/cms/_form.rhtml:27
952 msgid "Parent" 950 msgid "Parent"
953 msgstr "Pai" 951 msgstr "Pai"
954 952
955 -#: app/views/cms/_form.rhtml:26 953 +#: app/views/cms/_form.rhtml:29
956 msgid "%s is a root page" 954 msgid "%s is a root page"
957 msgstr "%s é uma página raiz" 955 msgstr "%s é uma página raiz"
958 956
959 -#: app/views/cms/_form.rhtml:34 957 +#: app/views/cms/_form.rhtml:37
960 msgid "Content" 958 msgid "Content"
961 msgstr "Conteúdo" 959 msgstr "Conteúdo"
962 960
963 -#: app/views/cms/_form.rhtml:40 961 +#: app/views/cms/_form.rhtml:43
964 msgid "Filter" 962 msgid "Filter"
965 msgstr "Filtro" 963 msgstr "Filtro"
966 964
967 -#: app/views/cms/_form.rhtml:42 965 +#: app/views/cms/_form.rhtml:45
968 msgid "Converts plain text into HTML" 966 msgid "Converts plain text into HTML"
969 msgstr "Converte texto plano em HTML" 967 msgstr "Converte texto plano em HTML"
970 968
971 -#: app/views/cms/_form.rhtml:48 969 +#: app/views/cms/_form.rhtml:51
972 msgid "Created" 970 msgid "Created"
973 msgstr "Criado" 971 msgstr "Criado"
974 972
975 -#: app/views/cms/_form.rhtml:57 973 +#: app/views/cms/_form.rhtml:60
976 msgid "One revision" 974 msgid "One revision"
977 msgid_plural "%d revisions" 975 msgid_plural "%d revisions"
978 msgstr[0] "Uma revisão" 976 msgstr[0] "Uma revisão"
979 msgstr[1] "%d revisões" 977 msgstr[1] "%d revisões"
980 978
981 -#: app/views/cms/_form.rhtml:63 979 +#: app/views/cms/_form.rhtml:66
982 msgid "Loading preview ..." 980 msgid "Loading preview ..."
983 msgstr "Carregando pré-visualização ..." 981 msgstr "Carregando pré-visualização ..."
984 982
985 -#: app/views/cms/_form.rhtml:64 983 +#: app/views/cms/_form.rhtml:67
986 msgid "Save Changes" 984 msgid "Save Changes"
987 msgstr "Salvar Mudanças" 985 msgstr "Salvar Mudanças"
988 986
989 -#: app/views/cms/_form.rhtml:64 987 +#: app/views/cms/_form.rhtml:67
990 msgid "Create Page" 988 msgid "Create Page"
991 msgstr "Criar Página" 989 msgstr "Criar Página"
992 990
993 -#: app/views/cms/_form.rhtml:66 991 +#: app/views/cms/_form.rhtml:69
994 msgid "Revert" 992 msgid "Revert"
995 msgstr "Reverter" 993 msgstr "Reverter"
996 994
997 -#: app/views/cms/_form.rhtml:69 995 +#: app/views/cms/_form.rhtml:72
998 msgid "" 996 msgid ""
999 "Changes detected. You will lose all the updates you have made if you " 997 "Changes detected. You will lose all the updates you have made if you "
1000 "proceed..." 998 "proceed..."
@@ -1002,7 +1000,7 @@ msgstr &quot;&quot; @@ -1002,7 +1000,7 @@ msgstr &quot;&quot;
1002 "Mudanças detectadas. Você vai perder todas as atualizações que você fez se " 1000 "Mudanças detectadas. Você vai perder todas as atualizações que você fez se "
1003 "continuar..." 1001 "continuar..."
1004 1002
1005 -#: app/views/cms/_form.rhtml:69 app/views/cms/delete.rhtml:16 1003 +#: app/views/cms/_form.rhtml:72 app/views/cms/delete.rhtml:16
1006 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13 1004 #: app/views/cms/versions.rhtml:25 app/views/role/_form.rhtml:13
1007 #: app/views/profile_members/change_role.rhtml:12 1005 #: app/views/profile_members/change_role.rhtml:12
1008 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6 1006 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
@@ -1014,23 +1012,23 @@ msgstr &quot;&quot; @@ -1014,23 +1012,23 @@ msgstr &quot;&quot;
1014 msgid "Cancel" 1012 msgid "Cancel"
1015 msgstr "Cancelar" 1013 msgstr "Cancelar"
1016 1014
1017 -#: app/views/cms/_form.rhtml:75 1015 +#: app/views/cms/_form.rhtml:78
1018 msgid "Page Preview" 1016 msgid "Page Preview"
1019 msgstr "Pré-visualização da página" 1017 msgstr "Pré-visualização da página"
1020 1018
1021 -#: app/views/cms/_form.rhtml:77 1019 +#: app/views/cms/_form.rhtml:80
1022 msgid "Loading Preview..." 1020 msgid "Loading Preview..."
1023 msgstr "Carregando Pré-visualzação..." 1021 msgstr "Carregando Pré-visualzação..."
1024 1022
1025 -#: app/views/cms/_form.rhtml:82 1023 +#: app/views/cms/_form.rhtml:85
1026 msgid "Close Preview" 1024 msgid "Close Preview"
1027 msgstr "Fechar Pré-visualzação" 1025 msgstr "Fechar Pré-visualzação"
1028 1026
1029 -#: app/views/cms/_form.rhtml:82 app/views/cms/versions.rhtml:24 1027 +#: app/views/cms/_form.rhtml:85 app/views/cms/versions.rhtml:24
1030 msgid "or" 1028 msgid "or"
1031 msgstr "ou" 1029 msgstr "ou"
1032 1030
1033 -#: app/views/cms/_form.rhtml:82 1031 +#: app/views/cms/_form.rhtml:85
1034 msgid "Back to top" 1032 msgid "Back to top"
1035 msgstr "Voltar ao topo" 1033 msgstr "Voltar ao topo"
1036 1034
@@ -1098,7 +1096,7 @@ msgstr &quot;Tornar versão atual&quot; @@ -1098,7 +1096,7 @@ msgstr &quot;Tornar versão atual&quot;
1098 msgid "Current Version" 1096 msgid "Current Version"
1099 msgstr "Versão Atual" 1097 msgstr "Versão Atual"
1100 1098
1101 -#: app/views/cms/edit.rhtml:2 1099 +#: app/views/cms/edit.rhtml:20
1102 msgid "Edit Page" 1100 msgid "Edit Page"
1103 msgstr "Editar Página" 1101 msgstr "Editar Página"
1104 1102
@@ -1152,8 +1150,9 @@ msgstr &quot;Voltar&quot; @@ -1152,8 +1150,9 @@ msgstr &quot;Voltar&quot;
1152 msgid "New role" 1150 msgid "New role"
1153 msgstr "Novo papel" 1151 msgstr "Novo papel"
1154 1152
1155 -#: app/views/role/index.rhtml:6 app/views/manage_tags/_a_tag.rhtml:3  
1156 -#: app/views/profile_editor/index.rhtml:5 1153 +#: app/views/role/index.rhtml:6 app/views/content_viewer/view_page.rhtml:7
  1154 +#: app/views/manage_tags/_a_tag.rhtml:3 app/views/profile_editor/index.rhtml:6
  1155 +#: app/views/profile_editor/index.rhtml:8
1157 #: app/views/categories/_category.rhtml:8 1156 #: app/views/categories/_category.rhtml:8
1158 msgid "Edit" 1157 msgid "Edit"
1159 msgstr "Editar" 1158 msgstr "Editar"
@@ -1200,7 +1199,7 @@ msgstr &quot;Remover membro&quot; @@ -1200,7 +1199,7 @@ msgstr &quot;Remover membro&quot;
1200 #: app/views/task_mailer/task_finished.text.plain.rhtml:1 1199 #: app/views/task_mailer/task_finished.text.plain.rhtml:1
1201 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1 1200 #: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
1202 msgid "Dear %s," 1201 msgid "Dear %s,"
1203 -msgstr "" 1202 +msgstr "Caro %s,"
1204 1203
1205 #: app/views/task_mailer/task_created.text.plain.rhtml:6 1204 #: app/views/task_mailer/task_created.text.plain.rhtml:6
1206 #: app/views/task_mailer/task_finished.text.plain.rhtml:6 1205 #: app/views/task_mailer/task_finished.text.plain.rhtml:6
@@ -1211,7 +1210,7 @@ msgstr &quot;comunidade virtual&quot; @@ -1211,7 +1210,7 @@ msgstr &quot;comunidade virtual&quot;
1211 1210
1212 #: app/views/region_validators/_search.rhtml:8 1211 #: app/views/region_validators/_search.rhtml:8
1213 msgid "Adicionar" 1212 msgid "Adicionar"
1214 -msgstr "" 1213 +msgstr "Adicionar"
1215 1214
1216 #: app/views/region_validators/region.rhtml:1 1215 #: app/views/region_validators/region.rhtml:1
1217 msgid "Validators for region %s" 1216 msgid "Validators for region %s"
@@ -1236,14 +1235,6 @@ msgid &quot;&quot; @@ -1236,14 +1235,6 @@ msgid &quot;&quot;
1236 "result to add them as validators for this region. " 1235 "result to add them as validators for this region. "
1237 msgstr "" 1236 msgstr ""
1238 1237
1239 -#: app/views/region_validators/region.rhtml:22  
1240 -#: app/views/layouts/application.rhtml:82  
1241 -#: app/views/layouts/comatose_admin.rhtml:82  
1242 -#: app/views/manage_tags/_search_box.rhtml:4  
1243 -#: app/views/membership_editor/index.rhtml:4  
1244 -msgid "Search"  
1245 -msgstr "Busca"  
1246 -  
1247 #: app/views/region_validators/_region.rhtml:5 1238 #: app/views/region_validators/_region.rhtml:5
1248 msgid "1 validator" 1239 msgid "1 validator"
1249 msgid_plural "%{num} validators." 1240 msgid_plural "%{num} validators."
@@ -1263,16 +1254,11 @@ msgstr &quot;Acima&quot; @@ -1263,16 +1254,11 @@ msgstr &quot;Acima&quot;
1263 msgid "There is no such page: %s" 1254 msgid "There is no such page: %s"
1264 msgstr "Não há página: %s" 1255 msgstr "Não há página: %s"
1265 1256
1266 -#: app/views/layouts/application.rhtml:60  
1267 -#: app/views/layouts/comatose_admin.rhtml:60 1257 +#: app/views/layouts/application.rhtml:21
  1258 +#: app/views/layouts/comatose_admin.rhtml:21
1268 msgid "Image for Loading..." 1259 msgid "Image for Loading..."
1269 msgstr "Imagem para Carregamento..." 1260 msgstr "Imagem para Carregamento..."
1270 1261
1271 -#: app/views/layouts/application.rhtml:81  
1272 -#: app/views/layouts/comatose_admin.rhtml:81  
1273 -msgid "Your search here ..."  
1274 -msgstr ""  
1275 -  
1276 #: app/views/enterprise_editor/_form.rhtml:1 1262 #: app/views/enterprise_editor/_form.rhtml:1
1277 #: app/views/manage_tags/_form.rhtml:1 1263 #: app/views/manage_tags/_form.rhtml:1
1278 #: app/views/membership_editor/_form.rhtml:1 1264 #: app/views/membership_editor/_form.rhtml:1
@@ -1746,6 +1732,15 @@ msgstr &quot;&quot; @@ -1746,6 +1732,15 @@ msgstr &quot;&quot;
1746 "É sempre uma boa idéia fazer logout quando você terminar de usar a " 1732 "É sempre uma boa idéia fazer logout quando você terminar de usar a "
1747 "comunidade virtual." 1733 "comunidade virtual."
1748 1734
  1735 +#: app/views/search/index.rhtml:1
  1736 +msgid "Listing articles found"
  1737 +msgstr ""
  1738 +
  1739 +#: app/views/search/index.rhtml:3
  1740 +#, fuzzy
  1741 +msgid "Searching for "
  1742 +msgstr "Busca"
  1743 +
1749 #: app/views/features/_features_table.rhtml:12 1744 #: app/views/features/_features_table.rhtml:12
1750 #, fuzzy 1745 #, fuzzy
1751 msgid "Organization Approval Method" 1746 msgid "Organization Approval Method"
@@ -1798,16 +1793,16 @@ msgstr &quot;Salvar&quot; @@ -1798,16 +1793,16 @@ msgstr &quot;Salvar&quot;
1798 msgid "My profile" 1793 msgid "My profile"
1799 msgstr "Meu perfil" 1794 msgstr "Meu perfil"
1800 1795
1801 -#: app/views/profile_editor/index.rhtml:7 1796 +#: app/views/profile_editor/index.rhtml:13
1802 #, fuzzy 1797 #, fuzzy
1803 msgid "Edit Visual Design" 1798 msgid "Edit Visual Design"
1804 msgstr "Editar o design visual" 1799 msgstr "Editar o design visual"
1805 1800
1806 -#: app/views/profile_editor/index.rhtml:9 1801 +#: app/views/profile_editor/index.rhtml:15
1807 msgid "Menage content" 1802 msgid "Menage content"
1808 msgstr "Gerenciar conteúdo" 1803 msgstr "Gerenciar conteúdo"
1809 1804
1810 -#: app/views/profile_editor/index.rhtml:12 1805 +#: app/views/profile_editor/index.rhtml:18
1811 msgid "Edit enterprise info" 1806 msgid "Edit enterprise info"
1812 msgstr "Editar informação de empreendimento" 1807 msgstr "Editar informação de empreendimento"
1813 1808
script/reset_db
@@ -4,5 +4,5 @@ require File.dirname(__FILE__) + &#39;/../config/environment&#39; @@ -4,5 +4,5 @@ require File.dirname(__FILE__) + &#39;/../config/environment&#39;
4 system "rm #{RAILS_ROOT}/tmp/*.db" 4 system "rm #{RAILS_ROOT}/tmp/*.db"
5 system "rake db:migrate VERSION=0" 5 system "rake db:migrate VERSION=0"
6 system "rake db:migrate" 6 system "rake db:migrate"
7 -system "ruby #{RAILS_ROOT}/script/populate" 7 +system "ruby #{RAILS_ROOT}/script/anhetegua"
8 system "rake db:test:prepare" 8 system "rake db:test:prepare"
test/functional/content_viewer_controller_test.rb
@@ -18,24 +18,26 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase @@ -18,24 +18,26 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
18 uses_host 'anhetegua.net' 18 uses_host 'anhetegua.net'
19 19
20 a = Article.new 20 a = Article.new
21 - Article.expects(:find_by_path).with('aprofile').returns(a) 21 + Article.expects(:find_by_path).with('ze').returns(a)
22 22
23 - get :view_page, :profile => 'aprofile', :page => [] 23 + get :view_page, :profile => 'ze', :page => []
24 assert_response :success 24 assert_response :success
25 assert_equal a, assigns(:page) 25 assert_equal a, assigns(:page)
26 end 26 end
27 27
28 def test_should_get_not_found_error_for_unexisting_page 28 def test_should_get_not_found_error_for_unexisting_page
29 uses_host 'anhetegua.net' 29 uses_host 'anhetegua.net'
30 - get :view_page, :profile => 'ze', :page => ['some_unexisting_page']  
31 - assert_response 404 30 + get :view_page, :profile => 'aprofile', :page => ['some_unexisting_page']
  31 + assert_response :redirect
  32 + assert_redirected_to :controller => 'search', :action => 'index'
32 end 33 end
33 34
34 def test_should_get_not_found_error_for_unexisting_profile 35 def test_should_get_not_found_error_for_unexisting_profile
35 Profile.delete_all 36 Profile.delete_all
36 uses_host 'anhetegua' 37 uses_host 'anhetegua'
37 get :view_page, :profile => 'some_unexisting_profile', :page => [] 38 get :view_page, :profile => 'some_unexisting_profile', :page => []
38 - assert_response 404 39 + assert_response :redirect
  40 + assert_redirected_to :controller => 'search', :action => 'index'
39 end 41 end
40 42
41 end 43 end
test/test_helper.rb
@@ -48,6 +48,21 @@ class Test::Unit::TestCase @@ -48,6 +48,21 @@ class Test::Unit::TestCase
48 48
49 end 49 end
50 50
  51 + def self.extra_parameters
  52 + @extra_parameters
  53 + end
  54 +
  55 + def self.add_extra_parameter(name, value)
  56 + @extra_parameters ||= {}
  57 + @extra_parameters[name] = value.to_s
  58 + self.send(:include, NoosferoTest) unless self.include?(NoosferoTest)
  59 + end
  60 +
  61 + def self.under_profile(profile_identifier)
  62 + add_extra_parameter(:profile, profile_identifier)
  63 + raise "profile_identifier must be set!" unless extra_parameters[:profile]
  64 + end
  65 +
51 private 66 private
52 67
53 def uses_host(name) 68 def uses_host(name)