Download as
Browse Code »

Commit d5b65a7379a2ebaf5c1b78d2e1de348f77ee4ad7

Authored by LeandroNunes
1 parent b24a88c0
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem111: updation pot and po file 

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