Commit 807a5056bc519e5823144d52d41987fac9c047ba

Authored by MoisesMachado
1 parent ccaebce2

ActionItem111: search is now functional


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@730 3f533792-8f58-4932-b0fe-aaf55b0a4547
app/controllers/public/search_controller.rb 0 → 100644
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +class SearchController < ApplicationController
  2 + def index
  3 + @query = params[:query]
  4 + @results = Article.find_tagged_with(@query) + Article.find_by_contents(@query)
  5 + end
  6 +end
app/helpers/application_helper.rb
@@ -208,7 +208,7 @@ module ApplicationHelper @@ -208,7 +208,7 @@ module ApplicationHelper
208 end 208 end
209 209
210 def design_links 210 def design_links
211 - links = [ 211 + links = desig[
212 [(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')], 212 [(link_to _('Change template'), :controller => 'profile_editor', :action => 'design_editor_change_template')],
213 [(link_to _('Change block theme'), :controller => 'profile_editor', :action => 'design_editor_change_theme')], 213 [(link_to _('Change block theme'), :controller => 'profile_editor', :action => 'design_editor_change_theme')],
214 [(link_to _('Change icon theme'), :controller => 'profile_editor', :action => 'design_editor_change_icon_theme')], 214 [(link_to _('Change icon theme'), :controller => 'profile_editor', :action => 'design_editor_change_icon_theme')],
@@ -245,6 +245,9 @@ module ApplicationHelper @@ -245,6 +245,9 @@ module ApplicationHelper
245 end.map{|l| link_if_permitted(l[0], l[1], l[2]) } 245 end.map{|l| link_if_permitted(l[0], l[1], l[2]) }
246 end 246 end
247 247
  248 +# def user_options
  249 +# end
  250 +
248 def accessibility_link 251 def accessibility_link
249 doc = Article.find_all_by_title(_('Accessibility')).select do |a| 252 doc = Article.find_all_by_title(_('Accessibility')).select do |a|
250 a.full_path.split(/\//).shift == 'noosfero' 253 a.full_path.split(/\//).shift == 'noosfero'
@@ -252,6 +255,15 @@ module ApplicationHelper @@ -252,6 +255,15 @@ module ApplicationHelper
252 link_to_document doc, _('Accessibility') if doc 255 link_to_document doc, _('Accessibility') if doc
253 end 256 end
254 257
  258 + def search_box
  259 + [form_tag( '/search'),
  260 + text_field_tag( 'query', _(''), :id => "input_search"),
  261 + submit_tag(_('Search'), :id => 'button_search'),
  262 + '</form>',
  263 + observe_field('input_search', :function => '', :on => :click)
  264 + ].join("\n")
  265 + end
  266 +
255 def footer 267 def footer
256 # FIXME: add some information from the environment 268 # FIXME: add some information from the environment
257 [ 269 [
app/helpers/search_helper.rb 0 → 100644
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +module SearchHelper
  2 +end
app/models/article.rb
1 class Article < Comatose::Page 1 class Article < Comatose::Page
2 acts_as_taggable 2 acts_as_taggable
3 3
  4 + acts_as_ferret :fields => [:title, :body]
4 def keywords 5 def keywords
5 tag_list.to_s 6 tag_list.to_s
6 end 7 end
app/views/layouts/application.rhtml
@@ -77,10 +77,7 @@ @@ -77,10 +77,7 @@
77 </div> 77 </div>
78 </div> 78 </div>
79 <div id='search_box'> 79 <div id='search_box'>
80 - <form id='search_box_form' action="" method="GET">  
81 - <input id="input_search" type='text' name='q' value='<%= _('Your search here ...')%>'>  
82 - <input id="button_search" type='submit' value='<%= _('Search')%>'>  
83 - </form> 80 + <%= search_box %>
84 </div><!-- id='search_box' --> 81 </div><!-- id='search_box' -->
85 82
86 <div id='navigation_bar' class='category<%= category_color %>'> 83 <div id='navigation_bar' class='category<%= category_color %>'>
app/views/search/index.rhtml 0 → 100644
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +<h2> <%= _('Listing articles found') %> </h2>
  2 +
  3 +<h4> <%= _('Searching for ') + @query %></h4>
  4 +<% @results.each do |a| %>
  5 + <h4> <%= link_to_document(a) %> </h4>
  6 +<% end %>
config/routes.rb
@@ -26,6 +26,9 @@ ActionController::Routing::Routes.draw do |map| @@ -26,6 +26,9 @@ ActionController::Routing::Routes.draw do |map|
26 # enterprise registration 26 # enterprise registration
27 map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration' 27 map.connect 'enterprise_registration/:action', :controller => 'enterprise_registration'
28 28
  29 + # search
  30 + map.connect 'search', :controller => 'search'
  31 +
29 ###################################################### 32 ######################################################
30 ## Controllers that are profile-specific (for profile admins ) 33 ## Controllers that are profile-specific (for profile admins )
31 ###################################################### 34 ######################################################
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-01 14:46-0300\n" 10 +"POT-Creation-Date: 2007-10-19 13:30-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,6 +17,7 @@ msgstr &quot;&quot; @@ -17,6 +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 msgid "Main content block" 21 msgid "Main content block"
21 msgstr "" 22 msgstr ""
22 23
@@ -45,60 +46,155 @@ msgstr &quot;&quot; @@ -45,60 +46,155 @@ msgstr &quot;&quot;
45 msgid "Failed to edit role" 46 msgid "Failed to edit role"
46 msgstr "" 47 msgstr ""
47 48
48 -#: app/controllers/environment_admin/features_controller.rb:18 49 +#: app/controllers/environment_admin/features_controller.rb:12
49 msgid "Features updated successfully." 50 msgid "Features updated successfully."
50 msgstr "" 51 msgstr ""
51 52
52 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:23 53 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:15
  54 +#: app/controllers/profile_admin/profile_members_controller.rb:16
  55 +msgid "Roles successfuly updated"
  56 +msgstr ""
  57 +
  58 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:17
  59 +#: app/controllers/profile_admin/profile_members_controller.rb:18
  60 +msgid "Couldn't change the roles"
  61 +msgstr ""
  62 +
  63 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:46
  64 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:56
  65 +msgid "Member succefully unassociated"
  66 +msgstr ""
  67 +
  68 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:48
  69 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:58
  70 +msgid "Failed to unassociate member"
  71 +msgstr ""
  72 +
  73 +#: app/controllers/profile_admin_controller.rb:15
  74 +msgid "This action is not available for \"%s\"."
  75 +msgstr ""
  76 +
  77 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:25
53 msgid "Could not update the enterprise" 78 msgid "Could not update the enterprise"
54 msgstr "" 79 msgstr ""
55 80
56 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:32 81 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:34
57 msgid "Enterprise sucessfully erased from the system" 82 msgid "Enterprise sucessfully erased from the system"
58 msgstr "" 83 msgstr ""
59 84
60 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:39 85 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:41
61 msgid "Enterprise successfuly activacted" 86 msgid "Enterprise successfuly activacted"
62 msgstr "" 87 msgstr ""
63 88
64 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:41 89 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:43
65 msgid "Failed to activate the enterprise" 90 msgid "Failed to activate the enterprise"
66 msgstr "" 91 msgstr ""
67 92
68 -#: app/controllers/profile_admin/membership_editor_controller.rb:20 93 +#: app/controllers/profile_admin/membership_editor_controller.rb:21
69 msgid "" 94 msgid ""
70 "The enterprise was successfully created, the validation entity will cotact " 95 "The enterprise was successfully created, the validation entity will cotact "
71 "you as soon as your enterprise is approved" 96 "you as soon as your enterprise is approved"
72 msgstr "" 97 msgstr ""
73 98
74 -#: app/controllers/profile_admin/membership_editor_controller.rb:23 99 +#: app/controllers/profile_admin/membership_editor_controller.rb:24
75 msgid "Enterprise was not created" 100 msgid "Enterprise was not created"
76 msgstr "" 101 msgstr ""
77 102
78 -#: app/controllers/public/account_controller.rb:20 103 +#: app/controllers/profile_admin/profile_editor_controller.rb:8
  104 +msgid "List Block"
  105 +msgstr ""
  106 +
  107 +#: app/controllers/profile_admin/profile_editor_controller.rb:9
  108 +msgid "Link Block"
  109 +msgstr ""
  110 +
  111 +#: app/controllers/profile_admin/profile_editor_controller.rb:11
  112 +msgid "Recent documents block"
  113 +msgstr ""
  114 +
  115 +#: app/controllers/public/account_controller.rb:21
79 msgid "Logged in successfully" 116 msgid "Logged in successfully"
80 msgstr "" 117 msgstr ""
81 118
82 -#: app/controllers/public/account_controller.rb:22 119 +#: app/controllers/public/account_controller.rb:23
83 msgid "Incorrect username or password" 120 msgid "Incorrect username or password"
84 msgstr "" 121 msgstr ""
85 122
86 -#: app/controllers/public/account_controller.rb:39 123 +#: app/controllers/public/account_controller.rb:40
87 msgid "Thanks for signing up!" 124 msgid "Thanks for signing up!"
88 msgstr "" 125 msgstr ""
89 126
90 -#: app/controllers/public/account_controller.rb:51 127 +#: app/controllers/public/account_controller.rb:52
91 msgid "You have been logged out." 128 msgid "You have been logged out."
92 msgstr "" 129 msgstr ""
93 130
94 -#: app/controllers/public/account_controller.rb:62 131 +#: app/controllers/public/account_controller.rb:63
95 msgid "Your password has been changed successfully!" 132 msgid "Your password has been changed successfully!"
96 msgstr "" 133 msgstr ""
97 134
98 -#: app/controllers/public/account_controller.rb:65 135 +#: app/controllers/public/account_controller.rb:66
99 msgid "The supplied current password is incorrect." 136 msgid "The supplied current password is incorrect."
100 msgstr "" 137 msgstr ""
101 138
  139 +#: app/models/validation_info.rb:-
  140 +msgid "validation info"
  141 +msgstr ""
  142 +
  143 +#: app/models/validation_info.rb:-
  144 +msgid "ValidationInfo|Validation methodology"
  145 +msgstr ""
  146 +
  147 +#: app/models/validation_info.rb:-
  148 +msgid "ValidationInfo|Restrictions"
  149 +msgstr ""
  150 +
  151 +#: app/models/validation_info.rb:-
  152 +msgid "ValidationInfo|Organization"
  153 +msgstr ""
  154 +
  155 +#: app/models/change_password.rb:13
  156 +msgid "ChangePassword|Login"
  157 +msgstr ""
  158 +
  159 +#: app/models/change_password.rb:14
  160 +msgid "ChangePassword|Email"
  161 +msgstr ""
  162 +
  163 +#: app/models/change_password.rb:15
  164 +msgid "ChangePassword|Password"
  165 +msgstr ""
  166 +
  167 +#: app/models/change_password.rb:16
  168 +msgid "ChangePassword|Password Confirmation"
  169 +msgstr ""
  170 +
  171 +#: app/models/change_password.rb:31
  172 +msgid "%{fn} is not a valid username."
  173 +msgstr ""
  174 +
  175 +#: app/models/change_password.rb:34
  176 +msgid "%{fn} is invalid."
  177 +msgstr ""
  178 +
  179 +#: app/models/change_password.rb:65
  180 +msgid "Your password change request was cancelled at %s."
  181 +msgstr ""
  182 +
  183 +#: app/models/change_password.rb:69
  184 +msgid "Your password was changed successfully."
  185 +msgstr ""
  186 +
  187 +#: app/models/change_password.rb:78
  188 +msgid ""
  189 +"In order to change your password, please visit the following address:\n"
  190 +"\n"
  191 +"%s"
  192 +msgstr ""
  193 +
  194 +#: app/models/change_password.rb:83
  195 +msgid "Password change request"
  196 +msgstr ""
  197 +
102 #: app/models/profile.rb:- 198 #: app/models/profile.rb:-
103 msgid "profile" 199 msgid "profile"
104 msgstr "" 200 msgstr ""
@@ -120,15 +216,7 @@ msgid &quot;Profile|Environment&quot; @@ -120,15 +216,7 @@ msgid &quot;Profile|Environment&quot;
120 msgstr "" 216 msgstr ""
121 217
122 #: app/models/profile.rb:- 218 #: app/models/profile.rb:-
123 -msgid "Profile|Flexible template template"  
124 -msgstr ""  
125 -  
126 -#: app/models/profile.rb:-  
127 -msgid "Profile|Flexible template theme"  
128 -msgstr ""  
129 -  
130 -#: app/models/profile.rb:-  
131 -msgid "Profile|Flexible template icon theme" 219 +msgid "Profile|Design data"
132 msgstr "" 220 msgstr ""
133 221
134 #: app/models/profile.rb:- 222 #: app/models/profile.rb:-
@@ -148,14 +236,30 @@ msgid &quot;Profile|User&quot; @@ -148,14 +236,30 @@ msgid &quot;Profile|User&quot;
148 msgstr "" 236 msgstr ""
149 237
150 #: app/models/profile.rb:- 238 #: app/models/profile.rb:-
151 -msgid "Profile|Validation entity" 239 +msgid "Profile|Region"
152 msgstr "" 240 msgstr ""
153 241
154 -#: app/models/profile.rb:-  
155 -msgid "Profile|Approved" 242 +#: app/models/profile.rb:7 app/helpers/application_helper.rb:183
  243 +msgid "Edit profile"
  244 +msgstr ""
  245 +
  246 +#: app/models/profile.rb:8
  247 +msgid "Destroy profile"
  248 +msgstr ""
  249 +
  250 +#: app/models/profile.rb:9
  251 +msgid "Manage memberships"
  252 +msgstr ""
  253 +
  254 +#: app/models/profile.rb:10
  255 +msgid "Post content"
  256 +msgstr ""
  257 +
  258 +#: app/models/profile.rb:11
  259 +msgid "Edit profile design"
156 msgstr "" 260 msgstr ""
157 261
158 -#: app/models/profile.rb:46 262 +#: app/models/profile.rb:62
159 msgid "An existing profile cannot be renamed." 263 msgid "An existing profile cannot be renamed."
160 msgstr "" 264 msgstr ""
161 265
@@ -195,32 +299,48 @@ msgstr &quot;&quot; @@ -195,32 +299,48 @@ msgstr &quot;&quot;
195 msgid "OrganizationInfo|Validated" 299 msgid "OrganizationInfo|Validated"
196 msgstr "" 300 msgstr ""
197 301
198 -#: app/models/role.rb:-  
199 -msgid "role" 302 +#: app/models/task.rb:-
  303 +msgid "task"
200 msgstr "" 304 msgstr ""
201 305
202 -#: app/models/role.rb:-  
203 -msgid "Role|Name" 306 +#: app/models/task.rb:-
  307 +msgid "Task|Data"
204 msgstr "" 308 msgstr ""
205 309
206 -#: app/models/role.rb:-  
207 -msgid "Role|Permissions" 310 +#: app/models/task.rb:-
  311 +msgid "Task|Status"
208 msgstr "" 312 msgstr ""
209 313
210 -#: app/models/role.rb:5  
211 -msgid "Edit profile" 314 +#: app/models/task.rb:-
  315 +msgid "Task|End date"
212 msgstr "" 316 msgstr ""
213 317
214 -#: app/models/role.rb:6  
215 -msgid "Destroy profile" 318 +#: app/models/task.rb:-
  319 +msgid "Task|Requestor"
216 msgstr "" 320 msgstr ""
217 321
218 -#: app/models/role.rb:7  
219 -msgid "Manage memberships" 322 +#: app/models/task.rb:-
  323 +msgid "Task|Target"
220 msgstr "" 324 msgstr ""
221 325
222 -#: app/models/role.rb:8  
223 -msgid "Post content" 326 +#: app/models/task.rb:-
  327 +msgid "Task|Code"
  328 +msgstr ""
  329 +
  330 +#: app/models/task.rb:81
  331 +msgid "Generic task"
  332 +msgstr ""
  333 +
  334 +#: app/models/task.rb:88
  335 +msgid "The task was created at %s"
  336 +msgstr ""
  337 +
  338 +#: app/models/task.rb:94
  339 +msgid "The task was finished at %s"
  340 +msgstr ""
  341 +
  342 +#: app/models/task.rb:100
  343 +msgid "The task was cancelled at %s"
224 msgstr "" 344 msgstr ""
225 345
226 #: app/models/person_info.rb:- 346 #: app/models/person_info.rb:-
@@ -341,10 +461,76 @@ msgstr &quot;&quot; @@ -341,10 +461,76 @@ msgstr &quot;&quot;
341 msgid "User|Password confirmation" 461 msgid "User|Password confirmation"
342 msgstr "" 462 msgstr ""
343 463
344 -#: app/models/user.rb:30 464 +#: app/models/user.rb:31
345 msgid "%{fn} must be checked in order to signup." 465 msgid "%{fn} must be checked in order to signup."
346 msgstr "" 466 msgstr ""
347 467
  468 +#: app/models/create_enterprise.rb:3
  469 +msgid "CreateEnterprise|Identifier"
  470 +msgstr ""
  471 +
  472 +#: app/models/create_enterprise.rb:4
  473 +msgid "CreateEnterprise|Name"
  474 +msgstr ""
  475 +
  476 +#: app/models/create_enterprise.rb:5
  477 +msgid "CreateEnterprise|Address"
  478 +msgstr ""
  479 +
  480 +#: app/models/create_enterprise.rb:6
  481 +msgid "CreateEnterprise|Contact phone"
  482 +msgstr ""
  483 +
  484 +#: app/models/create_enterprise.rb:7
  485 +msgid "CreateEnterprise|Contact person"
  486 +msgstr ""
  487 +
  488 +#: app/models/create_enterprise.rb:8
  489 +msgid "CreateEnterprise|Acronym"
  490 +msgstr ""
  491 +
  492 +#: app/models/create_enterprise.rb:9
  493 +msgid "CreateEnterprise|Foundation year"
  494 +msgstr ""
  495 +
  496 +#: app/models/create_enterprise.rb:10
  497 +msgid "CreateEnterprise|Legal form"
  498 +msgstr ""
  499 +
  500 +#: app/models/create_enterprise.rb:11
  501 +msgid "CreateEnterprise|Economic activity"
  502 +msgstr ""
  503 +
  504 +#: app/models/create_enterprise.rb:12
  505 +msgid "CreateEnterprise|Management information"
  506 +msgstr ""
  507 +
  508 +#: app/models/create_enterprise.rb:108
  509 +msgid "Enterprise registration: \"%s\""
  510 +msgstr ""
  511 +
  512 +#: app/models/create_enterprise.rb:112
  513 +msgid ""
  514 +"Your request for registering enterprise \"%{enterprise}\" at %{environment} "
  515 +"was just received. It will be reviewed by the chosen validator organization "
  516 +"you chose, according to its methods and creteria.\n"
  517 +"\n"
  518 +" You will be notified as soon as the validator organization has a "
  519 +"position about your request."
  520 +msgstr ""
  521 +
  522 +#: app/models/create_enterprise.rb:118
  523 +msgid ""
  524 +"Your request fo registering the enterprise \"%{enterprise}\" was approved. "
  525 +"You can access %{environment} now and start entering "
  526 +msgstr ""
  527 +
  528 +#: app/models/create_enterprise.rb:122
  529 +msgid ""
  530 +"Your request for registering the enterprise %{enterprise} at %{environment} "
  531 +"was NOT approved by the validator organization."
  532 +msgstr ""
  533 +
348 #: app/models/environment.rb:- 534 #: app/models/environment.rb:-
349 msgid "environment" 535 msgid "environment"
350 msgstr "" 536 msgstr ""
@@ -354,6 +540,10 @@ msgid &quot;Environment|Name&quot; @@ -354,6 +540,10 @@ msgid &quot;Environment|Name&quot;
354 msgstr "" 540 msgstr ""
355 541
356 #: app/models/environment.rb:- 542 #: app/models/environment.rb:-
  543 +msgid "Environment|Contact email"
  544 +msgstr ""
  545 +
  546 +#: app/models/environment.rb:-
357 msgid "Environment|Is default" 547 msgid "Environment|Is default"
358 msgstr "" 548 msgstr ""
359 549
@@ -365,36 +555,36 @@ msgstr &quot;&quot; @@ -365,36 +555,36 @@ msgstr &quot;&quot;
365 msgid "Environment|Design data" 555 msgid "Environment|Design data"
366 msgstr "" 556 msgstr ""
367 557
368 -#: app/models/environment.rb:10  
369 -msgid "Some feature" 558 +#: app/models/environment.rb:7
  559 +msgid "Edit environment features"
370 msgstr "" 560 msgstr ""
371 561
372 -#: app/models/environment.rb:11  
373 -msgid "Other feature" 562 +#: app/models/environment.rb:8
  563 +msgid "Edit environment design"
374 msgstr "" 564 msgstr ""
375 565
376 -#: app/models/environment.rb:124  
377 -msgid "Only one Virtual Community can be the default one" 566 +#: app/models/environment.rb:9
  567 +msgid "Manage environment categories"
378 msgstr "" 568 msgstr ""
379 569
380 -#: app/models/role_assignment.rb:-  
381 -msgid "role assignment" 570 +#: app/models/environment.rb:10
  571 +msgid "Manage environment roles"
382 msgstr "" 572 msgstr ""
383 573
384 -#: app/models/role_assignment.rb:-  
385 -msgid "RoleAssignment|Person" 574 +#: app/models/environment.rb:11
  575 +msgid "Manage environment validators"
386 msgstr "" 576 msgstr ""
387 577
388 -#: app/models/role_assignment.rb:-  
389 -msgid "RoleAssignment|Role" 578 +#: app/models/environment.rb:18
  579 +msgid "Some feature"
390 msgstr "" 580 msgstr ""
391 581
392 -#: app/models/role_assignment.rb:-  
393 -msgid "RoleAssignment|Resource" 582 +#: app/models/environment.rb:19
  583 +msgid "Other feature"
394 msgstr "" 584 msgstr ""
395 585
396 -#: app/models/role_assignment.rb:-  
397 -msgid "RoleAssignment|Resource type" 586 +#: app/models/environment.rb:142
  587 +msgid "Only one Virtual Community can be the default one"
398 msgstr "" 588 msgstr ""
399 589
400 #: app/models/category.rb:- 590 #: app/models/category.rb:-
@@ -441,20 +631,12 @@ msgstr &quot;&quot; @@ -441,20 +631,12 @@ msgstr &quot;&quot;
441 msgid "%{fn} was already assigned to another category." 631 msgid "%{fn} was already assigned to another category."
442 msgstr "" 632 msgstr ""
443 633
444 -#: app/models/enterprise_info.rb:-  
445 -msgid "enterprise info" 634 +#: app/models/category.rb:13
  635 +msgid "%{fn} must be the same as the parents'"
446 msgstr "" 636 msgstr ""
447 637
448 -#: app/models/enterprise_info.rb:-  
449 -msgid "EnterpriseInfo|Approval status"  
450 -msgstr ""  
451 -  
452 -#: app/models/enterprise_info.rb:-  
453 -msgid "EnterpriseInfo|Approval comments"  
454 -msgstr ""  
455 -  
456 -#: app/models/enterprise_info.rb:-  
457 -msgid "EnterpriseInfo|Enterprise" 638 +#: app/models/organization.rb:11 app/models/organization.rb:16
  639 +msgid "(not informed)"
458 msgstr "" 640 msgstr ""
459 641
460 #: app/helpers/categories_helper.rb:6 642 #: app/helpers/categories_helper.rb:6
@@ -462,70 +644,175 @@ msgid &quot;Do not display at the menu&quot; @@ -462,70 +644,175 @@ msgid &quot;Do not display at the menu&quot;
462 msgstr "" 644 msgstr ""
463 645
464 #: app/helpers/categories_helper.rb:7 646 #: app/helpers/categories_helper.rb:7
465 -msgid "Blue" 647 +msgid "Orange"
466 msgstr "" 648 msgstr ""
467 649
468 #: app/helpers/categories_helper.rb:8 650 #: app/helpers/categories_helper.rb:8
469 -msgid "Red" 651 +msgid "Green"
470 msgstr "" 652 msgstr ""
471 653
472 #: app/helpers/categories_helper.rb:9 654 #: app/helpers/categories_helper.rb:9
473 -msgid "Green" 655 +msgid "Purple"
474 msgstr "" 656 msgstr ""
475 657
476 #: app/helpers/categories_helper.rb:10 658 #: app/helpers/categories_helper.rb:10
477 -msgid "Orange" 659 +msgid "Red"
  660 +msgstr ""
  661 +
  662 +#: app/helpers/categories_helper.rb:14
  663 +msgid "Categoria Geral"
478 msgstr "" 664 msgstr ""
479 665
480 #: app/helpers/categories_helper.rb:15 666 #: app/helpers/categories_helper.rb:15
  667 +msgid "Product Category"
  668 +msgstr ""
  669 +
  670 +#: app/helpers/categories_helper.rb:16
  671 +msgid "Region"
  672 +msgstr ""
  673 +
  674 +#: app/helpers/categories_helper.rb:21
481 msgid "Display at the menu?" 675 msgid "Display at the menu?"
482 msgstr "" 676 msgstr ""
483 677
  678 +#: app/helpers/categories_helper.rb:38
  679 +msgid "Type of category"
  680 +msgstr ""
  681 +
484 #: app/helpers/profile_helper.rb:6 682 #: app/helpers/profile_helper.rb:6
485 msgid "This profile does not have any public information" 683 msgid "This profile does not have any public information"
486 msgstr "" 684 msgstr ""
487 685
488 -#: app/helpers/application_helper.rb:56 686 +#: app/helpers/features_helper.rb:4
  687 +msgid "Administrator must approve all new organizations"
  688 +msgstr ""
  689 +
  690 +#: app/helpers/features_helper.rb:5
  691 +msgid "Administrator assigns validator organizations per region."
  692 +msgstr ""
  693 +
  694 +#: app/helpers/application_helper.rb:60
489 msgid "Help" 695 msgid "Help"
490 msgstr "" 696 msgstr ""
491 697
492 -#: app/helpers/application_helper.rb:114 698 +#: app/helpers/application_helper.rb:61
  699 +msgid "Close"
  700 +msgstr ""
  701 +
  702 +#: app/helpers/application_helper.rb:117
493 msgid "My account" 703 msgid "My account"
494 msgstr "" 704 msgstr ""
495 705
496 -#: app/helpers/application_helper.rb:115 706 +#: app/helpers/application_helper.rb:118
  707 +msgid "My Enterprises"
  708 +msgstr ""
  709 +
  710 +#: app/helpers/application_helper.rb:119
  711 +#: app/views/environment_role_manager/make_admin.rhtml:4
497 msgid "Admin" 712 msgid "Admin"
498 msgstr "" 713 msgstr ""
499 714
500 -#: app/helpers/application_helper.rb:133 app/views/account/login.rhtml:1 715 +#: app/helpers/application_helper.rb:120 app/helpers/application_helper.rb:126
  716 +msgid "About"
  717 +msgstr ""
  718 +
  719 +#: app/helpers/application_helper.rb:144 app/views/account/login.rhtml:1
501 msgid "Login" 720 msgid "Login"
502 msgstr "" 721 msgstr ""
503 722
504 -#: app/helpers/application_helper.rb:137 723 +#: app/helpers/application_helper.rb:148
505 msgid "Not a user yet? Register now!" 724 msgid "Not a user yet? Register now!"
506 msgstr "" 725 msgstr ""
507 726
508 -#: app/helpers/application_helper.rb:141 727 +#: app/helpers/application_helper.rb:152
509 msgid "Logout" 728 msgid "Logout"
510 msgstr "" 729 msgstr ""
511 730
512 -#: app/helpers/application_helper.rb:148  
513 -msgid "%s, version %s" 731 +#: app/helpers/application_helper.rb:166
  732 +msgid "Features"
  733 +msgstr ""
  734 +
  735 +#: app/helpers/application_helper.rb:167
  736 +msgid "Edit visual"
  737 +msgstr ""
  738 +
  739 +#: app/helpers/application_helper.rb:168
  740 +msgid "Manage categories"
  741 +msgstr ""
  742 +
  743 +#: app/helpers/application_helper.rb:169
  744 +msgid "Manage permissions"
  745 +msgstr ""
  746 +
  747 +#: app/helpers/application_helper.rb:170
  748 +msgid "Manage validators"
  749 +msgstr ""
  750 +
  751 +#: app/helpers/application_helper.rb:176
  752 +#: app/views/membership_editor/index.rhtml:16
  753 +msgid "New enterprise"
  754 +msgstr ""
  755 +
  756 +#: app/helpers/application_helper.rb:182 app/helpers/application_helper.rb:191
  757 +msgid "Edit visual design"
  758 +msgstr ""
  759 +
  760 +#: app/helpers/application_helper.rb:184 app/helpers/application_helper.rb:193
  761 +msgid "Manage content"
  762 +msgstr ""
  763 +
  764 +#: app/helpers/application_helper.rb:192
  765 +msgid "Edit informations"
  766 +msgstr ""
  767 +
  768 +#: app/helpers/application_helper.rb:194
  769 +msgid "Exclude"
  770 +msgstr ""
  771 +
  772 +#: app/helpers/application_helper.rb:200
  773 +#: app/views/account/new_password.rhtml:13
  774 +#: app/views/account/change_password.rhtml:1
  775 +#: app/views/account/change_password.rhtml:14
  776 +msgid "Change password"
  777 +msgstr ""
  778 +
  779 +#: app/helpers/application_helper.rb:206
  780 +msgid "Report bug"
  781 +msgstr ""
  782 +
  783 +#: app/helpers/application_helper.rb:212
  784 +msgid "Change template"
514 msgstr "" 785 msgstr ""
515 786
516 #: app/helpers/application_helper.rb:213 787 #: app/helpers/application_helper.rb:213
517 -msgid "No Filter at all" 788 +msgid "Change block theme"
518 msgstr "" 789 msgstr ""
519 790
520 #: app/helpers/application_helper.rb:214 791 #: app/helpers/application_helper.rb:214
  792 +msgid "Change icon theme"
  793 +msgstr ""
  794 +
  795 +#: app/helpers/application_helper.rb:247 app/helpers/application_helper.rb:250
  796 +msgid "Accessibility"
  797 +msgstr ""
  798 +
  799 +#: app/helpers/application_helper.rb:257
  800 +msgid "%s, version %s"
  801 +msgstr ""
  802 +
  803 +#: app/helpers/application_helper.rb:327
  804 +msgid "No Filter at all"
  805 +msgstr ""
  806 +
  807 +#: app/helpers/application_helper.rb:328
521 msgid "RDoc filter" 808 msgid "RDoc filter"
522 msgstr "" 809 msgstr ""
523 810
524 -#: app/helpers/application_helper.rb:215 811 +#: app/helpers/application_helper.rb:329
525 msgid "Simple" 812 msgid "Simple"
526 msgstr "" 813 msgstr ""
527 814
528 -#: app/helpers/application_helper.rb:216 815 +#: app/helpers/application_helper.rb:330
529 msgid "Textile" 816 msgid "Textile"
530 msgstr "" 817 msgstr ""
531 818
@@ -655,7 +942,9 @@ msgstr &quot;&quot; @@ -655,7 +942,9 @@ msgstr &quot;&quot;
655 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6 942 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
656 #: app/views/manage_tags/edit.rhtml:6 943 #: app/views/manage_tags/edit.rhtml:6
657 #: app/views/membership_editor/new_enterprise.rhtml:13 944 #: app/views/membership_editor/new_enterprise.rhtml:13
658 -#: app/views/categories/_form.rhtml:12 945 +#: app/views/enterprise_registration/basic_information.rhtml:33
  946 +#: app/views/environment_role_manager/change_role.rhtml:12
  947 +#: app/views/categories/_form.rhtml:17
659 msgid "Cancel" 948 msgid "Cancel"
660 msgstr "" 949 msgstr ""
661 950
@@ -769,7 +1058,8 @@ msgstr &quot;&quot; @@ -769,7 +1058,8 @@ msgstr &quot;&quot;
769 1058
770 #: app/views/role/_form.rhtml:12 1059 #: app/views/role/_form.rhtml:12
771 #: app/views/profile_members/change_role.rhtml:11 1060 #: app/views/profile_members/change_role.rhtml:11
772 -#: app/views/features/_features_table.rhtml:9 1061 +#: app/views/features/_features_table.rhtml:15
  1062 +#: app/views/environment_role_manager/change_role.rhtml:11
773 msgid "Save changes" 1063 msgid "Save changes"
774 msgstr "" 1064 msgstr ""
775 1065
@@ -786,6 +1076,8 @@ msgstr &quot;&quot; @@ -786,6 +1076,8 @@ msgstr &quot;&quot;
786 #: app/views/profile_members/index.rhtml:13 1076 #: app/views/profile_members/index.rhtml:13
787 #: app/views/enterprise_editor/index.rhtml:23 1077 #: app/views/enterprise_editor/index.rhtml:23
788 #: app/views/manage_tags/search.rhtml:12 1078 #: app/views/manage_tags/search.rhtml:12
  1079 +#: app/views/environment_role_manager/affiliate.rhtml:9
  1080 +#: app/views/environment_role_manager/index.rhtml:13
789 msgid "Back" 1081 msgid "Back"
790 msgstr "" 1082 msgstr ""
791 1083
@@ -804,14 +1096,18 @@ msgid &quot;Destroy&quot; @@ -804,14 +1096,18 @@ msgid &quot;Destroy&quot;
804 msgstr "" 1096 msgstr ""
805 1097
806 #: app/views/profile_members/change_role.rhtml:1 1098 #: app/views/profile_members/change_role.rhtml:1
  1099 +#: app/views/environment_role_manager/change_role.rhtml:1
807 msgid "Changing role of %s" 1100 msgid "Changing role of %s"
808 msgstr "" 1101 msgstr ""
809 1102
810 #: app/views/profile_members/change_role.rhtml:5 1103 #: app/views/profile_members/change_role.rhtml:5
  1104 +#: app/views/environment_role_manager/change_role.rhtml:5
  1105 +#: app/views/environment_role_manager/make_admin.rhtml:8
811 msgid "Roles: " 1106 msgid "Roles: "
812 msgstr "" 1107 msgstr ""
813 1108
814 #: app/views/profile_members/affiliate.rhtml:6 1109 #: app/views/profile_members/affiliate.rhtml:6
  1110 +#: app/views/environment_role_manager/affiliate.rhtml:6
815 msgid "Affiliate" 1111 msgid "Affiliate"
816 msgstr "" 1112 msgstr ""
817 1113
@@ -824,13 +1120,71 @@ msgid &quot;Affiliate yourself&quot; @@ -824,13 +1120,71 @@ msgid &quot;Affiliate yourself&quot;
824 msgstr "" 1120 msgstr ""
825 1121
826 #: app/views/profile_members/index.rhtml:8 1122 #: app/views/profile_members/index.rhtml:8
  1123 +#: app/views/environment_role_manager/index.rhtml:8
827 msgid "Edit member role" 1124 msgid "Edit member role"
828 msgstr "" 1125 msgstr ""
829 1126
830 #: app/views/profile_members/index.rhtml:9 1127 #: app/views/profile_members/index.rhtml:9
  1128 +#: app/views/environment_role_manager/index.rhtml:9
831 msgid "Remove member" 1129 msgid "Remove member"
832 msgstr "" 1130 msgstr ""
833 1131
  1132 +#: app/views/task_mailer/task_created.text.plain.rhtml:1
  1133 +#: app/views/task_mailer/task_finished.text.plain.rhtml:1
  1134 +#: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
  1135 +msgid "Dear %s,"
  1136 +msgstr ""
  1137 +
  1138 +#: app/views/task_mailer/task_created.text.plain.rhtml:6
  1139 +#: app/views/task_mailer/task_finished.text.plain.rhtml:6
  1140 +#: app/views/task_mailer/task_cancelled.text.plain.rhtml:6
  1141 +msgid "%s environment system"
  1142 +msgstr ""
  1143 +
  1144 +#: app/views/region_validators/_search.rhtml:8
  1145 +msgid "Adicionar"
  1146 +msgstr ""
  1147 +
  1148 +#: app/views/region_validators/region.rhtml:1
  1149 +msgid "Validators for region %s"
  1150 +msgstr ""
  1151 +
  1152 +#: app/views/region_validators/region.rhtml:3
  1153 +msgid "Current validators"
  1154 +msgstr ""
  1155 +
  1156 +#: app/views/region_validators/region.rhtml:9
  1157 +msgid "Remove validation rights"
  1158 +msgstr ""
  1159 +
  1160 +#: app/views/region_validators/region.rhtml:14
  1161 +msgid "Add new validators"
  1162 +msgstr ""
  1163 +
  1164 +#: app/views/region_validators/region.rhtml:17
  1165 +msgid ""
  1166 +"First search organizations by their name, then use the buttons in the search "
  1167 +"result to add them as validators for this region. "
  1168 +msgstr ""
  1169 +
  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
  1179 +msgid "1 validator"
  1180 +msgid_plural "%{num} validators."
  1181 +msgstr[0] ""
  1182 +msgstr[1] ""
  1183 +
  1184 +#: app/views/region_validators/index.rhtml:1
  1185 +msgid "Validators by Region"
  1186 +msgstr ""
  1187 +
834 #: app/views/content_viewer/view_page.rhtml:4 1188 #: app/views/content_viewer/view_page.rhtml:4
835 #: app/views/manage_tags/list.rhtml:17 1189 #: app/views/manage_tags/list.rhtml:17
836 msgid "Up" 1190 msgid "Up"
@@ -840,14 +1194,14 @@ msgstr &quot;&quot; @@ -840,14 +1194,14 @@ msgstr &quot;&quot;
840 msgid "There is no such page: %s" 1194 msgid "There is no such page: %s"
841 msgstr "" 1195 msgstr ""
842 1196
843 -#: app/views/layouts/application.rhtml:37  
844 -#: app/views/layouts/comatose_admin.rhtml:37  
845 -msgid "Close" 1197 +#: app/views/layouts/application.rhtml:60
  1198 +#: app/views/layouts/comatose_admin.rhtml:60
  1199 +msgid "Image for Loading..."
846 msgstr "" 1200 msgstr ""
847 1201
848 -#: app/views/layouts/application.rhtml:42  
849 -#: app/views/layouts/comatose_admin.rhtml:42  
850 -msgid "Image for Loading..." 1202 +#: app/views/layouts/application.rhtml:81
  1203 +#: app/views/layouts/comatose_admin.rhtml:81
  1204 +msgid "Your search here ..."
851 msgstr "" 1205 msgstr ""
852 1206
853 #: app/views/enterprise_editor/_form.rhtml:1 1207 #: app/views/enterprise_editor/_form.rhtml:1
@@ -1058,11 +1412,6 @@ msgstr &quot;&quot; @@ -1058,11 +1412,6 @@ msgstr &quot;&quot;
1058 msgid "Create a new tag" 1412 msgid "Create a new tag"
1059 msgstr "" 1413 msgstr ""
1060 1414
1061 -#: app/views/manage_tags/_search_box.rhtml:4  
1062 -#: app/views/membership_editor/index.rhtml:4  
1063 -msgid "Search"  
1064 -msgstr ""  
1065 -  
1066 #: app/views/manage_tags/edit.rhtml:1 1415 #: app/views/manage_tags/edit.rhtml:1
1067 msgid "Editing Tag" 1416 msgid "Editing Tag"
1068 msgstr "" 1417 msgstr ""
@@ -1072,14 +1421,17 @@ msgid &quot; enterprises found&quot; @@ -1072,14 +1421,17 @@ msgid &quot; enterprises found&quot;
1072 msgstr "" 1421 msgstr ""
1073 1422
1074 #: app/views/membership_editor/new_enterprise.rhtml:3 1423 #: app/views/membership_editor/new_enterprise.rhtml:3
  1424 +#: app/views/enterprise_registration/basic_information.rhtml:3
1075 msgid "Register enterprise" 1425 msgid "Register enterprise"
1076 msgstr "" 1426 msgstr ""
1077 1427
1078 #: app/views/membership_editor/new_enterprise.rhtml:5 1428 #: app/views/membership_editor/new_enterprise.rhtml:5
  1429 +#: app/views/enterprise_registration/basic_information.rhtml:5
1079 msgid "How to proceed" 1430 msgid "How to proceed"
1080 msgstr "" 1431 msgstr ""
1081 1432
1082 #: app/views/membership_editor/new_enterprise.rhtml:6 1433 #: app/views/membership_editor/new_enterprise.rhtml:6
  1434 +#: app/views/enterprise_registration/basic_information.rhtml:6
1083 msgid "" 1435 msgid ""
1084 "Fill the form and hit the Register button then the enterprise will be " 1436 "Fill the form and hit the Register button then the enterprise will be "
1085 "submitted for evaluation at the validation entitiy of your choice (within " 1437 "submitted for evaluation at the validation entitiy of your choice (within "
@@ -1093,6 +1445,7 @@ msgstr &quot;&quot; @@ -1093,6 +1445,7 @@ msgstr &quot;&quot;
1093 1445
1094 #: app/views/membership_editor/new_enterprise.rhtml:12 1446 #: app/views/membership_editor/new_enterprise.rhtml:12
1095 #: app/views/account/signup.rhtml:1 1447 #: app/views/account/signup.rhtml:1
  1448 +#: app/views/enterprise_registration/basic_information.rhtml:32
1096 msgid "Register" 1449 msgid "Register"
1097 msgstr "" 1450 msgstr ""
1098 1451
@@ -1104,10 +1457,6 @@ msgstr &quot;&quot; @@ -1104,10 +1457,6 @@ msgstr &quot;&quot;
1104 msgid "Manage" 1457 msgid "Manage"
1105 msgstr "" 1458 msgstr ""
1106 1459
1107 -#: app/views/membership_editor/index.rhtml:16  
1108 -msgid "New enterprise"  
1109 -msgstr ""  
1110 -  
1111 #: app/views/admin_panel/index.rhtml:1 1460 #: app/views/admin_panel/index.rhtml:1
1112 msgid "Administrator Panel" 1461 msgid "Administrator Panel"
1113 msgstr "" 1462 msgstr ""
@@ -1132,11 +1481,26 @@ msgstr &quot;&quot; @@ -1132,11 +1481,26 @@ msgstr &quot;&quot;
1132 msgid "Manage User roles" 1481 msgid "Manage User roles"
1133 msgstr "" 1482 msgstr ""
1134 1483
  1484 +#: app/views/admin_panel/index.rhtml:10
  1485 +msgid "Manage Validators by region"
  1486 +msgstr ""
  1487 +
1135 #: app/views/category/view.rhtml:1 1488 #: app/views/category/view.rhtml:1
1136 msgid "Category: %s" 1489 msgid "Category: %s"
1137 msgstr "" 1490 msgstr ""
1138 1491
1139 -#: app/views/account/login.rhtml:4 1492 +#: app/views/account/invalid_change_password_code.rhtml:1
  1493 +msgid "Invalid change password code"
  1494 +msgstr ""
  1495 +
  1496 +#: app/views/account/invalid_change_password_code.rhtml:4
  1497 +msgid ""
  1498 +"The code you are using for password change is not valid. Please try to "
  1499 +"request password change using the <a href=\"%s\">\"I forgot my password\"</"
  1500 +"a> functionality."
  1501 +msgstr ""
  1502 +
  1503 +#: app/views/account/login.rhtml:4 app/views/account/forgot_password.rhtml:8
1140 msgid "Username" 1504 msgid "Username"
1141 msgstr "" 1505 msgstr ""
1142 1506
@@ -1144,6 +1508,46 @@ msgstr &quot;&quot; @@ -1144,6 +1508,46 @@ msgstr &quot;&quot;
1144 msgid "Password" 1508 msgid "Password"
1145 msgstr "" 1509 msgstr ""
1146 1510
  1511 +#: app/views/account/login.rhtml:20
  1512 +msgid "I forgot my password"
  1513 +msgstr ""
  1514 +
  1515 +#: app/views/account/password_recovery_sent.rhtml:1
  1516 +#: app/views/account/forgot_password.rhtml:1
  1517 +msgid "Password recovery"
  1518 +msgstr ""
  1519 +
  1520 +#: app/views/account/password_recovery_sent.rhtml:4
  1521 +msgid ""
  1522 +"An e-mail was just sent to your e-mail address, with instructions for "
  1523 +"changing your password. You should receive it in a few minutes."
  1524 +msgstr ""
  1525 +
  1526 +#: app/views/account/new_password.rhtml:1
  1527 +#: app/views/account/new_password.rhtml:11
  1528 +msgid "Enter new password"
  1529 +msgstr ""
  1530 +
  1531 +#: app/views/account/new_password.rhtml:4
  1532 +msgid "Hello, %s! Please enter your new password in the form below."
  1533 +msgstr ""
  1534 +
  1535 +#: app/views/account/new_password.rhtml:12
  1536 +msgid "Confirm the new password"
  1537 +msgstr ""
  1538 +
  1539 +#: app/views/account/new_password_ok.rhtml:1
  1540 +msgid "Password changed sucessfully"
  1541 +msgstr ""
  1542 +
  1543 +#: app/views/account/new_password_ok.rhtml:4
  1544 +msgid "%s, your new password was successfully installed."
  1545 +msgstr ""
  1546 +
  1547 +#: app/views/account/new_password_ok.rhtml:8
  1548 +msgid "You can <a href='%s'>login</a> now."
  1549 +msgstr ""
  1550 +
1147 #: app/views/account/index_anonymous.rhtml:1 1551 #: app/views/account/index_anonymous.rhtml:1
1148 msgid "Identify yourself" 1552 msgid "Identify yourself"
1149 msgstr "" 1553 msgstr ""
@@ -1167,11 +1571,6 @@ msgid &quot;&quot; @@ -1167,11 +1571,6 @@ msgid &quot;&quot;
1167 "this environment." 1571 "this environment."
1168 msgstr "" 1572 msgstr ""
1169 1573
1170 -#: app/views/account/change_password.rhtml:1  
1171 -#: app/views/account/change_password.rhtml:14  
1172 -msgid "Change password"  
1173 -msgstr ""  
1174 -  
1175 #: app/views/account/change_password.rhtml:5 1574 #: app/views/account/change_password.rhtml:5
1176 msgid "Current password" 1575 msgid "Current password"
1177 msgstr "" 1576 msgstr ""
@@ -1188,6 +1587,21 @@ msgstr &quot;&quot; @@ -1188,6 +1587,21 @@ msgstr &quot;&quot;
1188 msgid "I accept the terms of use" 1587 msgid "I accept the terms of use"
1189 msgstr "" 1588 msgstr ""
1190 1589
  1590 +#: app/views/account/forgot_password.rhtml:5
  1591 +msgid ""
  1592 +"To change your password, please fill the form on this screen using yout "
  1593 +"username and your e-mail. You will receive a message at that e-mail address "
  1594 +"with a web address you can access to create a new password."
  1595 +msgstr ""
  1596 +
  1597 +#: app/views/account/forgot_password.rhtml:9
  1598 +msgid "E-mail"
  1599 +msgstr ""
  1600 +
  1601 +#: app/views/account/forgot_password.rhtml:11
  1602 +msgid "Send change password procedure by e-mail"
  1603 +msgstr ""
  1604 +
1191 #: app/views/account/index.rhtml:1 1605 #: app/views/account/index.rhtml:1
1192 msgid "Account options" 1606 msgid "Account options"
1193 msgstr "" 1607 msgstr ""
@@ -1242,6 +1656,10 @@ msgid &quot;&quot; @@ -1242,6 +1656,10 @@ msgid &quot;&quot;
1242 "environment." 1656 "environment."
1243 msgstr "" 1657 msgstr ""
1244 1658
  1659 +#: app/views/features/_features_table.rhtml:12
  1660 +msgid "Organization Approval Method"
  1661 +msgstr ""
  1662 +
1245 #: app/views/features/index.rhtml:1 1663 #: app/views/features/index.rhtml:1
1246 msgid "Enable/Disable features" 1664 msgid "Enable/Disable features"
1247 msgstr "" 1665 msgstr ""
@@ -1261,6 +1679,10 @@ msgstr &quot;&quot; @@ -1261,6 +1679,10 @@ msgstr &quot;&quot;
1261 msgid "Access denied" 1679 msgid "Access denied"
1262 msgstr "" 1680 msgstr ""
1263 1681
  1682 +#: app/views/shared/categories_menu.rhtml:5
  1683 +msgid "Home"
  1684 +msgstr ""
  1685 +
1264 #: app/views/profile_editor/person_info.rhtml:1 1686 #: app/views/profile_editor/person_info.rhtml:1
1265 msgid "Edit person info" 1687 msgid "Edit person info"
1266 msgstr "" 1688 msgstr ""
@@ -1270,7 +1692,7 @@ msgid &quot;Contact Information&quot; @@ -1270,7 +1692,7 @@ msgid &quot;Contact Information&quot;
1270 msgstr "" 1692 msgstr ""
1271 1693
1272 #: app/views/profile_editor/person_info.rhtml:11 1694 #: app/views/profile_editor/person_info.rhtml:11
1273 -#: app/views/categories/_form.rhtml:11 1695 +#: app/views/categories/_form.rhtml:16
1274 msgid "Save" 1696 msgid "Save"
1275 msgstr "" 1697 msgstr ""
1276 1698
@@ -1279,7 +1701,7 @@ msgid &quot;My profile&quot; @@ -1279,7 +1701,7 @@ msgid &quot;My profile&quot;
1279 msgstr "" 1701 msgstr ""
1280 1702
1281 #: app/views/profile_editor/index.rhtml:7 1703 #: app/views/profile_editor/index.rhtml:7
1282 -msgid "Manage members" 1704 +msgid "Edit Visual Design"
1283 msgstr "" 1705 msgstr ""
1284 1706
1285 #: app/views/profile_editor/index.rhtml:9 1707 #: app/views/profile_editor/index.rhtml:9
@@ -1290,6 +1712,61 @@ msgstr &quot;&quot; @@ -1290,6 +1712,61 @@ msgstr &quot;&quot;
1290 msgid "Edit enterprise info" 1712 msgid "Edit enterprise info"
1291 msgstr "" 1713 msgstr ""
1292 1714
  1715 +#: app/views/enterprise_registration/basic_information.rhtml:27
  1716 +msgid "Management information"
  1717 +msgstr ""
  1718 +
  1719 +#: app/views/enterprise_registration/select_validator.rhtml:1
  1720 +msgid "Enterprise Registration: Select a validator organization"
  1721 +msgstr ""
  1722 +
  1723 +#: app/views/enterprise_registration/select_validator.rhtml:4
  1724 +msgid ""
  1725 +"Select one organization to validate your enterprise registration request. "
  1726 +"Check the provided information about their validation methodoly and criteria."
  1727 +msgstr ""
  1728 +
  1729 +#: app/views/enterprise_registration/select_validator.rhtml:15
  1730 +msgid "Validation Methodology:"
  1731 +msgstr ""
  1732 +
  1733 +#: app/views/enterprise_registration/select_validator.rhtml:16
  1734 +msgid "Restrictions (if any):"
  1735 +msgstr ""
  1736 +
  1737 +#: app/views/enterprise_registration/select_validator.rhtml:20
  1738 +msgid "Confirm"
  1739 +msgstr ""
  1740 +
  1741 +#: app/views/enterprise_registration/confirmation.rhtml:1
  1742 +msgid "Enterprise Registration completed"
  1743 +msgstr ""
  1744 +
  1745 +#: app/views/enterprise_registration/confirmation.rhtml:4
  1746 +msgid ""
  1747 +"Your enterprise registration request was successfully registered. The "
  1748 +"validator organization you choose (%s) should get in touch with to start the "
  1749 +"validation process. As soon as the validators approve (or reject) your "
  1750 +"request, you will be notified by e-mail."
  1751 +msgstr ""
  1752 +
  1753 +#: app/views/enterprise_registration/confirmation.rhtml:8
  1754 +msgid "You can continue to browse this environment."
  1755 +msgstr ""
  1756 +
  1757 +#: app/views/environment_role_manager/make_admin.rhtml:1
  1758 +#: app/views/environment_role_manager/index.rhtml:3
  1759 +msgid "Make new admin"
  1760 +msgstr ""
  1761 +
  1762 +#: app/views/environment_role_manager/make_admin.rhtml:12
  1763 +msgid "Make"
  1764 +msgstr ""
  1765 +
  1766 +#: app/views/environment_role_manager/index.rhtml:1
  1767 +msgid "Listing Administrators"
  1768 +msgstr ""
  1769 +
1293 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:8 1770 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:8
1294 msgid "New category" 1771 msgid "New category"
1295 msgstr "" 1772 msgstr ""
po/pt_BR/noosfero.po
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
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-01 14:46-0300\n"  
13 -"PO-Revision-Date: 2007-10-01 14:37-0300\n" 12 +"POT-Creation-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"
16 "Language-Team: \n" 16 "Language-Team: \n"
@@ -21,6 +21,7 @@ msgstr &quot;&quot; @@ -21,6 +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 msgid "Main content block" 25 msgid "Main content block"
25 msgstr "Bloco de conteúdo principal" 26 msgstr "Bloco de conteúdo principal"
26 27
@@ -49,28 +50,56 @@ msgstr &quot;Falhou em criar papel&quot; @@ -49,28 +50,56 @@ msgstr &quot;Falhou em criar papel&quot;
49 msgid "Failed to edit role" 50 msgid "Failed to edit role"
50 msgstr "Falhou em editar papel" 51 msgstr "Falhou em editar papel"
51 52
52 -#: app/controllers/environment_admin/features_controller.rb:18 53 +#: app/controllers/environment_admin/features_controller.rb:12
53 msgid "Features updated successfully." 54 msgid "Features updated successfully."
54 msgstr "Funcionalidades alterada com sucesso" 55 msgstr "Funcionalidades alterada com sucesso"
55 56
56 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:23 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
  64 +#: 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"
  68 +
  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"
  74 +
  75 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:48
  76 +#: app/controllers/environment_admin/environment_role_manager_controller.rb:58
  77 +#, fuzzy
  78 +msgid "Failed to unassociate member"
  79 +msgstr "Falhou em ativar o empreendimento"
  80 +
  81 +#: app/controllers/profile_admin_controller.rb:15
  82 +msgid "This action is not available for \"%s\"."
  83 +msgstr ""
  84 +
  85 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:25
57 msgid "Could not update the enterprise" 86 msgid "Could not update the enterprise"
58 msgstr "Não pôde modificar o empreendimento" 87 msgstr "Não pôde modificar o empreendimento"
59 88
60 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:32 89 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:34
61 #, fuzzy 90 #, fuzzy
62 msgid "Enterprise sucessfully erased from the system" 91 msgid "Enterprise sucessfully erased from the system"
63 msgstr "Empreendimento ativado com sucesso" 92 msgstr "Empreendimento ativado com sucesso"
64 93
65 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:39 94 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:41
66 msgid "Enterprise successfuly activacted" 95 msgid "Enterprise successfuly activacted"
67 msgstr "Empreendimento ativado com sucesso" 96 msgstr "Empreendimento ativado com sucesso"
68 97
69 -#: app/controllers/profile_admin/enterprise_editor_controller.rb:41 98 +#: app/controllers/profile_admin/enterprise_editor_controller.rb:43
70 msgid "Failed to activate the enterprise" 99 msgid "Failed to activate the enterprise"
71 msgstr "Falhou em ativar o empreendimento" 100 msgstr "Falhou em ativar o empreendimento"
72 101
73 -#: app/controllers/profile_admin/membership_editor_controller.rb:20 102 +#: app/controllers/profile_admin/membership_editor_controller.rb:21
74 msgid "" 103 msgid ""
75 "The enterprise was successfully created, the validation entity will cotact " 104 "The enterprise was successfully created, the validation entity will cotact "
76 "you as soon as your enterprise is approved" 105 "you as soon as your enterprise is approved"
@@ -78,34 +107,115 @@ msgstr &quot;&quot; @@ -78,34 +107,115 @@ msgstr &quot;&quot;
78 "O empreendimento foi criado com sucesso, a entidade de validação irá entrar " 107 "O empreendimento foi criado com sucesso, a entidade de validação irá entrar "
79 "em contato com você assim que seu empreendimento for aprovado" 108 "em contato com você assim que seu empreendimento for aprovado"
80 109
81 -#: app/controllers/profile_admin/membership_editor_controller.rb:23 110 +#: app/controllers/profile_admin/membership_editor_controller.rb:24
82 msgid "Enterprise was not created" 111 msgid "Enterprise was not created"
83 msgstr "Empreendimento não foi criado" 112 msgstr "Empreendimento não foi criado"
84 113
85 -#: app/controllers/public/account_controller.rb:20 114 +#: app/controllers/profile_admin/profile_editor_controller.rb:8
  115 +msgid "List Block"
  116 +msgstr ""
  117 +
  118 +#: app/controllers/profile_admin/profile_editor_controller.rb:9
  119 +msgid "Link Block"
  120 +msgstr ""
  121 +
  122 +#: app/controllers/profile_admin/profile_editor_controller.rb:11
  123 +#, fuzzy
  124 +msgid "Recent documents block"
  125 +msgstr "Bloco de conteúdo principal"
  126 +
  127 +#: app/controllers/public/account_controller.rb:21
86 msgid "Logged in successfully" 128 msgid "Logged in successfully"
87 msgstr "Login bem sucedido" 129 msgstr "Login bem sucedido"
88 130
89 -#: app/controllers/public/account_controller.rb:22 131 +#: app/controllers/public/account_controller.rb:23
90 msgid "Incorrect username or password" 132 msgid "Incorrect username or password"
91 msgstr "Nome ou senha incorreto" 133 msgstr "Nome ou senha incorreto"
92 134
93 -#: app/controllers/public/account_controller.rb:39 135 +#: app/controllers/public/account_controller.rb:40
94 msgid "Thanks for signing up!" 136 msgid "Thanks for signing up!"
95 msgstr "Obrigado por se registrar!" 137 msgstr "Obrigado por se registrar!"
96 138
97 -#: app/controllers/public/account_controller.rb:51 139 +#: app/controllers/public/account_controller.rb:52
98 msgid "You have been logged out." 140 msgid "You have been logged out."
99 msgstr "Você se saiu do sistema" 141 msgstr "Você se saiu do sistema"
100 142
101 -#: app/controllers/public/account_controller.rb:62 143 +#: app/controllers/public/account_controller.rb:63
102 msgid "Your password has been changed successfully!" 144 msgid "Your password has been changed successfully!"
103 msgstr "Sua senha foi alterada com sucesso!" 145 msgstr "Sua senha foi alterada com sucesso!"
104 146
105 -#: app/controllers/public/account_controller.rb:65 147 +#: app/controllers/public/account_controller.rb:66
106 msgid "The supplied current password is incorrect." 148 msgid "The supplied current password is incorrect."
107 msgstr "A senha informada está incorreta" 149 msgstr "A senha informada está incorreta"
108 150
  151 +#: app/models/validation_info.rb:-
  152 +#, fuzzy
  153 +msgid "validation info"
  154 +msgstr "informação da organização"
  155 +
  156 +#: app/models/validation_info.rb:-
  157 +#, fuzzy
  158 +msgid "ValidationInfo|Validation methodology"
  159 +msgstr "Validado"
  160 +
  161 +#: app/models/validation_info.rb:-
  162 +#, fuzzy
  163 +msgid "ValidationInfo|Restrictions"
  164 +msgstr "Organização"
  165 +
  166 +#: app/models/validation_info.rb:-
  167 +#, fuzzy
  168 +msgid "ValidationInfo|Organization"
  169 +msgstr "Organização"
  170 +
  171 +#: app/models/change_password.rb:13
  172 +#, fuzzy
  173 +msgid "ChangePassword|Login"
  174 +msgstr "Alterar senha"
  175 +
  176 +#: app/models/change_password.rb:14
  177 +#, fuzzy
  178 +msgid "ChangePassword|Email"
  179 +msgstr "Alterar senha"
  180 +
  181 +#: app/models/change_password.rb:15
  182 +#, fuzzy
  183 +msgid "ChangePassword|Password"
  184 +msgstr "Alterar senha"
  185 +
  186 +#: app/models/change_password.rb:16
  187 +#, fuzzy
  188 +msgid "ChangePassword|Password Confirmation"
  189 +msgstr "Confirmação de senha"
  190 +
  191 +#: app/models/change_password.rb:31
  192 +msgid "%{fn} is not a valid username."
  193 +msgstr ""
  194 +
  195 +#: app/models/change_password.rb:34
  196 +msgid "%{fn} is invalid."
  197 +msgstr ""
  198 +
  199 +#: app/models/change_password.rb:65
  200 +msgid "Your password change request was cancelled at %s."
  201 +msgstr ""
  202 +
  203 +#: app/models/change_password.rb:69
  204 +#, fuzzy
  205 +msgid "Your password was changed successfully."
  206 +msgstr "Sua senha foi alterada com sucesso!"
  207 +
  208 +#: app/models/change_password.rb:78
  209 +msgid ""
  210 +"In order to change your password, please visit the following address:\n"
  211 +"\n"
  212 +"%s"
  213 +msgstr ""
  214 +
  215 +#: app/models/change_password.rb:83
  216 +msgid "Password change request"
  217 +msgstr ""
  218 +
109 #: app/models/profile.rb:- 219 #: app/models/profile.rb:-
110 msgid "profile" 220 msgid "profile"
111 msgstr "perfil" 221 msgstr "perfil"
@@ -128,16 +238,8 @@ msgid &quot;Profile|Environment&quot; @@ -128,16 +238,8 @@ msgid &quot;Profile|Environment&quot;
128 msgstr "comunidade virtual" 238 msgstr "comunidade virtual"
129 239
130 #: app/models/profile.rb:- 240 #: app/models/profile.rb:-
131 -msgid "Profile|Flexible template template"  
132 -msgstr "Modelo fexível modelo"  
133 -  
134 -#: app/models/profile.rb:-  
135 -msgid "Profile|Flexible template theme"  
136 -msgstr "Modelo flexível tema"  
137 -  
138 -#: app/models/profile.rb:-  
139 -msgid "Profile|Flexible template icon theme"  
140 -msgstr "Modelo flexível tema de ícones" 241 +msgid "Profile|Design data"
  242 +msgstr ""
141 243
142 #: app/models/profile.rb:- 244 #: app/models/profile.rb:-
143 msgid "Profile|Active" 245 msgid "Profile|Active"
@@ -156,14 +258,32 @@ msgid &quot;Profile|User&quot; @@ -156,14 +258,32 @@ msgid &quot;Profile|User&quot;
156 msgstr "Usuário" 258 msgstr "Usuário"
157 259
158 #: app/models/profile.rb:- 260 #: app/models/profile.rb:-
159 -msgid "Profile|Validation entity"  
160 -msgstr "Entidade de validação" 261 +#, fuzzy
  262 +msgid "Profile|Region"
  263 +msgstr "Nome"
161 264
162 -#: app/models/profile.rb:-  
163 -msgid "Profile|Approved"  
164 -msgstr "Aprovado" 265 +#: app/models/profile.rb:7 app/helpers/application_helper.rb:183
  266 +msgid "Edit profile"
  267 +msgstr "perfil"
165 268
166 -#: app/models/profile.rb:46 269 +#: app/models/profile.rb:8
  270 +msgid "Destroy profile"
  271 +msgstr "Remover perfil"
  272 +
  273 +#: app/models/profile.rb:9
  274 +msgid "Manage memberships"
  275 +msgstr "Gerenciar associação em organização"
  276 +
  277 +#: app/models/profile.rb:10
  278 +msgid "Post content"
  279 +msgstr "Conteúdo da postagem"
  280 +
  281 +#: app/models/profile.rb:11
  282 +#, fuzzy
  283 +msgid "Edit profile design"
  284 +msgstr "perfil"
  285 +
  286 +#: app/models/profile.rb:62
167 msgid "An existing profile cannot be renamed." 287 msgid "An existing profile cannot be renamed."
168 msgstr "Um perfil existente não pode ser renomeado" 288 msgstr "Um perfil existente não pode ser renomeado"
169 289
@@ -203,35 +323,49 @@ msgstr &quot;Informação de gerenciamento&quot; @@ -203,35 +323,49 @@ msgstr &quot;Informação de gerenciamento&quot;
203 msgid "OrganizationInfo|Validated" 323 msgid "OrganizationInfo|Validated"
204 msgstr "Validado" 324 msgstr "Validado"
205 325
206 -#: app/models/role.rb:-  
207 -msgid "role"  
208 -msgstr "papel" 326 +#: app/models/task.rb:-
  327 +msgid "task"
  328 +msgstr ""
209 329
210 -#: app/models/role.rb:-  
211 -#, fuzzy  
212 -msgid "Role|Name"  
213 -msgstr "Nome" 330 +#: app/models/task.rb:-
  331 +msgid "Task|Data"
  332 +msgstr ""
214 333
215 -#: app/models/role.rb:-  
216 -#, fuzzy  
217 -msgid "Role|Permissions"  
218 -msgstr "Permissões: " 334 +#: app/models/task.rb:-
  335 +msgid "Task|Status"
  336 +msgstr ""
219 337
220 -#: app/models/role.rb:5  
221 -msgid "Edit profile"  
222 -msgstr "perfil" 338 +#: app/models/task.rb:-
  339 +msgid "Task|End date"
  340 +msgstr ""
223 341
224 -#: app/models/role.rb:6  
225 -msgid "Destroy profile"  
226 -msgstr "Remover perfil" 342 +#: app/models/task.rb:-
  343 +msgid "Task|Requestor"
  344 +msgstr ""
227 345
228 -#: app/models/role.rb:7  
229 -msgid "Manage memberships"  
230 -msgstr "Gerenciar associação em organização" 346 +#: app/models/task.rb:-
  347 +msgid "Task|Target"
  348 +msgstr ""
231 349
232 -#: app/models/role.rb:8  
233 -msgid "Post content"  
234 -msgstr "Conteúdo da postagem" 350 +#: app/models/task.rb:-
  351 +msgid "Task|Code"
  352 +msgstr ""
  353 +
  354 +#: app/models/task.rb:81
  355 +msgid "Generic task"
  356 +msgstr ""
  357 +
  358 +#: app/models/task.rb:88
  359 +msgid "The task was created at %s"
  360 +msgstr ""
  361 +
  362 +#: app/models/task.rb:94
  363 +msgid "The task was finished at %s"
  364 +msgstr ""
  365 +
  366 +#: app/models/task.rb:100
  367 +msgid "The task was cancelled at %s"
  368 +msgstr ""
235 369
236 #: app/models/person_info.rb:- 370 #: app/models/person_info.rb:-
237 msgid "person info" 371 msgid "person info"
@@ -353,10 +487,85 @@ msgstr &quot;Senha&quot; @@ -353,10 +487,85 @@ msgstr &quot;Senha&quot;
353 msgid "User|Password confirmation" 487 msgid "User|Password confirmation"
354 msgstr "Confirmação de senha" 488 msgstr "Confirmação de senha"
355 489
356 -#: app/models/user.rb:30 490 +#: app/models/user.rb:31
357 msgid "%{fn} must be checked in order to signup." 491 msgid "%{fn} must be checked in order to signup."
358 msgstr "%{fn} deve ser verificado para efetivar inscrição" 492 msgstr "%{fn} deve ser verificado para efetivar inscrição"
359 493
  494 +#: app/models/create_enterprise.rb:3
  495 +#, fuzzy
  496 +msgid "CreateEnterprise|Identifier"
  497 +msgstr "Identificador"
  498 +
  499 +#: app/models/create_enterprise.rb:4
  500 +#, fuzzy
  501 +msgid "CreateEnterprise|Name"
  502 +msgstr "Excluir empreendimento"
  503 +
  504 +#: app/models/create_enterprise.rb:5
  505 +msgid "CreateEnterprise|Address"
  506 +msgstr ""
  507 +
  508 +#: app/models/create_enterprise.rb:6
  509 +#, fuzzy
  510 +msgid "CreateEnterprise|Contact phone"
  511 +msgstr "Telefone de contato"
  512 +
  513 +#: app/models/create_enterprise.rb:7
  514 +#, fuzzy
  515 +msgid "CreateEnterprise|Contact person"
  516 +msgstr "Pessoa de contato"
  517 +
  518 +#: app/models/create_enterprise.rb:8
  519 +msgid "CreateEnterprise|Acronym"
  520 +msgstr ""
  521 +
  522 +#: app/models/create_enterprise.rb:9
  523 +#, fuzzy
  524 +msgid "CreateEnterprise|Foundation year"
  525 +msgstr "Ano de fundação"
  526 +
  527 +#: app/models/create_enterprise.rb:10
  528 +#, fuzzy
  529 +msgid "CreateEnterprise|Legal form"
  530 +msgstr "informação de empreendimento"
  531 +
  532 +#: app/models/create_enterprise.rb:11
  533 +#, fuzzy
  534 +msgid "CreateEnterprise|Economic activity"
  535 +msgstr "Atividade econômica"
  536 +
  537 +#: app/models/create_enterprise.rb:12
  538 +#, fuzzy
  539 +msgid "CreateEnterprise|Management information"
  540 +msgstr "Informação de gerenciamento"
  541 +
  542 +#: app/models/create_enterprise.rb:108
  543 +#, fuzzy
  544 +msgid "Enterprise registration: \"%s\""
  545 +msgstr "Editar informações do empreendimento"
  546 +
  547 +#: app/models/create_enterprise.rb:112
  548 +msgid ""
  549 +"Your request for registering enterprise \"%{enterprise}\" at %{environment} "
  550 +"was just received. It will be reviewed by the chosen validator organization "
  551 +"you chose, according to its methods and creteria.\n"
  552 +"\n"
  553 +" You will be notified as soon as the validator organization has a "
  554 +"position about your request."
  555 +msgstr ""
  556 +
  557 +#: app/models/create_enterprise.rb:118
  558 +msgid ""
  559 +"Your request fo registering the enterprise \"%{enterprise}\" was approved. "
  560 +"You can access %{environment} now and start entering "
  561 +msgstr ""
  562 +
  563 +#: app/models/create_enterprise.rb:122
  564 +msgid ""
  565 +"Your request for registering the enterprise %{enterprise} at %{environment} "
  566 +"was NOT approved by the validator organization."
  567 +msgstr ""
  568 +
360 #: app/models/environment.rb:- 569 #: app/models/environment.rb:-
361 msgid "environment" 570 msgid "environment"
362 msgstr "comunidade virtual" 571 msgstr "comunidade virtual"
@@ -368,6 +577,11 @@ msgstr &quot;comunidade virtual&quot; @@ -368,6 +577,11 @@ msgstr &quot;comunidade virtual&quot;
368 577
369 #: app/models/environment.rb:- 578 #: app/models/environment.rb:-
370 #, fuzzy 579 #, fuzzy
  580 +msgid "Environment|Contact email"
  581 +msgstr "comunidade virtual"
  582 +
  583 +#: app/models/environment.rb:-
  584 +#, fuzzy
371 msgid "Environment|Is default" 585 msgid "Environment|Is default"
372 msgstr "comunidade virtual" 586 msgstr "comunidade virtual"
373 587
@@ -380,41 +594,42 @@ msgstr &quot;comunidade virtual&quot; @@ -380,41 +594,42 @@ msgstr &quot;comunidade virtual&quot;
380 msgid "Environment|Design data" 594 msgid "Environment|Design data"
381 msgstr "" 595 msgstr ""
382 596
  597 +#: app/models/environment.rb:7
  598 +#, fuzzy
  599 +msgid "Edit environment features"
  600 +msgstr "comunidade virtual"
  601 +
  602 +#: app/models/environment.rb:8
  603 +#, fuzzy
  604 +msgid "Edit environment design"
  605 +msgstr "comunidade virtual"
  606 +
  607 +#: app/models/environment.rb:9
  608 +#, fuzzy
  609 +msgid "Manage environment categories"
  610 +msgstr "Gerenciar categorias"
  611 +
383 #: app/models/environment.rb:10 612 #: app/models/environment.rb:10
  613 +#, fuzzy
  614 +msgid "Manage environment roles"
  615 +msgstr "Gerencias papéis de usuários"
  616 +
  617 +#: app/models/environment.rb:11
  618 +msgid "Manage environment validators"
  619 +msgstr ""
  620 +
  621 +#: app/models/environment.rb:18
384 msgid "Some feature" 622 msgid "Some feature"
385 msgstr "Alguma funcionalidade" 623 msgstr "Alguma funcionalidade"
386 624
387 -#: app/models/environment.rb:11 625 +#: app/models/environment.rb:19
388 msgid "Other feature" 626 msgid "Other feature"
389 msgstr "Outra funcionalidade" 627 msgstr "Outra funcionalidade"
390 628
391 -#: app/models/environment.rb:124 629 +#: app/models/environment.rb:142
392 msgid "Only one Virtual Community can be the default one" 630 msgid "Only one Virtual Community can be the default one"
393 msgstr "Apenas uma comunidade virtual pode ser a padrão" 631 msgstr "Apenas uma comunidade virtual pode ser a padrão"
394 632
395 -#: app/models/role_assignment.rb:-  
396 -msgid "role assignment"  
397 -msgstr "atribuição de papéis"  
398 -  
399 -#: app/models/role_assignment.rb:-  
400 -#, fuzzy  
401 -msgid "RoleAssignment|Person"  
402 -msgstr "atribuição de papéis"  
403 -  
404 -#: app/models/role_assignment.rb:-  
405 -#, fuzzy  
406 -msgid "RoleAssignment|Role"  
407 -msgstr "atribuição de papéis"  
408 -  
409 -#: app/models/role_assignment.rb:-  
410 -#, fuzzy  
411 -msgid "RoleAssignment|Resource"  
412 -msgstr "atribuição de papéis"  
413 -  
414 -#: app/models/role_assignment.rb:-  
415 -msgid "RoleAssignment|Resource type"  
416 -msgstr ""  
417 -  
418 #: app/models/category.rb:- 633 #: app/models/category.rb:-
419 msgid "category" 634 msgid "category"
420 msgstr "categoria" 635 msgstr "categoria"
@@ -465,91 +680,203 @@ msgstr &quot;%{fn} já está sendo usado por outra categoria.&quot; @@ -465,91 +680,203 @@ msgstr &quot;%{fn} já está sendo usado por outra categoria.&quot;
465 msgid "%{fn} was already assigned to another category." 680 msgid "%{fn} was already assigned to another category."
466 msgstr "%{fn} já foi atribuído a outra categoria." 681 msgstr "%{fn} já foi atribuído a outra categoria."
467 682
468 -#: app/models/enterprise_info.rb:-  
469 -msgid "enterprise info"  
470 -msgstr "informação de empreendimento"  
471 -  
472 -#: app/models/enterprise_info.rb:-  
473 -msgid "EnterpriseInfo|Approval status"  
474 -msgstr "Estado de aprovação"  
475 -  
476 -#: app/models/enterprise_info.rb:-  
477 -msgid "EnterpriseInfo|Approval comments"  
478 -msgstr "Comentário de aprovação" 683 +#: app/models/category.rb:13
  684 +msgid "%{fn} must be the same as the parents'"
  685 +msgstr ""
479 686
480 -#: app/models/enterprise_info.rb:-  
481 -msgid "EnterpriseInfo|Enterprise"  
482 -msgstr "Empreendimento" 687 +#: app/models/organization.rb:11 app/models/organization.rb:16
  688 +msgid "(not informed)"
  689 +msgstr ""
483 690
484 #: app/helpers/categories_helper.rb:6 691 #: app/helpers/categories_helper.rb:6
485 msgid "Do not display at the menu" 692 msgid "Do not display at the menu"
486 msgstr "Não exibir no menu" 693 msgstr "Não exibir no menu"
487 694
488 #: app/helpers/categories_helper.rb:7 695 #: app/helpers/categories_helper.rb:7
489 -msgid "Blue"  
490 -msgstr "Azul" 696 +msgid "Orange"
  697 +msgstr "Laranja"
491 698
492 #: app/helpers/categories_helper.rb:8 699 #: app/helpers/categories_helper.rb:8
493 -msgid "Red"  
494 -msgstr "Vermelho"  
495 -  
496 -#: app/helpers/categories_helper.rb:9  
497 msgid "Green" 700 msgid "Green"
498 msgstr "Verde" 701 msgstr "Verde"
499 702
  703 +#: app/helpers/categories_helper.rb:9
  704 +#, fuzzy
  705 +msgid "Purple"
  706 +msgstr "papel"
  707 +
500 #: app/helpers/categories_helper.rb:10 708 #: app/helpers/categories_helper.rb:10
501 -msgid "Orange"  
502 -msgstr "Laranja" 709 +msgid "Red"
  710 +msgstr "Vermelho"
  711 +
  712 +#: app/helpers/categories_helper.rb:14
  713 +#, fuzzy
  714 +msgid "Categoria Geral"
  715 +msgstr "Categorias"
503 716
504 #: app/helpers/categories_helper.rb:15 717 #: app/helpers/categories_helper.rb:15
  718 +#, fuzzy
  719 +msgid "Product Category"
  720 +msgstr "categoria"
  721 +
  722 +#: app/helpers/categories_helper.rb:16
  723 +msgid "Region"
  724 +msgstr ""
  725 +
  726 +#: app/helpers/categories_helper.rb:21
505 msgid "Display at the menu?" 727 msgid "Display at the menu?"
506 msgstr "Mostrar no menu?" 728 msgstr "Mostrar no menu?"
507 729
  730 +#: app/helpers/categories_helper.rb:38
  731 +#, fuzzy
  732 +msgid "Type of category"
  733 +msgstr "Nova categoria"
  734 +
508 #: app/helpers/profile_helper.rb:6 735 #: app/helpers/profile_helper.rb:6
509 msgid "This profile does not have any public information" 736 msgid "This profile does not have any public information"
510 msgstr "Este perfil não tem nenhuma informação pública" 737 msgstr "Este perfil não tem nenhuma informação pública"
511 738
512 -#: app/helpers/application_helper.rb:56 739 +#: app/helpers/features_helper.rb:4
  740 +msgid "Administrator must approve all new organizations"
  741 +msgstr ""
  742 +
  743 +#: app/helpers/features_helper.rb:5
  744 +msgid "Administrator assigns validator organizations per region."
  745 +msgstr ""
  746 +
  747 +#: app/helpers/application_helper.rb:60
513 msgid "Help" 748 msgid "Help"
514 msgstr "Ajuda" 749 msgstr "Ajuda"
515 750
516 -#: app/helpers/application_helper.rb:114 751 +#: app/helpers/application_helper.rb:61
  752 +msgid "Close"
  753 +msgstr "Fechar"
  754 +
  755 +#: app/helpers/application_helper.rb:117
517 msgid "My account" 756 msgid "My account"
518 msgstr "Minha conta" 757 msgstr "Minha conta"
519 758
520 -#: app/helpers/application_helper.rb:115 759 +#: app/helpers/application_helper.rb:118
  760 +#, fuzzy
  761 +msgid "My Enterprises"
  762 +msgstr "Novo empreendimento"
  763 +
  764 +#: app/helpers/application_helper.rb:119
  765 +#: app/views/environment_role_manager/make_admin.rhtml:4
521 msgid "Admin" 766 msgid "Admin"
522 msgstr "Administrador" 767 msgstr "Administrador"
523 768
524 -#: app/helpers/application_helper.rb:133 app/views/account/login.rhtml:1 769 +#: app/helpers/application_helper.rb:120 app/helpers/application_helper.rb:126
  770 +msgid "About"
  771 +msgstr "Sobre"
  772 +
  773 +#: app/helpers/application_helper.rb:144 app/views/account/login.rhtml:1
525 msgid "Login" 774 msgid "Login"
526 msgstr "Entrar" 775 msgstr "Entrar"
527 776
528 -#: app/helpers/application_helper.rb:137 777 +#: app/helpers/application_helper.rb:148
529 msgid "Not a user yet? Register now!" 778 msgid "Not a user yet? Register now!"
530 msgstr "Ainda não é usuário? Registre-se agora!" 779 msgstr "Ainda não é usuário? Registre-se agora!"
531 780
532 -#: app/helpers/application_helper.rb:141 781 +#: app/helpers/application_helper.rb:152
533 msgid "Logout" 782 msgid "Logout"
534 msgstr "Sair" 783 msgstr "Sair"
535 784
536 -#: app/helpers/application_helper.rb:148 785 +#: app/helpers/application_helper.rb:166
  786 +#, fuzzy
  787 +msgid "Features"
  788 +msgstr "Alguma funcionalidade"
  789 +
  790 +#: app/helpers/application_helper.rb:167
  791 +#, fuzzy
  792 +msgid "Edit visual"
  793 +msgstr "perfil"
  794 +
  795 +#: app/helpers/application_helper.rb:168
  796 +#, fuzzy
  797 +msgid "Manage categories"
  798 +msgstr "Gerenciar categorias"
  799 +
  800 +#: app/helpers/application_helper.rb:169
  801 +#, fuzzy
  802 +msgid "Manage permissions"
  803 +msgstr "Permissões: "
  804 +
  805 +#: app/helpers/application_helper.rb:170
  806 +#, fuzzy
  807 +msgid "Manage validators"
  808 +msgstr "Gerenciar categorias"
  809 +
  810 +#: app/helpers/application_helper.rb:176
  811 +#: app/views/membership_editor/index.rhtml:16
  812 +msgid "New enterprise"
  813 +msgstr "Novo empreendimento"
  814 +
  815 +#: app/helpers/application_helper.rb:182 app/helpers/application_helper.rb:191
  816 +#, fuzzy
  817 +msgid "Edit visual design"
  818 +msgstr "Editar o design visual"
  819 +
  820 +#: app/helpers/application_helper.rb:184 app/helpers/application_helper.rb:193
  821 +#, fuzzy
  822 +msgid "Manage content"
  823 +msgstr "Gerenciar conteúdo."
  824 +
  825 +#: app/helpers/application_helper.rb:192
  826 +#, fuzzy
  827 +msgid "Edit informations"
  828 +msgstr "Editar informações do empreendimento"
  829 +
  830 +#: app/helpers/application_helper.rb:194
  831 +msgid "Exclude"
  832 +msgstr ""
  833 +
  834 +#: app/helpers/application_helper.rb:200
  835 +#: app/views/account/new_password.rhtml:13
  836 +#: app/views/account/change_password.rhtml:1
  837 +#: app/views/account/change_password.rhtml:14
  838 +msgid "Change password"
  839 +msgstr "Alterar senha"
  840 +
  841 +#: app/helpers/application_helper.rb:206
  842 +msgid "Report bug"
  843 +msgstr ""
  844 +
  845 +#: app/helpers/application_helper.rb:212
  846 +#, fuzzy
  847 +msgid "Change template"
  848 +msgstr "Alterar senha"
  849 +
  850 +#: app/helpers/application_helper.rb:213
  851 +msgid "Change block theme"
  852 +msgstr ""
  853 +
  854 +#: app/helpers/application_helper.rb:214
  855 +#, fuzzy
  856 +msgid "Change icon theme"
  857 +msgstr "Gerenciar conteúdo."
  858 +
  859 +#: app/helpers/application_helper.rb:247 app/helpers/application_helper.rb:250
  860 +msgid "Accessibility"
  861 +msgstr ""
  862 +
  863 +#: app/helpers/application_helper.rb:257
537 msgid "%s, version %s" 864 msgid "%s, version %s"
538 msgstr "%s, versão %s" 865 msgstr "%s, versão %s"
539 866
540 -#: app/helpers/application_helper.rb:213 867 +#: app/helpers/application_helper.rb:327
541 msgid "No Filter at all" 868 msgid "No Filter at all"
542 msgstr "Sem qualquer filtro" 869 msgstr "Sem qualquer filtro"
543 870
544 -#: app/helpers/application_helper.rb:214 871 +#: app/helpers/application_helper.rb:328
545 msgid "RDoc filter" 872 msgid "RDoc filter"
546 msgstr "Filtro RDoc" 873 msgstr "Filtro RDoc"
547 874
548 -#: app/helpers/application_helper.rb:215 875 +#: app/helpers/application_helper.rb:329
549 msgid "Simple" 876 msgid "Simple"
550 msgstr "Simples" 877 msgstr "Simples"
551 878
552 -#: app/helpers/application_helper.rb:216 879 +#: app/helpers/application_helper.rb:330
553 msgid "Textile" 880 msgid "Textile"
554 msgstr "Textile" 881 msgstr "Textile"
555 882
@@ -681,7 +1008,9 @@ msgstr &quot;&quot; @@ -681,7 +1008,9 @@ msgstr &quot;&quot;
681 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6 1008 #: app/views/enterprise_editor/edit.rhtml:8 app/views/manage_tags/new.rhtml:6
682 #: app/views/manage_tags/edit.rhtml:6 1009 #: app/views/manage_tags/edit.rhtml:6
683 #: app/views/membership_editor/new_enterprise.rhtml:13 1010 #: app/views/membership_editor/new_enterprise.rhtml:13
684 -#: app/views/categories/_form.rhtml:12 1011 +#: app/views/enterprise_registration/basic_information.rhtml:33
  1012 +#: app/views/environment_role_manager/change_role.rhtml:12
  1013 +#: app/views/categories/_form.rhtml:17
685 msgid "Cancel" 1014 msgid "Cancel"
686 msgstr "Cancelar" 1015 msgstr "Cancelar"
687 1016
@@ -795,7 +1124,8 @@ msgstr &quot;Permissões: &quot; @@ -795,7 +1124,8 @@ msgstr &quot;Permissões: &quot;
795 1124
796 #: app/views/role/_form.rhtml:12 1125 #: app/views/role/_form.rhtml:12
797 #: app/views/profile_members/change_role.rhtml:11 1126 #: app/views/profile_members/change_role.rhtml:11
798 -#: app/views/features/_features_table.rhtml:9 1127 +#: app/views/features/_features_table.rhtml:15
  1128 +#: app/views/environment_role_manager/change_role.rhtml:11
799 msgid "Save changes" 1129 msgid "Save changes"
800 msgstr "Salvar alterações" 1130 msgstr "Salvar alterações"
801 1131
@@ -813,6 +1143,8 @@ msgstr &quot;Permissões: &quot; @@ -813,6 +1143,8 @@ msgstr &quot;Permissões: &quot;
813 #: app/views/profile_members/index.rhtml:13 1143 #: app/views/profile_members/index.rhtml:13
814 #: app/views/enterprise_editor/index.rhtml:23 1144 #: app/views/enterprise_editor/index.rhtml:23
815 #: app/views/manage_tags/search.rhtml:12 1145 #: app/views/manage_tags/search.rhtml:12
  1146 +#: app/views/environment_role_manager/affiliate.rhtml:9
  1147 +#: app/views/environment_role_manager/index.rhtml:13
816 msgid "Back" 1148 msgid "Back"
817 msgstr "Voltar" 1149 msgstr "Voltar"
818 1150
@@ -831,14 +1163,18 @@ msgid &quot;Destroy&quot; @@ -831,14 +1163,18 @@ msgid &quot;Destroy&quot;
831 msgstr "Destruir" 1163 msgstr "Destruir"
832 1164
833 #: app/views/profile_members/change_role.rhtml:1 1165 #: app/views/profile_members/change_role.rhtml:1
  1166 +#: app/views/environment_role_manager/change_role.rhtml:1
834 msgid "Changing role of %s" 1167 msgid "Changing role of %s"
835 msgstr "Mudando papel de %s" 1168 msgstr "Mudando papel de %s"
836 1169
837 #: app/views/profile_members/change_role.rhtml:5 1170 #: app/views/profile_members/change_role.rhtml:5
  1171 +#: app/views/environment_role_manager/change_role.rhtml:5
  1172 +#: app/views/environment_role_manager/make_admin.rhtml:8
838 msgid "Roles: " 1173 msgid "Roles: "
839 msgstr "Papéis:" 1174 msgstr "Papéis:"
840 1175
841 #: app/views/profile_members/affiliate.rhtml:6 1176 #: app/views/profile_members/affiliate.rhtml:6
  1177 +#: app/views/environment_role_manager/affiliate.rhtml:6
842 msgid "Affiliate" 1178 msgid "Affiliate"
843 msgstr "Afiliar" 1179 msgstr "Afiliar"
844 1180
@@ -851,13 +1187,73 @@ msgid &quot;Affiliate yourself&quot; @@ -851,13 +1187,73 @@ msgid &quot;Affiliate yourself&quot;
851 msgstr "Afiliar-se" 1187 msgstr "Afiliar-se"
852 1188
853 #: app/views/profile_members/index.rhtml:8 1189 #: app/views/profile_members/index.rhtml:8
  1190 +#: app/views/environment_role_manager/index.rhtml:8
854 msgid "Edit member role" 1191 msgid "Edit member role"
855 msgstr "Editar papel do membro" 1192 msgstr "Editar papel do membro"
856 1193
857 #: app/views/profile_members/index.rhtml:9 1194 #: app/views/profile_members/index.rhtml:9
  1195 +#: app/views/environment_role_manager/index.rhtml:9
858 msgid "Remove member" 1196 msgid "Remove member"
859 msgstr "Remover membro" 1197 msgstr "Remover membro"
860 1198
  1199 +#: app/views/task_mailer/task_created.text.plain.rhtml:1
  1200 +#: app/views/task_mailer/task_finished.text.plain.rhtml:1
  1201 +#: app/views/task_mailer/task_cancelled.text.plain.rhtml:1
  1202 +msgid "Dear %s,"
  1203 +msgstr ""
  1204 +
  1205 +#: app/views/task_mailer/task_created.text.plain.rhtml:6
  1206 +#: app/views/task_mailer/task_finished.text.plain.rhtml:6
  1207 +#: app/views/task_mailer/task_cancelled.text.plain.rhtml:6
  1208 +#, fuzzy
  1209 +msgid "%s environment system"
  1210 +msgstr "comunidade virtual"
  1211 +
  1212 +#: app/views/region_validators/_search.rhtml:8
  1213 +msgid "Adicionar"
  1214 +msgstr ""
  1215 +
  1216 +#: app/views/region_validators/region.rhtml:1
  1217 +msgid "Validators for region %s"
  1218 +msgstr ""
  1219 +
  1220 +#: app/views/region_validators/region.rhtml:3
  1221 +#, fuzzy
  1222 +msgid "Current validators"
  1223 +msgstr "Senha atual"
  1224 +
  1225 +#: app/views/region_validators/region.rhtml:9
  1226 +msgid "Remove validation rights"
  1227 +msgstr ""
  1228 +
  1229 +#: app/views/region_validators/region.rhtml:14
  1230 +msgid "Add new validators"
  1231 +msgstr ""
  1232 +
  1233 +#: app/views/region_validators/region.rhtml:17
  1234 +msgid ""
  1235 +"First search organizations by their name, then use the buttons in the search "
  1236 +"result to add them as validators for this region. "
  1237 +msgstr ""
  1238 +
  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
  1248 +msgid "1 validator"
  1249 +msgid_plural "%{num} validators."
  1250 +msgstr[0] ""
  1251 +msgstr[1] ""
  1252 +
  1253 +#: app/views/region_validators/index.rhtml:1
  1254 +msgid "Validators by Region"
  1255 +msgstr ""
  1256 +
861 #: app/views/content_viewer/view_page.rhtml:4 1257 #: app/views/content_viewer/view_page.rhtml:4
862 #: app/views/manage_tags/list.rhtml:17 1258 #: app/views/manage_tags/list.rhtml:17
863 msgid "Up" 1259 msgid "Up"
@@ -867,16 +1263,16 @@ msgstr &quot;Acima&quot; @@ -867,16 +1263,16 @@ msgstr &quot;Acima&quot;
867 msgid "There is no such page: %s" 1263 msgid "There is no such page: %s"
868 msgstr "Não há página: %s" 1264 msgstr "Não há página: %s"
869 1265
870 -#: app/views/layouts/application.rhtml:37  
871 -#: app/views/layouts/comatose_admin.rhtml:37  
872 -msgid "Close"  
873 -msgstr "Fechar"  
874 -  
875 -#: app/views/layouts/application.rhtml:42  
876 -#: app/views/layouts/comatose_admin.rhtml:42 1266 +#: app/views/layouts/application.rhtml:60
  1267 +#: app/views/layouts/comatose_admin.rhtml:60
877 msgid "Image for Loading..." 1268 msgid "Image for Loading..."
878 msgstr "Imagem para Carregamento..." 1269 msgstr "Imagem para Carregamento..."
879 1270
  1271 +#: app/views/layouts/application.rhtml:81
  1272 +#: app/views/layouts/comatose_admin.rhtml:81
  1273 +msgid "Your search here ..."
  1274 +msgstr ""
  1275 +
880 #: app/views/enterprise_editor/_form.rhtml:1 1276 #: app/views/enterprise_editor/_form.rhtml:1
881 #: app/views/manage_tags/_form.rhtml:1 1277 #: app/views/manage_tags/_form.rhtml:1
882 #: app/views/membership_editor/_form.rhtml:1 1278 #: app/views/membership_editor/_form.rhtml:1
@@ -1088,11 +1484,6 @@ msgstr &quot;Filtrar pela tag pai da atual&quot; @@ -1088,11 +1484,6 @@ msgstr &quot;Filtrar pela tag pai da atual&quot;
1088 msgid "Create a new tag" 1484 msgid "Create a new tag"
1089 msgstr "Criar nova tag" 1485 msgstr "Criar nova tag"
1090 1486
1091 -#: app/views/manage_tags/_search_box.rhtml:4  
1092 -#: app/views/membership_editor/index.rhtml:4  
1093 -msgid "Search"  
1094 -msgstr "Busca"  
1095 -  
1096 #: app/views/manage_tags/edit.rhtml:1 1487 #: app/views/manage_tags/edit.rhtml:1
1097 msgid "Editing Tag" 1488 msgid "Editing Tag"
1098 msgstr "Editando tag" 1489 msgstr "Editando tag"
@@ -1102,14 +1493,17 @@ msgid &quot; enterprises found&quot; @@ -1102,14 +1493,17 @@ msgid &quot; enterprises found&quot;
1102 msgstr " empreendimento encontrado" 1493 msgstr " empreendimento encontrado"
1103 1494
1104 #: app/views/membership_editor/new_enterprise.rhtml:3 1495 #: app/views/membership_editor/new_enterprise.rhtml:3
  1496 +#: app/views/enterprise_registration/basic_information.rhtml:3
1105 msgid "Register enterprise" 1497 msgid "Register enterprise"
1106 msgstr "Registrar empreendimento" 1498 msgstr "Registrar empreendimento"
1107 1499
1108 #: app/views/membership_editor/new_enterprise.rhtml:5 1500 #: app/views/membership_editor/new_enterprise.rhtml:5
  1501 +#: app/views/enterprise_registration/basic_information.rhtml:5
1109 msgid "How to proceed" 1502 msgid "How to proceed"
1110 msgstr "Como proceder" 1503 msgstr "Como proceder"
1111 1504
1112 #: app/views/membership_editor/new_enterprise.rhtml:6 1505 #: app/views/membership_editor/new_enterprise.rhtml:6
  1506 +#: app/views/enterprise_registration/basic_information.rhtml:6
1113 msgid "" 1507 msgid ""
1114 "Fill the form and hit the Register button then the enterprise will be " 1508 "Fill the form and hit the Register button then the enterprise will be "
1115 "submitted for evaluation at the validation entitiy of your choice (within " 1509 "submitted for evaluation at the validation entitiy of your choice (within "
@@ -1126,6 +1520,7 @@ msgstr &quot;Identificador&quot; @@ -1126,6 +1520,7 @@ msgstr &quot;Identificador&quot;
1126 1520
1127 #: app/views/membership_editor/new_enterprise.rhtml:12 1521 #: app/views/membership_editor/new_enterprise.rhtml:12
1128 #: app/views/account/signup.rhtml:1 1522 #: app/views/account/signup.rhtml:1
  1523 +#: app/views/enterprise_registration/basic_information.rhtml:32
1129 msgid "Register" 1524 msgid "Register"
1130 msgstr "Registrar" 1525 msgstr "Registrar"
1131 1526
@@ -1137,10 +1532,6 @@ msgstr &quot;Listando associações em organizações&quot; @@ -1137,10 +1532,6 @@ msgstr &quot;Listando associações em organizações&quot;
1137 msgid "Manage" 1532 msgid "Manage"
1138 msgstr "Gerenciar" 1533 msgstr "Gerenciar"
1139 1534
1140 -#: app/views/membership_editor/index.rhtml:16  
1141 -msgid "New enterprise"  
1142 -msgstr "Novo empreendimento"  
1143 -  
1144 #: app/views/admin_panel/index.rhtml:1 1535 #: app/views/admin_panel/index.rhtml:1
1145 msgid "Administrator Panel" 1536 msgid "Administrator Panel"
1146 msgstr "Painel do Administrador" 1537 msgstr "Painel do Administrador"
@@ -1166,11 +1557,27 @@ msgstr &quot;Gerenciar categorias&quot; @@ -1166,11 +1557,27 @@ msgstr &quot;Gerenciar categorias&quot;
1166 msgid "Manage User roles" 1557 msgid "Manage User roles"
1167 msgstr "Gerencias papéis de usuários" 1558 msgstr "Gerencias papéis de usuários"
1168 1559
  1560 +#: app/views/admin_panel/index.rhtml:10
  1561 +msgid "Manage Validators by region"
  1562 +msgstr ""
  1563 +
1169 #: app/views/category/view.rhtml:1 1564 #: app/views/category/view.rhtml:1
1170 msgid "Category: %s" 1565 msgid "Category: %s"
1171 msgstr "Categoria: %s" 1566 msgstr "Categoria: %s"
1172 1567
1173 -#: app/views/account/login.rhtml:4 1568 +#: app/views/account/invalid_change_password_code.rhtml:1
  1569 +#, fuzzy
  1570 +msgid "Invalid change password code"
  1571 +msgstr "Alterar senha"
  1572 +
  1573 +#: app/views/account/invalid_change_password_code.rhtml:4
  1574 +msgid ""
  1575 +"The code you are using for password change is not valid. Please try to "
  1576 +"request password change using the <a href=\"%s\">\"I forgot my password\"</"
  1577 +"a> functionality."
  1578 +msgstr ""
  1579 +
  1580 +#: app/views/account/login.rhtml:4 app/views/account/forgot_password.rhtml:8
1174 msgid "Username" 1581 msgid "Username"
1175 msgstr "Nome de usuário" 1582 msgstr "Nome de usuário"
1176 1583
@@ -1178,6 +1585,52 @@ msgstr &quot;Nome de usuário&quot; @@ -1178,6 +1585,52 @@ msgstr &quot;Nome de usuário&quot;
1178 msgid "Password" 1585 msgid "Password"
1179 msgstr "Senha" 1586 msgstr "Senha"
1180 1587
  1588 +#: app/views/account/login.rhtml:20
  1589 +#, fuzzy
  1590 +msgid "I forgot my password"
  1591 +msgstr "Senha atual"
  1592 +
  1593 +#: app/views/account/password_recovery_sent.rhtml:1
  1594 +#: app/views/account/forgot_password.rhtml:1
  1595 +#, fuzzy
  1596 +msgid "Password recovery"
  1597 +msgstr "Senha"
  1598 +
  1599 +#: app/views/account/password_recovery_sent.rhtml:4
  1600 +msgid ""
  1601 +"An e-mail was just sent to your e-mail address, with instructions for "
  1602 +"changing your password. You should receive it in a few minutes."
  1603 +msgstr ""
  1604 +
  1605 +#: app/views/account/new_password.rhtml:1
  1606 +#: app/views/account/new_password.rhtml:11
  1607 +#, fuzzy
  1608 +msgid "Enter new password"
  1609 +msgstr "Nova senha"
  1610 +
  1611 +#: app/views/account/new_password.rhtml:4
  1612 +msgid "Hello, %s! Please enter your new password in the form below."
  1613 +msgstr ""
  1614 +
  1615 +#: app/views/account/new_password.rhtml:12
  1616 +#, fuzzy
  1617 +msgid "Confirm the new password"
  1618 +msgstr "Confirme sua nova senha"
  1619 +
  1620 +#: app/views/account/new_password_ok.rhtml:1
  1621 +#, fuzzy
  1622 +msgid "Password changed sucessfully"
  1623 +msgstr "Sua senha foi alterada com sucesso!"
  1624 +
  1625 +#: app/views/account/new_password_ok.rhtml:4
  1626 +#, fuzzy
  1627 +msgid "%s, your new password was successfully installed."
  1628 +msgstr "Sua senha foi alterada com sucesso!"
  1629 +
  1630 +#: app/views/account/new_password_ok.rhtml:8
  1631 +msgid "You can <a href='%s'>login</a> now."
  1632 +msgstr ""
  1633 +
1181 #: app/views/account/index_anonymous.rhtml:1 1634 #: app/views/account/index_anonymous.rhtml:1
1182 msgid "Identify yourself" 1635 msgid "Identify yourself"
1183 msgstr "Identifique-se" 1636 msgstr "Identifique-se"
@@ -1205,11 +1658,6 @@ msgstr &quot;&quot; @@ -1205,11 +1658,6 @@ msgstr &quot;&quot;
1205 "Se você ainda não é um usuário, você pode se registrar agora e se tornar um " 1658 "Se você ainda não é um usuário, você pode se registrar agora e se tornar um "
1206 "membro desse comunidade virtual." 1659 "membro desse comunidade virtual."
1207 1660
1208 -#: app/views/account/change_password.rhtml:1  
1209 -#: app/views/account/change_password.rhtml:14  
1210 -msgid "Change password"  
1211 -msgstr "Alterar senha"  
1212 -  
1213 #: app/views/account/change_password.rhtml:5 1661 #: app/views/account/change_password.rhtml:5
1214 msgid "Current password" 1662 msgid "Current password"
1215 msgstr "Senha atual" 1663 msgstr "Senha atual"
@@ -1226,6 +1674,22 @@ msgstr &quot;Confirme sua nova senha&quot; @@ -1226,6 +1674,22 @@ msgstr &quot;Confirme sua nova senha&quot;
1226 msgid "I accept the terms of use" 1674 msgid "I accept the terms of use"
1227 msgstr "Eu aceito os termos de uso" 1675 msgstr "Eu aceito os termos de uso"
1228 1676
  1677 +#: app/views/account/forgot_password.rhtml:5
  1678 +msgid ""
  1679 +"To change your password, please fill the form on this screen using yout "
  1680 +"username and your e-mail. You will receive a message at that e-mail address "
  1681 +"with a web address you can access to create a new password."
  1682 +msgstr ""
  1683 +
  1684 +#: app/views/account/forgot_password.rhtml:9
  1685 +#, fuzzy
  1686 +msgid "E-mail"
  1687 +msgstr "E-mail"
  1688 +
  1689 +#: app/views/account/forgot_password.rhtml:11
  1690 +msgid "Send change password procedure by e-mail"
  1691 +msgstr ""
  1692 +
1229 #: app/views/account/index.rhtml:1 1693 #: app/views/account/index.rhtml:1
1230 msgid "Account options" 1694 msgid "Account options"
1231 msgstr "Opções da conta" 1695 msgstr "Opções da conta"
@@ -1282,6 +1746,11 @@ msgstr &quot;&quot; @@ -1282,6 +1746,11 @@ msgstr &quot;&quot;
1282 "É sempre uma boa idéia fazer logout quando você terminar de usar a " 1746 "É sempre uma boa idéia fazer logout quando você terminar de usar a "
1283 "comunidade virtual." 1747 "comunidade virtual."
1284 1748
  1749 +#: app/views/features/_features_table.rhtml:12
  1750 +#, fuzzy
  1751 +msgid "Organization Approval Method"
  1752 +msgstr "Validado"
  1753 +
1285 #: app/views/features/index.rhtml:1 1754 #: app/views/features/index.rhtml:1
1286 msgid "Enable/Disable features" 1755 msgid "Enable/Disable features"
1287 msgstr "Habilitar/Desabilitar funcionalidades" 1756 msgstr "Habilitar/Desabilitar funcionalidades"
@@ -1308,6 +1777,10 @@ msgstr &quot;&quot; @@ -1308,6 +1777,10 @@ msgstr &quot;&quot;
1308 msgid "Access denied" 1777 msgid "Access denied"
1309 msgstr "Acesso negado" 1778 msgstr "Acesso negado"
1310 1779
  1780 +#: app/views/shared/categories_menu.rhtml:5
  1781 +msgid "Home"
  1782 +msgstr ""
  1783 +
1311 #: app/views/profile_editor/person_info.rhtml:1 1784 #: app/views/profile_editor/person_info.rhtml:1
1312 msgid "Edit person info" 1785 msgid "Edit person info"
1313 msgstr "Editar dados pessoais" 1786 msgstr "Editar dados pessoais"
@@ -1317,7 +1790,7 @@ msgid &quot;Contact Information&quot; @@ -1317,7 +1790,7 @@ msgid &quot;Contact Information&quot;
1317 msgstr "Informação de contato" 1790 msgstr "Informação de contato"
1318 1791
1319 #: app/views/profile_editor/person_info.rhtml:11 1792 #: app/views/profile_editor/person_info.rhtml:11
1320 -#: app/views/categories/_form.rhtml:11 1793 +#: app/views/categories/_form.rhtml:16
1321 msgid "Save" 1794 msgid "Save"
1322 msgstr "Salvar" 1795 msgstr "Salvar"
1323 1796
@@ -1326,8 +1799,9 @@ msgid &quot;My profile&quot; @@ -1326,8 +1799,9 @@ msgid &quot;My profile&quot;
1326 msgstr "Meu perfil" 1799 msgstr "Meu perfil"
1327 1800
1328 #: app/views/profile_editor/index.rhtml:7 1801 #: app/views/profile_editor/index.rhtml:7
1329 -msgid "Manage members"  
1330 -msgstr "Gerenciar membros" 1802 +#, fuzzy
  1803 +msgid "Edit Visual Design"
  1804 +msgstr "Editar o design visual"
1331 1805
1332 #: app/views/profile_editor/index.rhtml:9 1806 #: app/views/profile_editor/index.rhtml:9
1333 msgid "Menage content" 1807 msgid "Menage content"
@@ -1337,6 +1811,66 @@ msgstr &quot;Gerenciar conteúdo&quot; @@ -1337,6 +1811,66 @@ msgstr &quot;Gerenciar conteúdo&quot;
1337 msgid "Edit enterprise info" 1811 msgid "Edit enterprise info"
1338 msgstr "Editar informação de empreendimento" 1812 msgstr "Editar informação de empreendimento"
1339 1813
  1814 +#: app/views/enterprise_registration/basic_information.rhtml:27
  1815 +#, fuzzy
  1816 +msgid "Management information"
  1817 +msgstr "Informação de Gerenciamento"
  1818 +
  1819 +#: app/views/enterprise_registration/select_validator.rhtml:1
  1820 +msgid "Enterprise Registration: Select a validator organization"
  1821 +msgstr ""
  1822 +
  1823 +#: app/views/enterprise_registration/select_validator.rhtml:4
  1824 +msgid ""
  1825 +"Select one organization to validate your enterprise registration request. "
  1826 +"Check the provided information about their validation methodoly and criteria."
  1827 +msgstr ""
  1828 +
  1829 +#: app/views/enterprise_registration/select_validator.rhtml:15
  1830 +#, fuzzy
  1831 +msgid "Validation Methodology:"
  1832 +msgstr "Entidade de Validação"
  1833 +
  1834 +#: app/views/enterprise_registration/select_validator.rhtml:16
  1835 +msgid "Restrictions (if any):"
  1836 +msgstr ""
  1837 +
  1838 +#: app/views/enterprise_registration/select_validator.rhtml:20
  1839 +msgid "Confirm"
  1840 +msgstr ""
  1841 +
  1842 +#: app/views/enterprise_registration/confirmation.rhtml:1
  1843 +#, fuzzy
  1844 +msgid "Enterprise Registration completed"
  1845 +msgstr "Empreendimento não foi criado"
  1846 +
  1847 +#: app/views/enterprise_registration/confirmation.rhtml:4
  1848 +msgid ""
  1849 +"Your enterprise registration request was successfully registered. The "
  1850 +"validator organization you choose (%s) should get in touch with to start the "
  1851 +"validation process. As soon as the validators approve (or reject) your "
  1852 +"request, you will be notified by e-mail."
  1853 +msgstr ""
  1854 +
  1855 +#: app/views/enterprise_registration/confirmation.rhtml:8
  1856 +msgid "You can continue to browse this environment."
  1857 +msgstr ""
  1858 +
  1859 +#: app/views/environment_role_manager/make_admin.rhtml:1
  1860 +#: app/views/environment_role_manager/index.rhtml:3
  1861 +msgid "Make new admin"
  1862 +msgstr ""
  1863 +
  1864 +#: app/views/environment_role_manager/make_admin.rhtml:12
  1865 +#, fuzzy
  1866 +msgid "Make"
  1867 +msgstr "Gerenciar"
  1868 +
  1869 +#: app/views/environment_role_manager/index.rhtml:1
  1870 +#, fuzzy
  1871 +msgid "Listing Administrators"
  1872 +msgstr "Listando tags"
  1873 +
1340 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:8 1874 #: app/views/categories/new.rhtml:1 app/views/categories/index.rhtml:8
1341 msgid "New category" 1875 msgid "New category"
1342 msgstr "Nova categoria" 1876 msgstr "Nova categoria"
@@ -1365,6 +1899,59 @@ msgstr &quot;Editando %s&quot; @@ -1365,6 +1899,59 @@ msgstr &quot;Editando %s&quot;
1365 msgid "Categories" 1899 msgid "Categories"
1366 msgstr "Categorias" 1900 msgstr "Categorias"
1367 1901
  1902 +#~ msgid "Profile|Flexible template template"
  1903 +#~ msgstr "Modelo fexível modelo"
  1904 +
  1905 +#~ msgid "Profile|Flexible template theme"
  1906 +#~ msgstr "Modelo flexível tema"
  1907 +
  1908 +#~ msgid "Profile|Flexible template icon theme"
  1909 +#~ msgstr "Modelo flexível tema de ícones"
  1910 +
  1911 +#~ msgid "Profile|Validation entity"
  1912 +#~ msgstr "Entidade de validação"
  1913 +
  1914 +#~ msgid "Profile|Approved"
  1915 +#~ msgstr "Aprovado"
  1916 +
  1917 +#, fuzzy
  1918 +#~ msgid "Role|Name"
  1919 +#~ msgstr "Nome"
  1920 +
  1921 +#, fuzzy
  1922 +#~ msgid "Role|Permissions"
  1923 +#~ msgstr "Permissões: "
  1924 +
  1925 +#~ msgid "role assignment"
  1926 +#~ msgstr "atribuição de papéis"
  1927 +
  1928 +#, fuzzy
  1929 +#~ msgid "RoleAssignment|Person"
  1930 +#~ msgstr "atribuição de papéis"
  1931 +
  1932 +#, fuzzy
  1933 +#~ msgid "RoleAssignment|Role"
  1934 +#~ msgstr "atribuição de papéis"
  1935 +
  1936 +#, fuzzy
  1937 +#~ msgid "RoleAssignment|Resource"
  1938 +#~ msgstr "atribuição de papéis"
  1939 +
  1940 +#~ msgid "EnterpriseInfo|Approval status"
  1941 +#~ msgstr "Estado de aprovação"
  1942 +
  1943 +#~ msgid "EnterpriseInfo|Approval comments"
  1944 +#~ msgstr "Comentário de aprovação"
  1945 +
  1946 +#~ msgid "EnterpriseInfo|Enterprise"
  1947 +#~ msgstr "Empreendimento"
  1948 +
  1949 +#~ msgid "Blue"
  1950 +#~ msgstr "Azul"
  1951 +
  1952 +#~ msgid "Manage members"
  1953 +#~ msgstr "Gerenciar membros"
  1954 +
1368 #, fuzzy 1955 #, fuzzy
1369 #~ msgid "Profile|Virtual community" 1956 #~ msgid "Profile|Virtual community"
1370 #~ msgstr "Entidade de validação" 1957 #~ msgstr "Entidade de validação"
test/functional/search_controller_test.rb 0 → 100644
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +require 'search_controller'
  3 +
  4 +# Re-raise errors caught by the controller.
  5 +class SearchController; def rescue_action(e) raise e end; end
  6 +
  7 +class SearchControllerTest < Test::Unit::TestCase
  8 + def setup
  9 + @controller = SearchController.new
  10 + @request = ActionController::TestRequest.new
  11 + @response = ActionController::TestResponse.new
  12 + end
  13 +
  14 + # Replace this with your real tests.
  15 + def test_truth
  16 + assert true
  17 + end
  18 +end