Download as
Browse Code »

Commit b24d0689c4d9a9af89572fac507438603503d372

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

ActionItem544: add block to list links 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2181 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 13 changed files with 2013 additions and 1174 deletions   Show diff stats
app/controllers/admin/environment_design_controller.rb
  Diff comments   View file @b24d068
... ... @@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3 3 protect 'edit_environment_design', :environment
4 4  
5 5 def available_blocks
6   - @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock ]
  6 + @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock ]
7 7 end
8 8  
9 9 end
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @b24d068
... ... @@ -130,7 +130,7 @@ module BoxesHelper
130 130 end
131 131  
132 132 if block.editable?
133   - buttons << lightbox_icon_button(:edit, _('Edit'), { :controller => 'profile_design', :action => 'edit', :id => block.id })
  133 + buttons << lightbox_icon_button(:edit, _('Edit'), { :action => 'edit', :id => block.id })
134 134 end
135 135  
136 136 if !block.main?
... ...
app/models/link_list_block.rb 0 → 100644
  Diff comments   View file @b24d068
... ... @@ -0,0 +1,25 @@
  1 +class LinkListBlock < Block
  2 +
  3 + settings_items :title, String
  4 + settings_items :links, Array, :default => []
  5 +
  6 + before_save do |block|
  7 + block.links = block.links.delete_if {|i| i[:name].blank? and i[:address].blank?}
  8 + end
  9 +
  10 + def self.description
  11 + _('Display a list of links.')
  12 + end
  13 +
  14 + def content
  15 + block_title(title) +
  16 + content_tag('ul',
  17 + links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_to(i[:name], i[:address]))}
  18 + )
  19 + end
  20 +
  21 + def editable?
  22 + true
  23 + end
  24 +
  25 +end
... ...
app/views/box_organizer/_link_list_block.rhtml 0 → 100644
  Diff comments   View file @b24d068
... ... @@ -0,0 +1,27 @@
  1 +<p>
  2 +<label for='block_title'><strong><%= _('Block title') %></strong></label>
  3 +<%= text_field_tag 'block[title]', @block.title %>
  4 +</p>
  5 +
  6 +<p>
  7 +<strong><%= _('Links') %></strong>
  8 +<div id='edit-link-list-block'>
  9 +<table id='links' class='noborder'>
  10 + <tr><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
  11 + <% for link in @block.links do %>
  12 + <tr>
  13 + <td><%= text_field_tag 'block[links][][name]', link[:name] %></td>
  14 + <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td>
  15 + </tr>
  16 + <% end %>
  17 + <tr>
  18 + <td><%= text_field_tag 'block[links][][name]' %></td>
  19 + <td class='cel-address'><%= text_field_tag 'block[links][][address]' %></td>
  20 + </tr>
  21 +</table>
  22 +</div>
  23 +</p>
  24 +
  25 +<%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
  26 + page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address')))
  27 +end %>
... ...
po/de/noosfero.po
  Diff comments   View file @b24d068
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.10.1\n"
10   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
  10 +"POT-Creation-Date: 2008-07-08 19:03-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"
... ... @@ -23,7 +23,7 @@ msgstr &quot;&quot;
23 23  
24 24 #: app/helpers/application_helper.rb:81
25 25 #: app/views/box_organizer/add_block.rhtml:18
26   -#: app/views/search/_search_form.rhtml:56
  26 +#: app/views/search/_search_form.rhtml:63
27 27 msgid "Close"
28 28 msgstr ""
29 29  
... ... @@ -31,61 +31,63 @@ msgstr &quot;&quot;
31 31 msgid "This is %s, version %s"
32 32 msgstr ""
33 33  
34   -#: app/helpers/application_helper.rb:318
35   -#: app/views/memberships/new_community.rhtml:12
36   -#: app/views/box_organizer/edit.rhtml:9
37   -#: app/views/admin_panel/site_info.rhtml:11
38   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
39   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
40   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
41   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
42   -msgid "Cancel"
43   -msgstr ""
44   -
45   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  34 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
46 35 msgid "Uncategorized product"
47 36 msgstr ""
48 37  
49   -#: app/helpers/application_helper.rb:366
  38 +#: app/helpers/application_helper.rb:252
50 39 msgid "No product"
51 40 msgstr ""
52 41  
53   -#: app/helpers/application_helper.rb:472
  42 +#: app/helpers/application_helper.rb:338
  43 +msgid "non registered gender"
  44 +msgstr ""
  45 +
  46 +#: app/helpers/application_helper.rb:338
  47 +#: app/views/profile_editor/_person.rhtml:5
  48 +msgid "Male"
  49 +msgstr ""
  50 +
  51 +#: app/helpers/application_helper.rb:338
  52 +#: app/views/profile_editor/_person.rhtml:5
  53 +msgid "Female"
  54 +msgstr ""
  55 +
  56 +#: app/helpers/application_helper.rb:366
54 57 msgid "Click on this icon to go to the <b>%s</b>'s home page"
55 58 msgstr ""
56 59  
57   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  60 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
58 61 #: app/views/content_viewer/view_page.rhtml:65
59 62 msgid "Categories"
60 63 msgstr ""
61 64  
62   -#: app/helpers/application_helper.rb:532
  65 +#: app/helpers/application_helper.rb:417
63 66 msgid "open"
64 67 msgstr ""
65 68  
66   -#: app/helpers/application_helper.rb:568
  69 +#: app/helpers/application_helper.rb:453
67 70 msgid "Search..."
68 71 msgstr ""
69 72  
70   -#: app/helpers/application_helper.rb:570
  73 +#: app/helpers/application_helper.rb:455
71 74 msgid "This is a search box. Click, write your query, and press enter to find"
72 75 msgstr ""
73 76  
74   -#: app/helpers/application_helper.rb:571
  77 +#: app/helpers/application_helper.rb:456
75 78 msgid "Click, write and press enter to find"
76 79 msgstr ""
77 80  
78   -#: app/helpers/application_helper.rb:577
  81 +#: app/helpers/application_helper.rb:462
79 82 #: app/views/region_validators/region.rhtml:23
80   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
81   -#: app/views/search/_sellers_form.rhtml:22
  83 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
82 84 #: app/views/search/_search_form.rhtml:16
83   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  85 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
84 86 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
85 87 msgid "Search"
86 88 msgstr ""
87 89  
88   -#: app/helpers/application_helper.rb:652
  90 +#: app/helpers/application_helper.rb:518
89 91 msgid "Are you sure you want to visit this web site?"
90 92 msgstr ""
91 93  
... ... @@ -97,6 +99,39 @@ msgstr &quot;&quot;
97 99 msgid "Display in map"
98 100 msgstr ""
99 101  
  102 +#: app/helpers/search_helper.rb:53
  103 +msgid "E-Mail: "
  104 +msgstr ""
  105 +
  106 +#: app/helpers/search_helper.rb:56
  107 +msgid "Phone(s): "
  108 +msgstr ""
  109 +
  110 +#: app/helpers/search_helper.rb:59
  111 +msgid "Location: "
  112 +msgstr ""
  113 +
  114 +#: app/helpers/search_helper.rb:62
  115 +msgid "Address: "
  116 +msgstr ""
  117 +
  118 +#: app/helpers/search_helper.rb:65
  119 +msgid "Products/Services: "
  120 +msgstr ""
  121 +
  122 +#: app/helpers/search_helper.rb:68
  123 +msgid "Distance: "
  124 +msgstr ""
  125 +
  126 +#: app/helpers/search_helper.rb:81
  127 +msgid "Previous"
  128 +msgstr ""
  129 +
  130 +#: app/helpers/search_helper.rb:81
  131 +#: app/views/enterprise_registration/basic_information.rhtml:32
  132 +msgid "Next"
  133 +msgstr ""
  134 +
100 135 #: app/helpers/dates_helper.rb:6
101 136 msgid "January"
102 137 msgstr ""
... ... @@ -145,47 +180,47 @@ msgstr &quot;&quot;
145 180 msgid "December"
146 181 msgstr ""
147 182  
148   -#: app/helpers/dates_helper.rb:23
149   -msgid "%d %B %Y"
  183 +#: app/helpers/dates_helper.rb:27
  184 +msgid "%{month} %{day}, %{year}"
150 185 msgstr ""
151 186  
152   -#: app/helpers/dates_helper.rb:32
  187 +#: app/helpers/dates_helper.rb:36
153 188 msgid "%d %B %Y, %H:%m"
154 189 msgstr ""
155 190  
156   -#: app/helpers/dates_helper.rb:42
  191 +#: app/helpers/dates_helper.rb:46
157 192 msgid "from %s to %s"
158 193 msgstr ""
159 194  
160   -#: app/helpers/dates_helper.rb:49
  195 +#: app/helpers/dates_helper.rb:53
161 196 msgid "Sunday"
162 197 msgstr ""
163 198  
164   -#: app/helpers/dates_helper.rb:50
  199 +#: app/helpers/dates_helper.rb:54
165 200 msgid "Monday"
166 201 msgstr ""
167 202  
168   -#: app/helpers/dates_helper.rb:51
  203 +#: app/helpers/dates_helper.rb:55
169 204 msgid "Tuesday"
170 205 msgstr ""
171 206  
172   -#: app/helpers/dates_helper.rb:52
  207 +#: app/helpers/dates_helper.rb:56
173 208 msgid "Wednesday"
174 209 msgstr ""
175 210  
176   -#: app/helpers/dates_helper.rb:53
  211 +#: app/helpers/dates_helper.rb:57
177 212 msgid "Thursday"
178 213 msgstr ""
179 214  
180   -#: app/helpers/dates_helper.rb:54
  215 +#: app/helpers/dates_helper.rb:58
181 216 msgid "Friday"
182 217 msgstr ""
183 218  
184   -#: app/helpers/dates_helper.rb:55
  219 +#: app/helpers/dates_helper.rb:59
185 220 msgid "Saturday"
186 221 msgstr ""
187 222  
188   -#: app/helpers/dates_helper.rb:71
  223 +#: app/helpers/dates_helper.rb:72
189 224 msgid "%{month} %{year}"
190 225 msgstr ""
191 226  
... ... @@ -207,32 +242,68 @@ msgid &quot;&quot;
207 242 "It does not affect the language of the content created by other users."
208 243 msgstr ""
209 244  
  245 +#: app/helpers/enterprise_homepage_helper.rb:6
  246 +#: app/views/enterprise_editor/index.rhtml:8
  247 +msgid "Contact person:"
  248 +msgstr ""
  249 +
  250 +#: app/helpers/enterprise_homepage_helper.rb:7
  251 +msgid "e-Mail:"
  252 +msgstr ""
  253 +
  254 +#: app/helpers/enterprise_homepage_helper.rb:8
  255 +msgid "Phone(s):"
  256 +msgstr ""
  257 +
  258 +#: app/helpers/enterprise_homepage_helper.rb:9
  259 +msgid "Location:"
  260 +msgstr ""
  261 +
  262 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  263 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  264 +msgid "Address:"
  265 +msgstr ""
  266 +
  267 +#: app/helpers/enterprise_homepage_helper.rb:11
  268 +msgid "Legal form:"
  269 +msgstr ""
  270 +
  271 +#: app/helpers/enterprise_homepage_helper.rb:12
  272 +#: app/views/enterprise_editor/index.rhtml:10
  273 +msgid "Foundation year:"
  274 +msgstr ""
  275 +
  276 +#: app/helpers/enterprise_homepage_helper.rb:13
  277 +#: app/views/enterprise_editor/index.rhtml:12
  278 +msgid "Economic activity:"
  279 +msgstr ""
  280 +
  281 +#: app/helpers/enterprise_homepage_helper.rb:21
  282 +msgid "Distance:"
  283 +msgstr ""
  284 +
210 285 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
211 286 msgid "Main content"
212 287 msgstr ""
213 288  
214   -#: app/helpers/boxes_helper.rb:124
  289 +#: app/helpers/boxes_helper.rb:125
215 290 msgid "Move block up"
216 291 msgstr ""
217 292  
218   -#: app/helpers/boxes_helper.rb:125
  293 +#: app/helpers/boxes_helper.rb:129
219 294 msgid "Move block down"
220 295 msgstr ""
221 296  
222   -#: app/helpers/boxes_helper.rb:126
223   -msgid "Remove block"
224   -msgstr ""
225   -
226   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  297 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
227 298 #: app/views/manage_products/index.rhtml:14
228 299 #: app/views/manage_products/index.rhtml:40
229   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  300 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
230 301 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
231 302 msgid "Edit"
232 303 msgstr ""
233 304  
234   -#: app/helpers/profile_helper.rb:7
235   -msgid "edit your information"
  305 +#: app/helpers/boxes_helper.rb:137
  306 +msgid "Remove block"
236 307 msgstr ""
237 308  
238 309 #: app/helpers/tags_helper.rb:33
... ... @@ -255,6 +326,24 @@ msgstr &quot;&quot;
255 326 msgid "Administrator assigns validator organizations per region."
256 327 msgstr ""
257 328  
  329 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  330 +#: app/views/box_organizer/edit.rhtml:9
  331 +#: app/views/admin_panel/site_info.rhtml:11
  332 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  333 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  334 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  335 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  336 +msgid "Cancel"
  337 +msgstr ""
  338 +
  339 +#: app/helpers/forms_helper.rb:64
  340 +msgid "State:"
  341 +msgstr ""
  342 +
  343 +#: app/helpers/forms_helper.rb:65
  344 +msgid "City:"
  345 +msgstr ""
  346 +
258 347 #: app/helpers/categories_helper.rb:6
259 348 msgid "Do not display at the menu"
260 349 msgstr ""
... ... @@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
296 385 msgstr ""
297 386  
298 387 #: app/helpers/assets_helper.rb:7
299   -#: app/controllers/public/search_controller.rb:92
  388 +#: app/controllers/public/search_controller.rb:133
300 389 msgid "Articles"
301 390 msgstr ""
302 391  
303 392 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
304   -#: app/controllers/public/search_controller.rb:94
  393 +#: app/controllers/public/search_controller.rb:135
305 394 msgid "People"
306 395 msgstr ""
307 396  
308   -#: app/helpers/assets_helper.rb:9
309   -#: app/controllers/public/search_controller.rb:96
310   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  397 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  398 +#: app/controllers/public/search_controller.rb:137
  399 +#: app/views/search/_sellers_form.rhtml:7
311 400 msgid "Products"
312 401 msgstr ""
313 402  
314 403 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
315   -#: app/controllers/public/search_controller.rb:93
  404 +#: app/controllers/public/search_controller.rb:134
316 405 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
317 406 msgid "Enterprises"
318 407 msgstr ""
319 408  
320 409 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
321   -#: app/controllers/public/search_controller.rb:95
  410 +#: app/controllers/public/search_controller.rb:136
322 411 #: app/views/profile/index.rhtml:22
323 412 msgid "Communities"
324 413 msgstr ""
325 414  
326 415 #: app/helpers/assets_helper.rb:12
327   -#: app/controllers/public/search_controller.rb:97
  416 +#: app/controllers/public/search_controller.rb:138
328 417 msgid "Events"
329 418 msgstr ""
330 419  
331 420 #: app/models/enterprise.rb:5 app/models/product.rb:-
  421 +#: app/views/search/enterprises.rhtml:5
332 422 msgid "Enterprise"
333 423 msgstr ""
334 424  
... ... @@ -336,37 +426,37 @@ msgstr &quot;&quot;
336 426 msgid "Community"
337 427 msgstr ""
338 428  
339   -#: app/models/organization.rb:43
  429 +#: app/models/organization.rb:41
340 430 msgid "Contact person"
341 431 msgstr ""
342 432  
343   -#: app/models/organization.rb:43 app/models/environment.rb:-
  433 +#: app/models/organization.rb:41 app/models/environment.rb:-
344 434 msgid "Contact email"
345 435 msgstr ""
346 436  
347   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  437 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
348 438 #: app/views/enterprise_validation/_details.rhtml:19
349 439 msgid "Acronym"
350 440 msgstr ""
351 441  
352   -#: app/models/organization.rb:43
  442 +#: app/models/organization.rb:41
353 443 msgid "Foundation year"
354 444 msgstr ""
355 445  
356   -#: app/models/organization.rb:43
  446 +#: app/models/organization.rb:41
357 447 msgid "Legal form"
358 448 msgstr ""
359 449  
360   -#: app/models/organization.rb:43
  450 +#: app/models/organization.rb:41
361 451 msgid "Economic activity"
362 452 msgstr ""
363 453  
364   -#: app/models/organization.rb:43
  454 +#: app/models/organization.rb:41
365 455 #: app/views/enterprise_registration/basic_information.rhtml:27
366 456 msgid "Management information"
367 457 msgstr ""
368 458  
369   -#: app/models/organization.rb:43
  459 +#: app/models/organization.rb:41
370 460 msgid "Validated"
371 461 msgstr ""
372 462  
... ... @@ -441,8 +531,12 @@ msgstr &quot;&quot;
441 531 msgid "The task was cancelled at %s"
442 532 msgstr ""
443 533  
  534 +#: app/models/link_list_block.rb:7
  535 +msgid "Display a list of links."
  536 +msgstr ""
  537 +
444 538 #: app/models/favorite_enterprises_block.rb:4
445   -#: app/views/profile_editor/index.rhtml:29
  539 +#: app/views/profile_editor/index.rhtml:31
446 540 msgid "Favorite Enterprises"
447 541 msgstr ""
448 542  
... ... @@ -637,6 +731,10 @@ msgstr &quot;&quot;
637 731 msgid "Virtual"
638 732 msgstr ""
639 733  
  734 +#: app/models/products_block.rb:16
  735 +msgid "View all products"
  736 +msgstr ""
  737 +
640 738 #: app/models/tags_block.rb:8
641 739 msgid "Block listing content count by tag"
642 740 msgstr ""
... ... @@ -647,8 +745,8 @@ msgid &quot;&quot;
647 745 " Try to add some tags to some articles and see your tag cloud to grow."
648 746 msgstr ""
649 747  
650   -#: app/models/tags_block.rb:17
651   -msgid "%s's tags"
  748 +#: app/models/tags_block.rb:20
  749 +msgid "tags"
652 750 msgstr ""
653 751  
654 752 #: app/models/friendship.rb:-
... ... @@ -742,7 +840,7 @@ msgstr &quot;&quot;
742 840 msgid "Manage products"
743 841 msgstr ""
744 842  
745   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  843 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
746 844 msgid "Manage friends"
747 845 msgstr ""
748 846  
... ... @@ -754,25 +852,25 @@ msgstr &quot;&quot;
754 852 msgid "Perform task"
755 853 msgstr ""
756 854  
757   -#: app/models/profile.rb:144
  855 +#: app/models/profile.rb:155
758 856 msgid "An existing profile cannot be renamed."
759 857 msgstr ""
760 858  
761   -#: app/models/profile.rb:299
  859 +#: app/models/profile.rb:319
762 860 msgid "%s's home page"
763 861 msgstr ""
764 862  
765   -#: app/models/profile.rb:299
  863 +#: app/models/profile.rb:319
766 864 msgid ""
767 865 "<p>This is a default homepage created for %s. It can be changed though the "
768 866 "control panel.</p>"
769 867 msgstr ""
770 868  
771   -#: app/models/profile.rb:318
  869 +#: app/models/profile.rb:338
772 870 msgid "%s can't has members"
773 871 msgstr ""
774 872  
775   -#: app/models/profile.rb:335
  873 +#: app/models/profile.rb:355
776 874 msgid "%s can't has moderators"
777 875 msgstr ""
778 876  
... ... @@ -800,10 +898,6 @@ msgstr &quot;&quot;
800 898 msgid "%{fn} was already assigned to another category."
801 899 msgstr ""
802 900  
803   -#: app/models/category.rb:13
804   -msgid "%{fn} must be the same as the parents'"
805   -msgstr ""
806   -
807 901 #: app/models/article_block.rb:4
808 902 msgid "Display one of your contents."
809 903 msgstr ""
... ... @@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
1009 1103 msgstr ""
1010 1104  
1011 1105 #: app/models/profile_list_block.rb:75
1012   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1106 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1013 1107 msgid "None"
1014 1108 msgstr ""
1015 1109  
... ... @@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
1053 1147 msgid "thumbnail"
1054 1148 msgstr ""
1055 1149  
  1150 +#: app/models/enterprise_homepage.rb:4
  1151 +msgid "Enterprise homepage."
  1152 +msgstr ""
  1153 +
  1154 +#: app/models/enterprise_homepage.rb:8
  1155 +msgid "Display the summary of profile."
  1156 +msgstr ""
  1157 +
1056 1158 #: app/models/sellers_search_block.rb:4
1057 1159 msgid "A search for enterprises by products selled and local"
1058 1160 msgstr ""
... ... @@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
1375 1477 msgid "URL:"
1376 1478 msgstr ""
1377 1479  
1378   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1379   -#: app/views/cms/_event.rhtml:12
1380   -msgid "Address:"
1381   -msgstr ""
1382   -
1383 1480 #: app/models/event.rb:77
1384 1481 msgid "When:"
1385 1482 msgstr ""
... ... @@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
1457 1554 msgid "%s still needs to accept being your friend."
1458 1555 msgstr ""
1459 1556  
1460   -#: app/controllers/my_profile/cms_controller.rb:97
  1557 +#: app/controllers/my_profile/cms_controller.rb:103
1461 1558 msgid "Article \"%s\" configured as home page."
1462 1559 msgstr ""
1463 1560  
... ... @@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
1525 1622 msgid "This action is not available for \"%s\"."
1526 1623 msgstr ""
1527 1624  
1528   -#: app/controllers/public/search_controller.rb:182
1529   -msgid "Newer profiles"
  1625 +#: app/controllers/public/search_controller.rb:196
  1626 +msgid "Newer people"
1530 1627 msgstr ""
1531 1628  
1532   -#: app/controllers/public/search_controller.rb:183
1533   -msgid "Newer communities"
  1629 +#: app/controllers/public/search_controller.rb:197
  1630 +msgid "Newer enterprises"
1534 1631 msgstr ""
1535 1632  
1536   -#: app/controllers/public/search_controller.rb:184
1537   -msgid "Newer articles"
  1633 +#: app/controllers/public/search_controller.rb:199
  1634 +msgid "Upcoming events"
1538 1635 msgstr ""
1539 1636  
1540   -#: app/controllers/public/search_controller.rb:185
1541   -msgid "Most commented articles"
  1637 +#: app/controllers/public/search_controller.rb:200
  1638 +msgid "Newer communities"
1542 1639 msgstr ""
1543 1640  
1544   -#: app/controllers/public/search_controller.rb:186
1545   -msgid "Newer enterprises"
  1641 +#: app/controllers/public/search_controller.rb:201
  1642 +msgid "Newer articles"
1546 1643 msgstr ""
1547 1644  
1548   -#: app/controllers/public/search_controller.rb:187
1549   -msgid "Near events TODO"
  1645 +#: app/controllers/public/search_controller.rb:202
  1646 +msgid "Most commented articles"
1550 1647 msgstr ""
1551 1648  
1552   -#: app/controllers/public/account_controller.rb:21
  1649 +#: app/controllers/public/account_controller.rb:23
1553 1650 msgid "Logged in successfully"
1554 1651 msgstr ""
1555 1652  
1556   -#: app/controllers/public/account_controller.rb:23
  1653 +#: app/controllers/public/account_controller.rb:25
1557 1654 msgid "Incorrect username or password"
1558 1655 msgstr ""
1559 1656  
1560   -#: app/controllers/public/account_controller.rb:51
  1657 +#: app/controllers/public/account_controller.rb:53
1561 1658 msgid "Thanks for signing up!"
1562 1659 msgstr ""
1563 1660  
1564   -#: app/controllers/public/account_controller.rb:69
  1661 +#: app/controllers/public/account_controller.rb:71
1565 1662 msgid "You have been logged out."
1566 1663 msgstr ""
1567 1664  
1568   -#: app/controllers/public/account_controller.rb:80
  1665 +#: app/controllers/public/account_controller.rb:82
1569 1666 msgid "Your password has been changed successfully!"
1570 1667 msgstr ""
1571 1668  
1572   -#: app/controllers/public/account_controller.rb:83
  1669 +#: app/controllers/public/account_controller.rb:85
1573 1670 msgid "The supplied current password is incorrect."
1574 1671 msgstr ""
1575 1672  
... ... @@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
1626 1723 msgstr ""
1627 1724  
1628 1725 #: app/views/memberships/index.rhtml:26
1629   -#: app/views/profile_editor/index.rhtml:46
  1726 +#: app/views/profile_editor/index.rhtml:51
1630 1727 #: app/views/profile/enterprises.rhtml:15
1631 1728 msgid "Register a new Enterprise"
1632 1729 msgstr ""
1633 1730  
1634 1731 #: app/views/memberships/index.rhtml:27
1635   -#: app/views/profile_editor/index.rhtml:45
  1732 +#: app/views/profile_editor/index.rhtml:50
1636 1733 #: app/views/profile/communities.rhtml:15
1637 1734 msgid "Create a new community"
1638 1735 msgstr ""
... ... @@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
1926 2023 msgid "Add a block"
1927 2024 msgstr ""
1928 2025  
  2026 +#: app/views/box_organizer/_products_block.rhtml:5
  2027 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2028 +msgid "Select the products that must be shown."
  2029 +msgstr ""
  2030 +
1929 2031 #: app/views/box_organizer/edit.rhtml:1
1930 2032 msgid "Editing block"
1931 2033 msgstr ""
... ... @@ -2124,10 +2226,6 @@ msgid &quot;&quot;
2124 2226 "profile"
2125 2227 msgstr ""
2126 2228  
2127   -#: app/views/enterprise_registration/basic_information.rhtml:32
2128   -msgid "Next"
2129   -msgstr ""
2130   -
2131 2229 #: app/views/enterprise_editor/_form.rhtml:7
2132 2230 #: app/views/enterprise_validation/list_processed.rhtml:13
2133 2231 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
2174 2272 msgid "Contact phone:"
2175 2273 msgstr ""
2176 2274  
2177   -#: app/views/enterprise_editor/index.rhtml:8
2178   -msgid "Contact person:"
2179   -msgstr ""
2180   -
2181 2275 #: app/views/enterprise_editor/index.rhtml:9
2182 2276 msgid "Acronym:"
2183 2277 msgstr ""
2184 2278  
2185   -#: app/views/enterprise_editor/index.rhtml:10
2186   -msgid "Foundation year:"
2187   -msgstr ""
2188   -
2189 2279 #: app/views/enterprise_editor/index.rhtml:11
2190 2280 msgid "Legal Form:"
2191 2281 msgstr ""
2192 2282  
2193   -#: app/views/enterprise_editor/index.rhtml:12
2194   -msgid "Economic activity:"
2195   -msgstr ""
2196   -
2197 2283 #: app/views/enterprise_editor/index.rhtml:13
2198 2284 msgid "Management infomation:"
2199 2285 msgstr ""
... ... @@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
2234 2320 msgid "My profile"
2235 2321 msgstr ""
2236 2322  
2237   -#: app/views/profile_editor/index.rhtml:9
  2323 +#: app/views/profile_editor/index.rhtml:11
2238 2324 msgid "Edit Profile"
2239 2325 msgstr ""
2240 2326  
2241   -#: app/views/profile_editor/index.rhtml:11
  2327 +#: app/views/profile_editor/index.rhtml:13
2242 2328 msgid "Mail settings"
2243 2329 msgstr ""
2244 2330  
2245   -#: app/views/profile_editor/index.rhtml:13
  2331 +#: app/views/profile_editor/index.rhtml:15
2246 2332 msgid "Pending tasks"
2247 2333 msgstr ""
2248 2334  
2249   -#: app/views/profile_editor/index.rhtml:15
  2335 +#: app/views/profile_editor/index.rhtml:17
2250 2336 msgid "Edit Visual Design"
2251 2337 msgstr ""
2252 2338  
2253   -#: app/views/profile_editor/index.rhtml:17
  2339 +#: app/views/profile_editor/index.rhtml:19
2254 2340 msgid "Manage Content"
2255 2341 msgstr ""
2256 2342  
2257   -#: app/views/profile_editor/index.rhtml:19
  2343 +#: app/views/profile_editor/index.rhtml:21
2258 2344 msgid "Change Password"
2259 2345 msgstr ""
2260 2346  
2261   -#: app/views/profile_editor/index.rhtml:23
  2347 +#: app/views/profile_editor/index.rhtml:25
2262 2348 msgid "Manage Members"
2263 2349 msgstr ""
2264 2350  
2265   -#: app/views/profile_editor/index.rhtml:25
  2351 +#: app/views/profile_editor/index.rhtml:27
2266 2352 msgid "Manage Products and Services"
2267 2353 msgstr ""
2268 2354  
2269   -#: app/views/profile_editor/index.rhtml:27
  2355 +#: app/views/profile_editor/index.rhtml:29
2270 2356 msgid "Enterprise Validation"
2271 2357 msgstr ""
2272 2358  
2273   -#: app/views/profile_editor/index.rhtml:33
  2359 +#: app/views/profile_editor/index.rhtml:35
2274 2360 msgid "Disable Enterprise"
2275 2361 msgstr ""
2276 2362  
2277   -#: app/views/profile_editor/index.rhtml:35
  2363 +#: app/views/profile_editor/index.rhtml:37
2278 2364 msgid "Enable Enterprise"
2279 2365 msgstr ""
2280 2366  
2281   -#: app/views/profile_editor/index.rhtml:42
  2367 +#: app/views/profile_editor/index.rhtml:47
2282 2368 msgid "Manage my groups"
2283 2369 msgstr ""
2284 2370  
... ... @@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
2330 2416 msgstr ""
2331 2417  
2332 2418 #: app/views/profile_editor/_organization.rhtml:12
2333   -msgid "Closed organization"
2334   -msgstr ""
2335   -
2336   -#: app/views/profile_editor/_person.rhtml:5
2337   -msgid "Male"
2338   -msgstr ""
2339   -
2340   -#: app/views/profile_editor/_person.rhtml:5
2341   -msgid "Female"
  2419 +msgid ""
  2420 +"New members must be approved by an administrator before joining this group?"
2342 2421 msgstr ""
2343 2422  
2344 2423 #: app/views/profile_editor/enable.rhtml:1
... ... @@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
2419 2498 msgid "Homepage: "
2420 2499 msgstr ""
2421 2500  
2422   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2501 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2423 2502 msgid "Products/Services"
2424 2503 msgstr ""
2425 2504  
... ... @@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
2480 2559 msgstr ""
2481 2560  
2482 2561 #: app/views/search/products.rhtml:3
2483   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2562 +msgid ""
  2563 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2564 +"{category}\""
2484 2565 msgstr ""
2485 2566  
2486 2567 #: app/views/search/products.rhtml:3
2487   -msgid "Products results for \"%s\""
  2568 +msgid "Products and Services results for \"%s\""
  2569 +msgstr ""
  2570 +
  2571 +#: app/views/search/products.rhtml:5
  2572 +msgid "Products and Services of enterprises in \"%s\""
2488 2573 msgstr ""
2489 2574  
2490 2575 #: app/views/search/products.rhtml:5
2491   -msgid "Products of enterprises in \"%s\""
  2576 +msgid "Products and Services"
2492 2577 msgstr ""
2493 2578  
2494   -#: app/views/search/products.rhtml:10
  2579 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2495 2580 msgid "Within %s km from %s"
2496 2581 msgstr ""
2497 2582  
2498 2583 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2499   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2500   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2584 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2585 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2501 2586 msgid "Refine your search"
2502 2587 msgstr ""
2503 2588  
... ... @@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
2505 2590 msgid "by %{author} on \"%{article}\""
2506 2591 msgstr ""
2507 2592  
2508   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2509   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2510   -#: app/views/search/articles.rhtml:12
  2593 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2594 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2511 2595 msgid "Search results for \"%{query}\" in \"%{category}\""
2512 2596 msgstr ""
2513 2597  
2514   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2515   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2516   -#: app/views/search/articles.rhtml:12
  2598 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2599 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2517 2600 msgid "Search results for \"%s\""
2518 2601 msgstr ""
2519 2602  
2520   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2521   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2522   -msgid "(recently added)"
  2603 +#: app/views/search/_product_categories_menu.rhtml:13
  2604 +msgid "There is no sub-categories for %s."
2523 2605 msgstr ""
2524 2606  
2525   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2526   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2527   -msgid "Browse by name"
  2607 +#: app/views/search/_product_categories_menu.rhtml:15
  2608 +msgid "There is no categories."
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/search/enterprises.rhtml:3
  2612 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/search/enterprises.rhtml:3
  2616 +msgid "Enterprise results for \"%s\""
2528 2617 msgstr ""
2529 2618  
2530   -#: app/views/search/_directory.rhtml:2
2531   -msgid "Recent"
  2619 +#: app/views/search/enterprises.rhtml:5
  2620 +msgid "Enterprises in \"%s\""
2532 2621 msgstr ""
2533 2622  
2534   -#: app/views/search/_display_results.rhtml:18
2535   -msgid "more..."
  2623 +#: app/views/search/_display_results.rhtml:21
  2624 +msgid "see all (%d)"
  2625 +msgstr ""
  2626 +
  2627 +#: app/views/search/_display_results.rhtml:21
  2628 +msgid "see all..."
2536 2629 msgstr ""
2537 2630  
2538 2631 #: app/views/search/popup.rhtml:3
2539 2632 msgid "Search %s"
2540 2633 msgstr ""
2541 2634  
  2635 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2636 +#: app/views/search/articles.rhtml:11
  2637 +msgid "(recently added)"
  2638 +msgstr ""
  2639 +
  2640 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2641 +#: app/views/search/articles.rhtml:17
  2642 +msgid "Browse by name"
  2643 +msgstr ""
  2644 +
2542 2645 #: app/views/search/_sellers_form.rhtml:1
2543 2646 msgid "Search for sellers"
2544 2647 msgstr ""
... ... @@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
2547 2650 msgid "Search in:"
2548 2651 msgstr ""
2549 2652  
2550   -#: app/views/search/_sellers_form.rhtml:13
2551   -#: app/views/search/_search_form.rhtml:27
  2653 +#: app/views/search/_sellers_form.rhtml:17
2552 2654 msgid "Distance (km): "
2553 2655 msgstr ""
2554 2656  
2555   -#: app/views/search/_sellers_form.rhtml:16
2556   -#: app/views/search/_search_form.rhtml:28
2557   -msgid "From: "
2558   -msgstr ""
2559   -
2560   -#: app/views/search/_product.rhtml:10
  2657 +#: app/views/search/_product.rhtml:15
2561 2658 msgid "Price: %d"
2562 2659 msgstr ""
2563 2660  
2564   -#: app/views/search/_product.rhtml:12
  2661 +#: app/views/search/_product.rhtml:17
2565 2662 msgid "Suplier: %s"
2566 2663 msgstr ""
2567 2664  
... ... @@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
2581 2678 msgid "Search within:"
2582 2679 msgstr ""
2583 2680  
2584   -#: app/views/search/_search_form.rhtml:35
  2681 +#: app/views/search/_search_form.rhtml:28
  2682 +msgid "Distance (km):"
  2683 +msgstr ""
  2684 +
  2685 +#: app/views/search/_search_form.rhtml:33
  2686 +msgid "From:"
  2687 +msgstr ""
  2688 +
  2689 +#: app/views/search/_search_form.rhtml:42
2585 2690 msgid "Search for:"
2586 2691 msgstr ""
2587 2692  
2588   -#: app/views/search/_search_form.rhtml:49
  2693 +#: app/views/search/_search_form.rhtml:56
2589 2694 msgid "Advanced search"
2590 2695 msgstr ""
2591 2696  
... ... @@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
2597 2702 msgid "Last update: %s."
2598 2703 msgstr ""
2599 2704  
2600   -#: app/views/search/_google_maps.rhtml:48
  2705 +#: app/views/search/_google_maps.rhtml:68
2601 2706 msgid ""
2602 2707 "One or more items don't have geographical information, and won't be shown in "
2603 2708 "the map. Choose \"Display in list\" to see them."
... ... @@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
2655 2760 msgid "Join this enterprise"
2656 2761 msgstr ""
2657 2762  
2658   -#: app/views/blocks/profile_info.rhtml:6
  2763 +#: app/views/blocks/profile_info.rhtml:17
2659 2764 msgid "Since %{year}/%{month}"
2660 2765 msgstr ""
2661 2766  
2662   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  2767 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2663 2768 msgid "Homepage"
2664 2769 msgstr ""
2665 2770  
2666   -#: app/views/blocks/profile_info.rhtml:8
  2771 +#: app/views/blocks/profile_info.rhtml:19
2667 2772 msgid "View profile"
2668 2773 msgstr ""
2669 2774  
2670   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  2775 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2671 2776 msgid "Control panel"
2672 2777 msgstr ""
2673 2778  
... ... @@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
2792 2897 msgid "Properties"
2793 2898 msgstr ""
2794 2899  
2795   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  2900 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
2796 2901 msgid "Public view"
2797 2902 msgstr ""
2798 2903  
2799 2904 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  2905 +msgid "Use as homepage"
  2906 +msgstr ""
  2907 +
  2908 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
2800 2909 msgid "Delete"
2801 2910 msgstr ""
2802 2911  
2803   -#: app/views/cms/view.rhtml:42
  2912 +#: app/views/cms/view.rhtml:43
2804 2913 msgid ""
2805 2914 "Are you sure that you want to remove this folder? Note that all the items "
2806 2915 "inside it will also be removed!"
2807 2916 msgstr ""
2808 2917  
2809   -#: app/views/cms/view.rhtml:67
2810   -msgid "Use as homepage"
2811   -msgstr ""
2812   -
2813   -#: app/views/cms/view.rhtml:68
  2918 +#: app/views/cms/view.rhtml:69
2814 2919 msgid "Are you sure that you want to remove this item?"
2815 2920 msgstr ""
2816 2921  
... ... @@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
3412 3517 msgid "We need to be sure that you wrote correctly your password."
3413 3518 msgstr ""
3414 3519  
3415   -#: app/views/account/signup.rhtml:33
  3520 +#: app/views/account/signup.rhtml:35
3416 3521 #: app/views/account/activate_enterprise.rhtml:37
3417 3522 msgid "I accept the terms of use"
3418 3523 msgstr ""
3419 3524  
3420   -#: app/views/account/signup.rhtml:38
  3525 +#: app/views/account/signup.rhtml:40
3421 3526 #: app/views/account/activate_enterprise.rhtml:42
3422 3527 msgid "Sign up"
3423 3528 msgstr ""
... ...
po/fr/noosfero.po
  Diff comments   View file @b24d068
... ... @@ -6,7 +6,7 @@
6 6 msgid ""
7 7 msgstr ""
8 8 "Project-Id-Version: noosfero 0.10.1\n"
9   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
  9 +"POT-Creation-Date: 2008-07-08 19:03-0300\n"
10 10 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
11 11 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
12 12 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -23,7 +23,7 @@ msgstr &quot;Aide&quot;
23 23  
24 24 #: app/helpers/application_helper.rb:81
25 25 #: app/views/box_organizer/add_block.rhtml:18
26   -#: app/views/search/_search_form.rhtml:56
  26 +#: app/views/search/_search_form.rhtml:63
27 27 msgid "Close"
28 28 msgstr "Fermer"
29 29  
... ... @@ -31,63 +31,66 @@ msgstr &quot;Fermer&quot;
31 31 msgid "This is %s, version %s"
32 32 msgstr "Site sous %s, version %s"
33 33  
34   -#: app/helpers/application_helper.rb:318
35   -#: app/views/memberships/new_community.rhtml:12
36   -#: app/views/box_organizer/edit.rhtml:9
37   -#: app/views/admin_panel/site_info.rhtml:11
38   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
39   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
40   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
41   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
42   -msgid "Cancel"
43   -msgstr "Annuler"
44   -
45   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  34 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
46 35 msgid "Uncategorized product"
47 36 msgstr "Produit sans catégorie"
48 37  
49   -#: app/helpers/application_helper.rb:366
  38 +#: app/helpers/application_helper.rb:252
50 39 msgid "No product"
51 40 msgstr "Pas de produit"
52 41  
53   -#: app/helpers/application_helper.rb:472
  42 +#: app/helpers/application_helper.rb:338
  43 +#, fuzzy
  44 +msgid "non registered gender"
  45 +msgstr "Personnes enregistrées récemment"
  46 +
  47 +#: app/helpers/application_helper.rb:338
  48 +#: app/views/profile_editor/_person.rhtml:5
  49 +msgid "Male"
  50 +msgstr "Homme"
  51 +
  52 +#: app/helpers/application_helper.rb:338
  53 +#: app/views/profile_editor/_person.rhtml:5
  54 +msgid "Female"
  55 +msgstr "Femme"
  56 +
  57 +#: app/helpers/application_helper.rb:366
54 58 msgid "Click on this icon to go to the <b>%s</b>'s home page"
55 59 msgstr ""
56 60 "Cliquez sur cet icône pour vous rendre sur la page d'accueil de <b>%s</b>"
57 61  
58   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  62 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
59 63 #: app/views/content_viewer/view_page.rhtml:65
60 64 msgid "Categories"
61 65 msgstr "Catégories"
62 66  
63   -#: app/helpers/application_helper.rb:532
  67 +#: app/helpers/application_helper.rb:417
64 68 msgid "open"
65 69 msgstr "ouvrir"
66 70  
67   -#: app/helpers/application_helper.rb:568
  71 +#: app/helpers/application_helper.rb:453
68 72 #, fuzzy
69 73 msgid "Search..."
70 74 msgstr "Chercher"
71 75  
72   -#: app/helpers/application_helper.rb:570
  76 +#: app/helpers/application_helper.rb:455
73 77 msgid "This is a search box. Click, write your query, and press enter to find"
74 78 msgstr ""
75 79  
76   -#: app/helpers/application_helper.rb:571
  80 +#: app/helpers/application_helper.rb:456
77 81 msgid "Click, write and press enter to find"
78 82 msgstr ""
79 83  
80   -#: app/helpers/application_helper.rb:577
  84 +#: app/helpers/application_helper.rb:462
81 85 #: app/views/region_validators/region.rhtml:23
82   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
83   -#: app/views/search/_sellers_form.rhtml:22
  86 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
84 87 #: app/views/search/_search_form.rhtml:16
85   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  88 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
86 89 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
87 90 msgid "Search"
88 91 msgstr "Chercher"
89 92  
90   -#: app/helpers/application_helper.rb:652
  93 +#: app/helpers/application_helper.rb:518
91 94 msgid "Are you sure you want to visit this web site?"
92 95 msgstr "Êtes-vous sûr(e) de vouloir visiter ce site web ?"
93 96  
... ... @@ -99,6 +102,44 @@ msgstr &quot;&quot;
99 102 msgid "Display in map"
100 103 msgstr ""
101 104  
  105 +#: app/helpers/search_helper.rb:53
  106 +#, fuzzy
  107 +msgid "E-Mail: "
  108 +msgstr "Courrier électronique"
  109 +
  110 +#: app/helpers/search_helper.rb:56
  111 +msgid "Phone(s): "
  112 +msgstr ""
  113 +
  114 +#: app/helpers/search_helper.rb:59
  115 +#, fuzzy
  116 +msgid "Location: "
  117 +msgstr "Actions"
  118 +
  119 +#: app/helpers/search_helper.rb:62
  120 +#, fuzzy
  121 +msgid "Address: "
  122 +msgstr "Adresse :"
  123 +
  124 +#: app/helpers/search_helper.rb:65
  125 +#, fuzzy
  126 +msgid "Products/Services: "
  127 +msgstr "Prix"
  128 +
  129 +#: app/helpers/search_helper.rb:68
  130 +msgid "Distance: "
  131 +msgstr ""
  132 +
  133 +#: app/helpers/search_helper.rb:81
  134 +#, fuzzy
  135 +msgid "Previous"
  136 +msgstr "Produits"
  137 +
  138 +#: app/helpers/search_helper.rb:81
  139 +#: app/views/enterprise_registration/basic_information.rhtml:32
  140 +msgid "Next"
  141 +msgstr "Suivant"
  142 +
102 143 #: app/helpers/dates_helper.rb:6
103 144 msgid "January"
104 145 msgstr "Janvier"
... ... @@ -147,52 +188,50 @@ msgstr &quot;Novembre&quot;
147 188 msgid "December"
148 189 msgstr "Décembre"
149 190  
150   -# How is this used? (which function/method?)
151   -#: app/helpers/dates_helper.rb:23
152   -#, fuzzy
153   -msgid "%d %B %Y"
154   -msgstr "%d %B %Y"
  191 +#: app/helpers/dates_helper.rb:27
  192 +msgid "%{month} %{day}, %{year}"
  193 +msgstr ""
155 194  
156 195 # How is this used? (By which function/method?)
157   -#: app/helpers/dates_helper.rb:32
  196 +#: app/helpers/dates_helper.rb:36
158 197 #, fuzzy
159 198 msgid "%d %B %Y, %H:%m"
160 199 msgstr "%d %B %Y, %H:%m"
161 200  
162   -#: app/helpers/dates_helper.rb:42
  201 +#: app/helpers/dates_helper.rb:46
163 202 msgid "from %s to %s"
164 203 msgstr ""
165 204  
166   -#: app/helpers/dates_helper.rb:49
  205 +#: app/helpers/dates_helper.rb:53
167 206 msgid "Sunday"
168 207 msgstr ""
169 208  
170   -#: app/helpers/dates_helper.rb:50
  209 +#: app/helpers/dates_helper.rb:54
171 210 msgid "Monday"
172 211 msgstr ""
173 212  
174   -#: app/helpers/dates_helper.rb:51
  213 +#: app/helpers/dates_helper.rb:55
175 214 msgid "Tuesday"
176 215 msgstr ""
177 216  
178   -#: app/helpers/dates_helper.rb:52
  217 +#: app/helpers/dates_helper.rb:56
179 218 msgid "Wednesday"
180 219 msgstr ""
181 220  
182   -#: app/helpers/dates_helper.rb:53
  221 +#: app/helpers/dates_helper.rb:57
183 222 msgid "Thursday"
184 223 msgstr ""
185 224  
186   -#: app/helpers/dates_helper.rb:54
  225 +#: app/helpers/dates_helper.rb:58
187 226 #, fuzzy
188 227 msgid "Friday"
189 228 msgstr "Amis"
190 229  
191   -#: app/helpers/dates_helper.rb:55
  230 +#: app/helpers/dates_helper.rb:59
192 231 msgid "Saturday"
193 232 msgstr ""
194 233  
195   -#: app/helpers/dates_helper.rb:71
  234 +#: app/helpers/dates_helper.rb:72
196 235 msgid "%{month} %{year}"
197 236 msgstr ""
198 237  
... ... @@ -217,34 +256,72 @@ msgstr &quot;&quot;
217 256 "boutons, etc. Elle n'affecte pas la langue du contenu créé par d'autres "
218 257 "utilisateurs."
219 258  
  259 +#: app/helpers/enterprise_homepage_helper.rb:6
  260 +#: app/views/enterprise_editor/index.rhtml:8
  261 +msgid "Contact person:"
  262 +msgstr "Personne de contact : "
  263 +
  264 +#: app/helpers/enterprise_homepage_helper.rb:7
  265 +#, fuzzy
  266 +msgid "e-Mail:"
  267 +msgstr "Courrier électronique"
  268 +
  269 +#: app/helpers/enterprise_homepage_helper.rb:8
  270 +msgid "Phone(s):"
  271 +msgstr ""
  272 +
  273 +#: app/helpers/enterprise_homepage_helper.rb:9
  274 +#, fuzzy
  275 +msgid "Location:"
  276 +msgstr "Actions"
  277 +
  278 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  279 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  280 +msgid "Address:"
  281 +msgstr "Adresse :"
  282 +
  283 +#: app/helpers/enterprise_homepage_helper.rb:11
  284 +#, fuzzy
  285 +msgid "Legal form:"
  286 +msgstr "Forme juridique"
  287 +
  288 +#: app/helpers/enterprise_homepage_helper.rb:12
  289 +#: app/views/enterprise_editor/index.rhtml:10
  290 +msgid "Foundation year:"
  291 +msgstr "Année de création :"
  292 +
  293 +#: app/helpers/enterprise_homepage_helper.rb:13
  294 +#: app/views/enterprise_editor/index.rhtml:12
  295 +msgid "Economic activity:"
  296 +msgstr "Activité économique :"
  297 +
  298 +#: app/helpers/enterprise_homepage_helper.rb:21
  299 +msgid "Distance:"
  300 +msgstr ""
  301 +
220 302 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
221 303 msgid "Main content"
222 304 msgstr "Contenu principal"
223 305  
224   -#: app/helpers/boxes_helper.rb:124
  306 +#: app/helpers/boxes_helper.rb:125
225 307 msgid "Move block up"
226 308 msgstr "Vers le haut"
227 309  
228   -#: app/helpers/boxes_helper.rb:125
  310 +#: app/helpers/boxes_helper.rb:129
229 311 msgid "Move block down"
230 312 msgstr "Vers le bas"
231 313  
232   -#: app/helpers/boxes_helper.rb:126
233   -msgid "Remove block"
234   -msgstr "Effacer le bloc"
235   -
236   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  314 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
237 315 #: app/views/manage_products/index.rhtml:14
238 316 #: app/views/manage_products/index.rhtml:40
239   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  317 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
240 318 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
241 319 msgid "Edit"
242 320 msgstr "Éditer"
243 321  
244   -#: app/helpers/profile_helper.rb:7
245   -#, fuzzy
246   -msgid "edit your information"
247   -msgstr "Éditer vos informations"
  322 +#: app/helpers/boxes_helper.rb:137
  323 +msgid "Remove block"
  324 +msgstr "Effacer le bloc"
248 325  
249 326 #: app/helpers/tags_helper.rb:33
250 327 msgid "No tags yet."
... ... @@ -266,6 +343,26 @@ msgstr &quot;Toute nouvelle organisation doit être approuvée&quot;
266 343 msgid "Administrator assigns validator organizations per region."
267 344 msgstr "Les validateurs sont assignés par région par les administrateurs."
268 345  
  346 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  347 +#: app/views/box_organizer/edit.rhtml:9
  348 +#: app/views/admin_panel/site_info.rhtml:11
  349 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  350 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  351 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  352 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  353 +msgid "Cancel"
  354 +msgstr "Annuler"
  355 +
  356 +#: app/helpers/forms_helper.rb:64
  357 +#, fuzzy
  358 +msgid "State:"
  359 +msgstr "Statut"
  360 +
  361 +#: app/helpers/forms_helper.rb:65
  362 +#, fuzzy
  363 +msgid "City:"
  364 +msgstr "Groupe"
  365 +
269 366 #: app/helpers/categories_helper.rb:6
270 367 msgid "Do not display at the menu"
271 368 msgstr "Ne pas afficher dans le menu"
... ... @@ -307,39 +404,40 @@ msgid &quot;Type of category&quot;
307 404 msgstr "Type de catégorie"
308 405  
309 406 #: app/helpers/assets_helper.rb:7
310   -#: app/controllers/public/search_controller.rb:92
  407 +#: app/controllers/public/search_controller.rb:133
311 408 msgid "Articles"
312 409 msgstr "Articles"
313 410  
314 411 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
315   -#: app/controllers/public/search_controller.rb:94
  412 +#: app/controllers/public/search_controller.rb:135
316 413 msgid "People"
317 414 msgstr "Personnes"
318 415  
319   -#: app/helpers/assets_helper.rb:9
320   -#: app/controllers/public/search_controller.rb:96
321   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  416 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  417 +#: app/controllers/public/search_controller.rb:137
  418 +#: app/views/search/_sellers_form.rhtml:7
322 419 msgid "Products"
323 420 msgstr "Produits"
324 421  
325 422 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
326   -#: app/controllers/public/search_controller.rb:93
  423 +#: app/controllers/public/search_controller.rb:134
327 424 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
328 425 msgid "Enterprises"
329 426 msgstr "Entreprises"
330 427  
331 428 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
332   -#: app/controllers/public/search_controller.rb:95
  429 +#: app/controllers/public/search_controller.rb:136
333 430 #: app/views/profile/index.rhtml:22
334 431 msgid "Communities"
335 432 msgstr "Groupes"
336 433  
337 434 #: app/helpers/assets_helper.rb:12
338   -#: app/controllers/public/search_controller.rb:97
  435 +#: app/controllers/public/search_controller.rb:138
339 436 msgid "Events"
340 437 msgstr ""
341 438  
342 439 #: app/models/enterprise.rb:5 app/models/product.rb:-
  440 +#: app/views/search/enterprises.rhtml:5
343 441 msgid "Enterprise"
344 442 msgstr "Entreprise"
345 443  
... ... @@ -347,42 +445,42 @@ msgstr &quot;Entreprise&quot;
347 445 msgid "Community"
348 446 msgstr "Groupe"
349 447  
350   -#: app/models/organization.rb:43
  448 +#: app/models/organization.rb:41
351 449 #, fuzzy
352 450 msgid "Contact person"
353 451 msgstr "Personne de contact : "
354 452  
355   -#: app/models/organization.rb:43 app/models/environment.rb:-
  453 +#: app/models/organization.rb:41 app/models/environment.rb:-
356 454 #, fuzzy
357 455 msgid "Contact email"
358 456 msgstr "Téléphone de contact"
359 457  
360   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  458 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
361 459 #: app/views/enterprise_validation/_details.rhtml:19
362 460 msgid "Acronym"
363 461 msgstr "Sigle"
364 462  
365   -#: app/models/organization.rb:43
  463 +#: app/models/organization.rb:41
366 464 #, fuzzy
367 465 msgid "Foundation year"
368 466 msgstr "Année de création :"
369 467  
370   -#: app/models/organization.rb:43
  468 +#: app/models/organization.rb:41
371 469 #, fuzzy
372 470 msgid "Legal form"
373 471 msgstr "Forme juridique"
374 472  
375   -#: app/models/organization.rb:43
  473 +#: app/models/organization.rb:41
376 474 #, fuzzy
377 475 msgid "Economic activity"
378 476 msgstr "Activité économique :"
379 477  
380   -#: app/models/organization.rb:43
  478 +#: app/models/organization.rb:41
381 479 #: app/views/enterprise_registration/basic_information.rhtml:27
382 480 msgid "Management information"
383 481 msgstr "Information sur les dirigeants"
384 482  
385   -#: app/models/organization.rb:43
  483 +#: app/models/organization.rb:41
386 484 #, fuzzy
387 485 msgid "Validated"
388 486 msgstr "Un validateur"
... ... @@ -465,8 +563,12 @@ msgstr &quot;La tâche a été achevée à %s&quot;
465 563 msgid "The task was cancelled at %s"
466 564 msgstr "La tâche a été annulée à %s"
467 565  
  566 +#: app/models/link_list_block.rb:7
  567 +msgid "Display a list of links."
  568 +msgstr ""
  569 +
468 570 #: app/models/favorite_enterprises_block.rb:4
469   -#: app/views/profile_editor/index.rhtml:29
  571 +#: app/views/profile_editor/index.rhtml:31
470 572 #, fuzzy
471 573 msgid "Favorite Enterprises"
472 574 msgstr "Valider l'entreprise"
... ... @@ -528,8 +630,9 @@ msgid &quot;Slug&quot;
528 630 msgstr ""
529 631  
530 632 #: app/models/article.rb:- app/models/category.rb:-
  633 +#, fuzzy
531 634 msgid "Path"
532   -msgstr ""
  635 +msgstr "Parent"
533 636  
534 637 #: app/models/article.rb:- app/models/category.rb:- app/models/image.rb:-
535 638 #: app/models/thumbnail.rb:-
... ... @@ -686,6 +789,11 @@ msgstr &quot;Catégorie :&quot;
686 789 msgid "Virtual"
687 790 msgstr ""
688 791  
  792 +#: app/models/products_block.rb:16
  793 +#, fuzzy
  794 +msgid "View all products"
  795 +msgstr "Nouveau produit"
  796 +
689 797 #: app/models/tags_block.rb:8
690 798 msgid "Block listing content count by tag"
691 799 msgstr "Bloc listant le nombre de contenus par tag"
... ... @@ -699,9 +807,10 @@ msgstr &quot;&quot;
699 807 " Essayer d'ajouter quelques tags à des articles et vous verrez le "
700 808 "nuage grossir."
701 809  
702   -#: app/models/tags_block.rb:17
703   -msgid "%s's tags"
704   -msgstr "Les tags de %s"
  810 +#: app/models/tags_block.rb:20
  811 +#, fuzzy
  812 +msgid "tags"
  813 +msgstr "tâche"
705 814  
706 815 #: app/models/friendship.rb:-
707 816 msgid "friendship"
... ... @@ -803,7 +912,7 @@ msgstr &quot;Éditer l&#39;identité visuelle du profil&quot;
803 912 msgid "Manage products"
804 913 msgstr "Gérer les produits"
805 914  
806   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  915 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
807 916 msgid "Manage friends"
808 917 msgstr "Gérer les amis"
809 918  
... ... @@ -816,15 +925,15 @@ msgstr &quot;Valider l&#39;entreprise&quot;
816 925 msgid "Perform task"
817 926 msgstr "Réaliser une tâche"
818 927  
819   -#: app/models/profile.rb:144
  928 +#: app/models/profile.rb:155
820 929 msgid "An existing profile cannot be renamed."
821 930 msgstr "Un profil existant ne peut pas être renommé."
822 931  
823   -#: app/models/profile.rb:299
  932 +#: app/models/profile.rb:319
824 933 msgid "%s's home page"
825 934 msgstr "Page d'accueil de %s"
826 935  
827   -#: app/models/profile.rb:299
  936 +#: app/models/profile.rb:319
828 937 msgid ""
829 938 "<p>This is a default homepage created for %s. It can be changed though the "
830 939 "control panel.</p>"
... ... @@ -832,12 +941,12 @@ msgstr &quot;&quot;
832 941 "<p>C'est la page d'accueil par défaut créée pour %s. Elle peut être modifiée "
833 942 "dans le panneau de contrôle.</p>"
834 943  
835   -#: app/models/profile.rb:318
  944 +#: app/models/profile.rb:338
836 945 #, fuzzy
837 946 msgid "%s can't has members"
838 947 msgstr "Les membres de %s"
839 948  
840   -#: app/models/profile.rb:335
  949 +#: app/models/profile.rb:355
841 950 msgid "%s can't has moderators"
842 951 msgstr ""
843 952  
... ... @@ -867,10 +976,6 @@ msgstr &quot;%{fn} est déjà utilisé par une autre catégorie.&quot;
867 976 msgid "%{fn} was already assigned to another category."
868 977 msgstr "%{fn} était déjà assigné à une autre catégorie."
869 978  
870   -#: app/models/category.rb:13
871   -msgid "%{fn} must be the same as the parents'"
872   -msgstr "%{fn} doit être le même que celui de ses parents"
873   -
874 979 #: app/models/article_block.rb:4
875 980 msgid "Display one of your contents."
876 981 msgstr "Afficher un de vos contenus."
... ... @@ -1093,7 +1198,7 @@ msgstr &quot;&quot;
1093 1198 "Cliquer sur les personnes ou groupes vous amène sur leur page personnelle."
1094 1199  
1095 1200 #: app/models/profile_list_block.rb:75
1096   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1201 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1097 1202 msgid "None"
1098 1203 msgstr "Aucun(e)"
1099 1204  
... ... @@ -1140,6 +1245,15 @@ msgstr &quot;Un ensemble de photos, logos ou autres types d&#39;images.&quot;
1140 1245 msgid "thumbnail"
1141 1246 msgstr "aperçu"
1142 1247  
  1248 +#: app/models/enterprise_homepage.rb:4
  1249 +#, fuzzy
  1250 +msgid "Enterprise homepage."
  1251 +msgstr "Entreprise"
  1252 +
  1253 +#: app/models/enterprise_homepage.rb:8
  1254 +msgid "Display the summary of profile."
  1255 +msgstr ""
  1256 +
1143 1257 #: app/models/sellers_search_block.rb:4
1144 1258 msgid "A search for enterprises by products selled and local"
1145 1259 msgstr ""
... ... @@ -1503,11 +1617,6 @@ msgstr &quot;&quot;
1503 1617 msgid "URL:"
1504 1618 msgstr ""
1505 1619  
1506   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1507   -#: app/views/cms/_event.rhtml:12
1508   -msgid "Address:"
1509   -msgstr "Adresse :"
1510   -
1511 1620 #: app/models/event.rb:77
1512 1621 msgid "When:"
1513 1622 msgstr ""
... ... @@ -1587,7 +1696,7 @@ msgstr &quot;&quot;
1587 1696 msgid "%s still needs to accept being your friend."
1588 1697 msgstr "Il faut encore que %s accepte d'être votre ami."
1589 1698  
1590   -#: app/controllers/my_profile/cms_controller.rb:97
  1699 +#: app/controllers/my_profile/cms_controller.rb:103
1591 1700 msgid "Article \"%s\" configured as home page."
1592 1701 msgstr "L'article «%s» est bien configuré pour être votre page d'accueil."
1593 1702  
... ... @@ -1662,55 +1771,55 @@ msgstr &quot;L&#39;entreprise a bien été effacée du système&quot;
1662 1771 msgid "This action is not available for \"%s\"."
1663 1772 msgstr "Cette action n'est pas disponible pour «%s»."
1664 1773  
1665   -#: app/controllers/public/search_controller.rb:182
  1774 +#: app/controllers/public/search_controller.rb:196
1666 1775 #, fuzzy
1667   -msgid "Newer profiles"
  1776 +msgid "Newer people"
1668 1777 msgstr "Voir le profil"
1669 1778  
1670   -#: app/controllers/public/search_controller.rb:183
  1779 +#: app/controllers/public/search_controller.rb:197
  1780 +#, fuzzy
  1781 +msgid "Newer enterprises"
  1782 +msgstr "Enregistrer une entreprise"
  1783 +
  1784 +#: app/controllers/public/search_controller.rb:199
  1785 +msgid "Upcoming events"
  1786 +msgstr ""
  1787 +
  1788 +#: app/controllers/public/search_controller.rb:200
1671 1789 #, fuzzy
1672 1790 msgid "Newer communities"
1673 1791 msgstr "Tous ses groupes"
1674 1792  
1675   -#: app/controllers/public/search_controller.rb:184
  1793 +#: app/controllers/public/search_controller.rb:201
1676 1794 #, fuzzy
1677 1795 msgid "Newer articles"
1678 1796 msgstr "Nouvel article"
1679 1797  
1680   -#: app/controllers/public/search_controller.rb:185
  1798 +#: app/controllers/public/search_controller.rb:202
1681 1799 msgid "Most commented articles"
1682 1800 msgstr "Articles les plus commentés"
1683 1801  
1684   -#: app/controllers/public/search_controller.rb:186
1685   -#, fuzzy
1686   -msgid "Newer enterprises"
1687   -msgstr "Enregistrer une entreprise"
1688   -
1689   -#: app/controllers/public/search_controller.rb:187
1690   -msgid "Near events TODO"
1691   -msgstr ""
1692   -
1693   -#: app/controllers/public/account_controller.rb:21
  1802 +#: app/controllers/public/account_controller.rb:23
1694 1803 msgid "Logged in successfully"
1695 1804 msgstr "Connexion réussie"
1696 1805  
1697   -#: app/controllers/public/account_controller.rb:23
  1806 +#: app/controllers/public/account_controller.rb:25
1698 1807 msgid "Incorrect username or password"
1699 1808 msgstr "Identifiant ou mot de passe incorrect"
1700 1809  
1701   -#: app/controllers/public/account_controller.rb:51
  1810 +#: app/controllers/public/account_controller.rb:53
1702 1811 msgid "Thanks for signing up!"
1703 1812 msgstr "Merci de vous être inscrit(e) !"
1704 1813  
1705   -#: app/controllers/public/account_controller.rb:69
  1814 +#: app/controllers/public/account_controller.rb:71
1706 1815 msgid "You have been logged out."
1707 1816 msgstr "Vous avez été déconnecté(e)."
1708 1817  
1709   -#: app/controllers/public/account_controller.rb:80
  1818 +#: app/controllers/public/account_controller.rb:82
1710 1819 msgid "Your password has been changed successfully!"
1711 1820 msgstr "Votre mot de passe a bien été modifié !"
1712 1821  
1713   -#: app/controllers/public/account_controller.rb:83
  1822 +#: app/controllers/public/account_controller.rb:85
1714 1823 msgid "The supplied current password is incorrect."
1715 1824 msgstr "Le mot de passe actuel fourni est incorrect."
1716 1825  
... ... @@ -1774,13 +1883,13 @@ msgid &quot;Leave&quot;
1774 1883 msgstr "Enregistrer"
1775 1884  
1776 1885 #: app/views/memberships/index.rhtml:26
1777   -#: app/views/profile_editor/index.rhtml:46
  1886 +#: app/views/profile_editor/index.rhtml:51
1778 1887 #: app/views/profile/enterprises.rhtml:15
1779 1888 msgid "Register a new Enterprise"
1780 1889 msgstr "Enregistrer une nouvelle entreprise"
1781 1890  
1782 1891 #: app/views/memberships/index.rhtml:27
1783   -#: app/views/profile_editor/index.rhtml:45
  1892 +#: app/views/profile_editor/index.rhtml:50
1784 1893 #: app/views/profile/communities.rhtml:15
1785 1894 msgid "Create a new community"
1786 1895 msgstr "Créer un nouveau groupe"
... ... @@ -2087,6 +2196,11 @@ msgstr &quot;Organisation du visuel&quot;
2087 2196 msgid "Add a block"
2088 2197 msgstr "Ajouter un bloc"
2089 2198  
  2199 +#: app/views/box_organizer/_products_block.rhtml:5
  2200 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2201 +msgid "Select the products that must be shown."
  2202 +msgstr ""
  2203 +
2090 2204 #: app/views/box_organizer/edit.rhtml:1
2091 2205 msgid "Editing block"
2092 2206 msgstr "Édition du bloc"
... ... @@ -2306,10 +2420,6 @@ msgstr &quot;&quot;
2306 2420 "(de votre état) ; lorsque l'entreprise est validée, vous pourrez activer son "
2307 2421 "profil"
2308 2422  
2309   -#: app/views/enterprise_registration/basic_information.rhtml:32
2310   -msgid "Next"
2311   -msgstr "Suivant"
2312   -
2313 2423 #: app/views/enterprise_editor/_form.rhtml:7
2314 2424 #: app/views/enterprise_validation/list_processed.rhtml:13
2315 2425 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2358,26 +2468,14 @@ msgstr &quot;Identifiant :&quot;
2358 2468 msgid "Contact phone:"
2359 2469 msgstr "Téléphone de contact :"
2360 2470  
2361   -#: app/views/enterprise_editor/index.rhtml:8
2362   -msgid "Contact person:"
2363   -msgstr "Personne de contact : "
2364   -
2365 2471 #: app/views/enterprise_editor/index.rhtml:9
2366 2472 msgid "Acronym:"
2367 2473 msgstr "Sigle :"
2368 2474  
2369   -#: app/views/enterprise_editor/index.rhtml:10
2370   -msgid "Foundation year:"
2371   -msgstr "Année de création :"
2372   -
2373 2475 #: app/views/enterprise_editor/index.rhtml:11
2374 2476 msgid "Legal Form:"
2375 2477 msgstr "Forme juridique :"
2376 2478  
2377   -#: app/views/enterprise_editor/index.rhtml:12
2378   -msgid "Economic activity:"
2379   -msgstr "Activité économique :"
2380   -
2381 2479 #: app/views/enterprise_editor/index.rhtml:13
2382 2480 msgid "Management infomation:"
2383 2481 msgstr "Information sur les dirigeants :"
... ... @@ -2420,54 +2518,54 @@ msgstr &quot;Mise à jour&quot;
2420 2518 msgid "My profile"
2421 2519 msgstr "Mon profil"
2422 2520  
2423   -#: app/views/profile_editor/index.rhtml:9
  2521 +#: app/views/profile_editor/index.rhtml:11
2424 2522 msgid "Edit Profile"
2425 2523 msgstr "Éditer le profil"
2426 2524  
2427   -#: app/views/profile_editor/index.rhtml:11
  2525 +#: app/views/profile_editor/index.rhtml:13
2428 2526 msgid "Mail settings"
2429 2527 msgstr ""
2430 2528  
2431   -#: app/views/profile_editor/index.rhtml:13
  2529 +#: app/views/profile_editor/index.rhtml:15
2432 2530 msgid "Pending tasks"
2433 2531 msgstr "Tâches en attente"
2434 2532  
2435   -#: app/views/profile_editor/index.rhtml:15
  2533 +#: app/views/profile_editor/index.rhtml:17
2436 2534 msgid "Edit Visual Design"
2437 2535 msgstr "Éditer l'apparence"
2438 2536  
2439   -#: app/views/profile_editor/index.rhtml:17
  2537 +#: app/views/profile_editor/index.rhtml:19
2440 2538 msgid "Manage Content"
2441 2539 msgstr "Gérer le contenu"
2442 2540  
2443   -#: app/views/profile_editor/index.rhtml:19
  2541 +#: app/views/profile_editor/index.rhtml:21
2444 2542 msgid "Change Password"
2445 2543 msgstr "Modifier le mot de passe"
2446 2544  
2447   -#: app/views/profile_editor/index.rhtml:23
  2545 +#: app/views/profile_editor/index.rhtml:25
2448 2546 msgid "Manage Members"
2449 2547 msgstr "Gérer les membres"
2450 2548  
2451   -#: app/views/profile_editor/index.rhtml:25
  2549 +#: app/views/profile_editor/index.rhtml:27
2452 2550 #, fuzzy
2453 2551 msgid "Manage Products and Services"
2454 2552 msgstr "Gérer les produits"
2455 2553  
2456   -#: app/views/profile_editor/index.rhtml:27
  2554 +#: app/views/profile_editor/index.rhtml:29
2457 2555 msgid "Enterprise Validation"
2458 2556 msgstr "Validation d'entreprises"
2459 2557  
2460   -#: app/views/profile_editor/index.rhtml:33
  2558 +#: app/views/profile_editor/index.rhtml:35
2461 2559 #, fuzzy
2462 2560 msgid "Disable Enterprise"
2463 2561 msgstr "Détruire l'entreprise"
2464 2562  
2465   -#: app/views/profile_editor/index.rhtml:35
  2563 +#: app/views/profile_editor/index.rhtml:37
2466 2564 #, fuzzy
2467 2565 msgid "Enable Enterprise"
2468 2566 msgstr "Entreprises"
2469 2567  
2470   -#: app/views/profile_editor/index.rhtml:42
  2568 +#: app/views/profile_editor/index.rhtml:47
2471 2569 #, fuzzy
2472 2570 msgid "Manage my groups"
2473 2571 msgstr "Mes groupes"
... ... @@ -2526,17 +2624,9 @@ msgid &quot;Moderation options&quot;
2526 2624 msgstr "Recherche détaillée"
2527 2625  
2528 2626 #: app/views/profile_editor/_organization.rhtml:12
2529   -#, fuzzy
2530   -msgid "Closed organization"
2531   -msgstr "info organisation"
2532   -
2533   -#: app/views/profile_editor/_person.rhtml:5
2534   -msgid "Male"
2535   -msgstr "Homme"
2536   -
2537   -#: app/views/profile_editor/_person.rhtml:5
2538   -msgid "Female"
2539   -msgstr "Femme"
  2627 +msgid ""
  2628 +"New members must be approved by an administrator before joining this group?"
  2629 +msgstr ""
2540 2630  
2541 2631 #: app/views/profile_editor/enable.rhtml:1
2542 2632 #, fuzzy
... ... @@ -2625,7 +2715,7 @@ msgstr &quot;Le profil de %s&quot;
2625 2715 msgid "Homepage: "
2626 2716 msgstr "Page personnelle : "
2627 2717  
2628   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2718 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2629 2719 #, fuzzy
2630 2720 msgid "Products/Services"
2631 2721 msgstr "Prix"
... ... @@ -2692,26 +2782,33 @@ msgstr &quot;Les entreprises de &lt;b&gt;%s&lt;/b&gt;&quot;
2692 2782  
2693 2783 #: app/views/search/products.rhtml:3
2694 2784 #, fuzzy
2695   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2785 +msgid ""
  2786 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2787 +"{category}\""
2696 2788 msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
2697 2789  
2698 2790 #: app/views/search/products.rhtml:3
2699 2791 #, fuzzy
2700   -msgid "Products results for \"%s\""
  2792 +msgid "Products and Services results for \"%s\""
2701 2793 msgstr "Résultats de recherche pour «%s»"
2702 2794  
2703 2795 #: app/views/search/products.rhtml:5
2704 2796 #, fuzzy
2705   -msgid "Products of enterprises in \"%s\""
  2797 +msgid "Products and Services of enterprises in \"%s\""
2706 2798 msgstr "Entrprise"
2707 2799  
2708   -#: app/views/search/products.rhtml:10
  2800 +#: app/views/search/products.rhtml:5
  2801 +#, fuzzy
  2802 +msgid "Products and Services"
  2803 +msgstr "Gérer les produits"
  2804 +
  2805 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2709 2806 msgid "Within %s km from %s"
2710 2807 msgstr ""
2711 2808  
2712 2809 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2713   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2714   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2810 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2811 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2715 2812 msgid "Refine your search"
2716 2813 msgstr "Affiner votre recherche"
2717 2814  
... ... @@ -2719,40 +2816,63 @@ msgstr &quot;Affiner votre recherche&quot;
2719 2816 msgid "by %{author} on \"%{article}\""
2720 2817 msgstr "par %{author} sur «%{article}»"
2721 2818  
2722   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2723   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2724   -#: app/views/search/articles.rhtml:12
  2819 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2820 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2725 2821 msgid "Search results for \"%{query}\" in \"%{category}\""
2726 2822 msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
2727 2823  
2728   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2729   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2730   -#: app/views/search/articles.rhtml:12
  2824 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2825 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2731 2826 msgid "Search results for \"%s\""
2732 2827 msgstr "Résultats de recherche pour «%s»"
2733 2828  
2734   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2735   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2736   -msgid "(recently added)"
2737   -msgstr ""
  2829 +#: app/views/search/_product_categories_menu.rhtml:13
  2830 +#, fuzzy
  2831 +msgid "There is no sub-categories for %s."
  2832 +msgstr "Il n'existe pas une telle page : %s"
2738 2833  
2739   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2740   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2741   -msgid "Browse by name"
2742   -msgstr ""
  2834 +#: app/views/search/_product_categories_menu.rhtml:15
  2835 +#, fuzzy
  2836 +msgid "There is no categories."
  2837 +msgstr "Il n'existe pas une telle page : %s"
  2838 +
  2839 +#: app/views/search/enterprises.rhtml:3
  2840 +#, fuzzy
  2841 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2842 +msgstr "Résultats de la recherche sur «%{query}» dans «%{category}»"
2743 2843  
2744   -#: app/views/search/_directory.rhtml:2
2745   -msgid "Recent"
2746   -msgstr "Récents"
  2844 +#: app/views/search/enterprises.rhtml:3
  2845 +#, fuzzy
  2846 +msgid "Enterprise results for \"%s\""
  2847 +msgstr "Résultats de recherche pour «%s»"
2747 2848  
2748   -#: app/views/search/_display_results.rhtml:18
2749   -msgid "more..."
  2849 +#: app/views/search/enterprises.rhtml:5
  2850 +#, fuzzy
  2851 +msgid "Enterprises in \"%s\""
  2852 +msgstr "Enregistrement de l'enterprise : \"%s\""
  2853 +
  2854 +#: app/views/search/_display_results.rhtml:21
  2855 +msgid "see all (%d)"
  2856 +msgstr ""
  2857 +
  2858 +#: app/views/search/_display_results.rhtml:21
  2859 +msgid "see all..."
2750 2860 msgstr ""
2751 2861  
2752 2862 #: app/views/search/popup.rhtml:3
2753 2863 msgid "Search %s"
2754 2864 msgstr "Recherche sur «%s»"
2755 2865  
  2866 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2867 +#: app/views/search/articles.rhtml:11
  2868 +msgid "(recently added)"
  2869 +msgstr ""
  2870 +
  2871 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2872 +#: app/views/search/articles.rhtml:17
  2873 +msgid "Browse by name"
  2874 +msgstr ""
  2875 +
2756 2876 #: app/views/search/_sellers_form.rhtml:1
2757 2877 #, fuzzy
2758 2878 msgid "Search for sellers"
... ... @@ -2762,21 +2882,15 @@ msgstr &quot;Rechercher :&quot;
2762 2882 msgid "Search in:"
2763 2883 msgstr "Recherche dans :"
2764 2884  
2765   -#: app/views/search/_sellers_form.rhtml:13
2766   -#: app/views/search/_search_form.rhtml:27
  2885 +#: app/views/search/_sellers_form.rhtml:17
2767 2886 msgid "Distance (km): "
2768 2887 msgstr ""
2769 2888  
2770   -#: app/views/search/_sellers_form.rhtml:16
2771   -#: app/views/search/_search_form.rhtml:28
2772   -msgid "From: "
2773   -msgstr ""
2774   -
2775   -#: app/views/search/_product.rhtml:10
  2889 +#: app/views/search/_product.rhtml:15
2776 2890 msgid "Price: %d"
2777 2891 msgstr "Prix : %d"
2778 2892  
2779   -#: app/views/search/_product.rhtml:12
  2893 +#: app/views/search/_product.rhtml:17
2780 2894 msgid "Suplier: %s"
2781 2895 msgstr "Fournisseur : %s"
2782 2896  
... ... @@ -2798,11 +2912,20 @@ msgstr &quot;Recherche de «%s» dans tout le site&quot;
2798 2912 msgid "Search within:"
2799 2913 msgstr "Recherche dans :"
2800 2914  
2801   -#: app/views/search/_search_form.rhtml:35
  2915 +#: app/views/search/_search_form.rhtml:28
  2916 +msgid "Distance (km):"
  2917 +msgstr ""
  2918 +
  2919 +#: app/views/search/_search_form.rhtml:33
  2920 +#, fuzzy
  2921 +msgid "From:"
  2922 +msgstr "Sigle :"
  2923 +
  2924 +#: app/views/search/_search_form.rhtml:42
2802 2925 msgid "Search for:"
2803 2926 msgstr "Rechercher :"
2804 2927  
2805   -#: app/views/search/_search_form.rhtml:49
  2928 +#: app/views/search/_search_form.rhtml:56
2806 2929 msgid "Advanced search"
2807 2930 msgstr ""
2808 2931  
... ... @@ -2814,7 +2937,7 @@ msgstr &quot;par %s&quot;
2814 2937 msgid "Last update: %s."
2815 2938 msgstr "Dernière mise à jour : %s."
2816 2939  
2817   -#: app/views/search/_google_maps.rhtml:48
  2940 +#: app/views/search/_google_maps.rhtml:68
2818 2941 msgid ""
2819 2942 "One or more items don't have geographical information, and won't be shown in "
2820 2943 "the map. Choose \"Display in list\" to see them."
... ... @@ -2878,19 +3001,19 @@ msgstr &quot;Détruire l&#39;entreprise&quot;
2878 3001 msgid "Join this enterprise"
2879 3002 msgstr "Éditer l'entreprise"
2880 3003  
2881   -#: app/views/blocks/profile_info.rhtml:6
  3004 +#: app/views/blocks/profile_info.rhtml:17
2882 3005 msgid "Since %{year}/%{month}"
2883 3006 msgstr "Depuis %{month}/%{year}"
2884 3007  
2885   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  3008 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2886 3009 msgid "Homepage"
2887 3010 msgstr "Accueil"
2888 3011  
2889   -#: app/views/blocks/profile_info.rhtml:8
  3012 +#: app/views/blocks/profile_info.rhtml:19
2890 3013 msgid "View profile"
2891 3014 msgstr "Voir le profil"
2892 3015  
2893   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  3016 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2894 3017 msgid "Control panel"
2895 3018 msgstr "Panneau de contrôle"
2896 3019  
... ... @@ -3027,25 +3150,25 @@ msgstr &quot;Nouvel article&quot;
3027 3150 msgid "Properties"
3028 3151 msgstr ""
3029 3152  
3030   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  3153 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
3031 3154 msgid "Public view"
3032 3155 msgstr ""
3033 3156  
3034 3157 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  3158 +msgid "Use as homepage"
  3159 +msgstr "Utiliser comme page d'accueil"
  3160 +
  3161 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
3035 3162 msgid "Delete"
3036 3163 msgstr "Détruire"
3037 3164  
3038   -#: app/views/cms/view.rhtml:42
  3165 +#: app/views/cms/view.rhtml:43
3039 3166 msgid ""
3040 3167 "Are you sure that you want to remove this folder? Note that all the items "
3041 3168 "inside it will also be removed!"
3042 3169 msgstr ""
3043 3170  
3044   -#: app/views/cms/view.rhtml:67
3045   -msgid "Use as homepage"
3046   -msgstr "Utiliser comme page d'accueil"
3047   -
3048   -#: app/views/cms/view.rhtml:68
  3171 +#: app/views/cms/view.rhtml:69
3049 3172 #, fuzzy
3050 3173 msgid "Are you sure that you want to remove this item?"
3051 3174 msgstr "Êtes-vous sûr(e) de vouloir ôter cet article ?"
... ... @@ -3734,13 +3857,13 @@ msgid &quot;We need to be sure that you wrote correctly your password.&quot;
3734 3857 msgstr ""
3735 3858 "Nous devons nous assurer que vous avez écrit correctement votre mot de passe."
3736 3859  
3737   -#: app/views/account/signup.rhtml:33
  3860 +#: app/views/account/signup.rhtml:35
3738 3861 #: app/views/account/activate_enterprise.rhtml:37
3739 3862 msgid "I accept the terms of use"
3740 3863 msgstr "J'accepte les conditions d'utilisation"
3741 3864  
3742 3865 # Je ne suis pas sûr de la distinction "sign up" / "register"
3743   -#: app/views/account/signup.rhtml:38
  3866 +#: app/views/account/signup.rhtml:40
3744 3867 #: app/views/account/activate_enterprise.rhtml:42
3745 3868 #, fuzzy
3746 3869 msgid "Sign up"
... ... @@ -3880,6 +4003,28 @@ msgstr &quot;Un projet du FBES&quot;
3880 4003 msgid "Developed by Colivre"
3881 4004 msgstr "Développé par Colivre"
3882 4005  
  4006 +# How is this used? (which function/method?)
  4007 +#, fuzzy
  4008 +#~ msgid "%d %B %Y"
  4009 +#~ msgstr "%d %B %Y"
  4010 +
  4011 +#, fuzzy
  4012 +#~ msgid "edit your information"
  4013 +#~ msgstr "Éditer vos informations"
  4014 +
  4015 +#~ msgid "%s's tags"
  4016 +#~ msgstr "Les tags de %s"
  4017 +
  4018 +#~ msgid "%{fn} must be the same as the parents'"
  4019 +#~ msgstr "%{fn} doit être le même que celui de ses parents"
  4020 +
  4021 +#, fuzzy
  4022 +#~ msgid "Closed organization"
  4023 +#~ msgstr "info organisation"
  4024 +
  4025 +#~ msgid "Recent"
  4026 +#~ msgstr "Récents"
  4027 +
3883 4028 #, fuzzy
3884 4029 #~ msgid "Closed %s"
3885 4030 #~ msgstr "Fermer"
... ... @@ -4195,9 +4340,6 @@ msgstr &quot;Développé par Colivre&quot;
4195 4340 #~ msgid "Category: %s"
4196 4341 #~ msgstr "Catégorie : %s"
4197 4342  
4198   -#~ msgid "Recently registered people"
4199   -#~ msgstr "Personnes enregistrées récemment"
4200   -
4201 4343 #~ msgid "Recently created communities"
4202 4344 #~ msgstr "Groupes créés récemment"
4203 4345  
... ...
po/hy/noosfero.po
  Diff comments   View file @b24d068
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.10.1\n"
10   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
  10 +"POT-Creation-Date: 2008-07-08 19:03-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"
... ... @@ -23,7 +23,7 @@ msgstr &quot;&quot;
23 23  
24 24 #: app/helpers/application_helper.rb:81
25 25 #: app/views/box_organizer/add_block.rhtml:18
26   -#: app/views/search/_search_form.rhtml:56
  26 +#: app/views/search/_search_form.rhtml:63
27 27 msgid "Close"
28 28 msgstr ""
29 29  
... ... @@ -31,61 +31,63 @@ msgstr &quot;&quot;
31 31 msgid "This is %s, version %s"
32 32 msgstr ""
33 33  
34   -#: app/helpers/application_helper.rb:318
35   -#: app/views/memberships/new_community.rhtml:12
36   -#: app/views/box_organizer/edit.rhtml:9
37   -#: app/views/admin_panel/site_info.rhtml:11
38   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
39   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
40   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
41   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
42   -msgid "Cancel"
43   -msgstr ""
44   -
45   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  34 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
46 35 msgid "Uncategorized product"
47 36 msgstr ""
48 37  
49   -#: app/helpers/application_helper.rb:366
  38 +#: app/helpers/application_helper.rb:252
50 39 msgid "No product"
51 40 msgstr ""
52 41  
53   -#: app/helpers/application_helper.rb:472
  42 +#: app/helpers/application_helper.rb:338
  43 +msgid "non registered gender"
  44 +msgstr ""
  45 +
  46 +#: app/helpers/application_helper.rb:338
  47 +#: app/views/profile_editor/_person.rhtml:5
  48 +msgid "Male"
  49 +msgstr ""
  50 +
  51 +#: app/helpers/application_helper.rb:338
  52 +#: app/views/profile_editor/_person.rhtml:5
  53 +msgid "Female"
  54 +msgstr ""
  55 +
  56 +#: app/helpers/application_helper.rb:366
54 57 msgid "Click on this icon to go to the <b>%s</b>'s home page"
55 58 msgstr ""
56 59  
57   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  60 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
58 61 #: app/views/content_viewer/view_page.rhtml:65
59 62 msgid "Categories"
60 63 msgstr ""
61 64  
62   -#: app/helpers/application_helper.rb:532
  65 +#: app/helpers/application_helper.rb:417
63 66 msgid "open"
64 67 msgstr ""
65 68  
66   -#: app/helpers/application_helper.rb:568
  69 +#: app/helpers/application_helper.rb:453
67 70 msgid "Search..."
68 71 msgstr ""
69 72  
70   -#: app/helpers/application_helper.rb:570
  73 +#: app/helpers/application_helper.rb:455
71 74 msgid "This is a search box. Click, write your query, and press enter to find"
72 75 msgstr ""
73 76  
74   -#: app/helpers/application_helper.rb:571
  77 +#: app/helpers/application_helper.rb:456
75 78 msgid "Click, write and press enter to find"
76 79 msgstr ""
77 80  
78   -#: app/helpers/application_helper.rb:577
  81 +#: app/helpers/application_helper.rb:462
79 82 #: app/views/region_validators/region.rhtml:23
80   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
81   -#: app/views/search/_sellers_form.rhtml:22
  83 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
82 84 #: app/views/search/_search_form.rhtml:16
83   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  85 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
84 86 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
85 87 msgid "Search"
86 88 msgstr ""
87 89  
88   -#: app/helpers/application_helper.rb:652
  90 +#: app/helpers/application_helper.rb:518
89 91 msgid "Are you sure you want to visit this web site?"
90 92 msgstr ""
91 93  
... ... @@ -97,6 +99,39 @@ msgstr &quot;&quot;
97 99 msgid "Display in map"
98 100 msgstr ""
99 101  
  102 +#: app/helpers/search_helper.rb:53
  103 +msgid "E-Mail: "
  104 +msgstr ""
  105 +
  106 +#: app/helpers/search_helper.rb:56
  107 +msgid "Phone(s): "
  108 +msgstr ""
  109 +
  110 +#: app/helpers/search_helper.rb:59
  111 +msgid "Location: "
  112 +msgstr ""
  113 +
  114 +#: app/helpers/search_helper.rb:62
  115 +msgid "Address: "
  116 +msgstr ""
  117 +
  118 +#: app/helpers/search_helper.rb:65
  119 +msgid "Products/Services: "
  120 +msgstr ""
  121 +
  122 +#: app/helpers/search_helper.rb:68
  123 +msgid "Distance: "
  124 +msgstr ""
  125 +
  126 +#: app/helpers/search_helper.rb:81
  127 +msgid "Previous"
  128 +msgstr ""
  129 +
  130 +#: app/helpers/search_helper.rb:81
  131 +#: app/views/enterprise_registration/basic_information.rhtml:32
  132 +msgid "Next"
  133 +msgstr ""
  134 +
100 135 #: app/helpers/dates_helper.rb:6
101 136 msgid "January"
102 137 msgstr ""
... ... @@ -145,47 +180,47 @@ msgstr &quot;&quot;
145 180 msgid "December"
146 181 msgstr ""
147 182  
148   -#: app/helpers/dates_helper.rb:23
149   -msgid "%d %B %Y"
  183 +#: app/helpers/dates_helper.rb:27
  184 +msgid "%{month} %{day}, %{year}"
150 185 msgstr ""
151 186  
152   -#: app/helpers/dates_helper.rb:32
  187 +#: app/helpers/dates_helper.rb:36
153 188 msgid "%d %B %Y, %H:%m"
154 189 msgstr ""
155 190  
156   -#: app/helpers/dates_helper.rb:42
  191 +#: app/helpers/dates_helper.rb:46
157 192 msgid "from %s to %s"
158 193 msgstr ""
159 194  
160   -#: app/helpers/dates_helper.rb:49
  195 +#: app/helpers/dates_helper.rb:53
161 196 msgid "Sunday"
162 197 msgstr ""
163 198  
164   -#: app/helpers/dates_helper.rb:50
  199 +#: app/helpers/dates_helper.rb:54
165 200 msgid "Monday"
166 201 msgstr ""
167 202  
168   -#: app/helpers/dates_helper.rb:51
  203 +#: app/helpers/dates_helper.rb:55
169 204 msgid "Tuesday"
170 205 msgstr ""
171 206  
172   -#: app/helpers/dates_helper.rb:52
  207 +#: app/helpers/dates_helper.rb:56
173 208 msgid "Wednesday"
174 209 msgstr ""
175 210  
176   -#: app/helpers/dates_helper.rb:53
  211 +#: app/helpers/dates_helper.rb:57
177 212 msgid "Thursday"
178 213 msgstr ""
179 214  
180   -#: app/helpers/dates_helper.rb:54
  215 +#: app/helpers/dates_helper.rb:58
181 216 msgid "Friday"
182 217 msgstr ""
183 218  
184   -#: app/helpers/dates_helper.rb:55
  219 +#: app/helpers/dates_helper.rb:59
185 220 msgid "Saturday"
186 221 msgstr ""
187 222  
188   -#: app/helpers/dates_helper.rb:71
  223 +#: app/helpers/dates_helper.rb:72
189 224 msgid "%{month} %{year}"
190 225 msgstr ""
191 226  
... ... @@ -207,32 +242,68 @@ msgid &quot;&quot;
207 242 "It does not affect the language of the content created by other users."
208 243 msgstr ""
209 244  
  245 +#: app/helpers/enterprise_homepage_helper.rb:6
  246 +#: app/views/enterprise_editor/index.rhtml:8
  247 +msgid "Contact person:"
  248 +msgstr ""
  249 +
  250 +#: app/helpers/enterprise_homepage_helper.rb:7
  251 +msgid "e-Mail:"
  252 +msgstr ""
  253 +
  254 +#: app/helpers/enterprise_homepage_helper.rb:8
  255 +msgid "Phone(s):"
  256 +msgstr ""
  257 +
  258 +#: app/helpers/enterprise_homepage_helper.rb:9
  259 +msgid "Location:"
  260 +msgstr ""
  261 +
  262 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  263 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  264 +msgid "Address:"
  265 +msgstr ""
  266 +
  267 +#: app/helpers/enterprise_homepage_helper.rb:11
  268 +msgid "Legal form:"
  269 +msgstr ""
  270 +
  271 +#: app/helpers/enterprise_homepage_helper.rb:12
  272 +#: app/views/enterprise_editor/index.rhtml:10
  273 +msgid "Foundation year:"
  274 +msgstr ""
  275 +
  276 +#: app/helpers/enterprise_homepage_helper.rb:13
  277 +#: app/views/enterprise_editor/index.rhtml:12
  278 +msgid "Economic activity:"
  279 +msgstr ""
  280 +
  281 +#: app/helpers/enterprise_homepage_helper.rb:21
  282 +msgid "Distance:"
  283 +msgstr ""
  284 +
210 285 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
211 286 msgid "Main content"
212 287 msgstr ""
213 288  
214   -#: app/helpers/boxes_helper.rb:124
  289 +#: app/helpers/boxes_helper.rb:125
215 290 msgid "Move block up"
216 291 msgstr ""
217 292  
218   -#: app/helpers/boxes_helper.rb:125
  293 +#: app/helpers/boxes_helper.rb:129
219 294 msgid "Move block down"
220 295 msgstr ""
221 296  
222   -#: app/helpers/boxes_helper.rb:126
223   -msgid "Remove block"
224   -msgstr ""
225   -
226   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  297 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
227 298 #: app/views/manage_products/index.rhtml:14
228 299 #: app/views/manage_products/index.rhtml:40
229   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  300 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
230 301 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
231 302 msgid "Edit"
232 303 msgstr ""
233 304  
234   -#: app/helpers/profile_helper.rb:7
235   -msgid "edit your information"
  305 +#: app/helpers/boxes_helper.rb:137
  306 +msgid "Remove block"
236 307 msgstr ""
237 308  
238 309 #: app/helpers/tags_helper.rb:33
... ... @@ -255,6 +326,24 @@ msgstr &quot;&quot;
255 326 msgid "Administrator assigns validator organizations per region."
256 327 msgstr ""
257 328  
  329 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  330 +#: app/views/box_organizer/edit.rhtml:9
  331 +#: app/views/admin_panel/site_info.rhtml:11
  332 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  333 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  334 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  335 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  336 +msgid "Cancel"
  337 +msgstr ""
  338 +
  339 +#: app/helpers/forms_helper.rb:64
  340 +msgid "State:"
  341 +msgstr ""
  342 +
  343 +#: app/helpers/forms_helper.rb:65
  344 +msgid "City:"
  345 +msgstr ""
  346 +
258 347 #: app/helpers/categories_helper.rb:6
259 348 msgid "Do not display at the menu"
260 349 msgstr ""
... ... @@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
296 385 msgstr ""
297 386  
298 387 #: app/helpers/assets_helper.rb:7
299   -#: app/controllers/public/search_controller.rb:92
  388 +#: app/controllers/public/search_controller.rb:133
300 389 msgid "Articles"
301 390 msgstr ""
302 391  
303 392 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
304   -#: app/controllers/public/search_controller.rb:94
  393 +#: app/controllers/public/search_controller.rb:135
305 394 msgid "People"
306 395 msgstr ""
307 396  
308   -#: app/helpers/assets_helper.rb:9
309   -#: app/controllers/public/search_controller.rb:96
310   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  397 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  398 +#: app/controllers/public/search_controller.rb:137
  399 +#: app/views/search/_sellers_form.rhtml:7
311 400 msgid "Products"
312 401 msgstr ""
313 402  
314 403 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
315   -#: app/controllers/public/search_controller.rb:93
  404 +#: app/controllers/public/search_controller.rb:134
316 405 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
317 406 msgid "Enterprises"
318 407 msgstr ""
319 408  
320 409 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
321   -#: app/controllers/public/search_controller.rb:95
  410 +#: app/controllers/public/search_controller.rb:136
322 411 #: app/views/profile/index.rhtml:22
323 412 msgid "Communities"
324 413 msgstr ""
325 414  
326 415 #: app/helpers/assets_helper.rb:12
327   -#: app/controllers/public/search_controller.rb:97
  416 +#: app/controllers/public/search_controller.rb:138
328 417 msgid "Events"
329 418 msgstr ""
330 419  
331 420 #: app/models/enterprise.rb:5 app/models/product.rb:-
  421 +#: app/views/search/enterprises.rhtml:5
332 422 msgid "Enterprise"
333 423 msgstr ""
334 424  
... ... @@ -336,37 +426,37 @@ msgstr &quot;&quot;
336 426 msgid "Community"
337 427 msgstr ""
338 428  
339   -#: app/models/organization.rb:43
  429 +#: app/models/organization.rb:41
340 430 msgid "Contact person"
341 431 msgstr ""
342 432  
343   -#: app/models/organization.rb:43 app/models/environment.rb:-
  433 +#: app/models/organization.rb:41 app/models/environment.rb:-
344 434 msgid "Contact email"
345 435 msgstr ""
346 436  
347   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  437 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
348 438 #: app/views/enterprise_validation/_details.rhtml:19
349 439 msgid "Acronym"
350 440 msgstr ""
351 441  
352   -#: app/models/organization.rb:43
  442 +#: app/models/organization.rb:41
353 443 msgid "Foundation year"
354 444 msgstr ""
355 445  
356   -#: app/models/organization.rb:43
  446 +#: app/models/organization.rb:41
357 447 msgid "Legal form"
358 448 msgstr ""
359 449  
360   -#: app/models/organization.rb:43
  450 +#: app/models/organization.rb:41
361 451 msgid "Economic activity"
362 452 msgstr ""
363 453  
364   -#: app/models/organization.rb:43
  454 +#: app/models/organization.rb:41
365 455 #: app/views/enterprise_registration/basic_information.rhtml:27
366 456 msgid "Management information"
367 457 msgstr ""
368 458  
369   -#: app/models/organization.rb:43
  459 +#: app/models/organization.rb:41
370 460 msgid "Validated"
371 461 msgstr ""
372 462  
... ... @@ -441,8 +531,12 @@ msgstr &quot;&quot;
441 531 msgid "The task was cancelled at %s"
442 532 msgstr ""
443 533  
  534 +#: app/models/link_list_block.rb:7
  535 +msgid "Display a list of links."
  536 +msgstr ""
  537 +
444 538 #: app/models/favorite_enterprises_block.rb:4
445   -#: app/views/profile_editor/index.rhtml:29
  539 +#: app/views/profile_editor/index.rhtml:31
446 540 msgid "Favorite Enterprises"
447 541 msgstr ""
448 542  
... ... @@ -637,6 +731,10 @@ msgstr &quot;&quot;
637 731 msgid "Virtual"
638 732 msgstr ""
639 733  
  734 +#: app/models/products_block.rb:16
  735 +msgid "View all products"
  736 +msgstr ""
  737 +
640 738 #: app/models/tags_block.rb:8
641 739 msgid "Block listing content count by tag"
642 740 msgstr ""
... ... @@ -647,8 +745,8 @@ msgid &quot;&quot;
647 745 " Try to add some tags to some articles and see your tag cloud to grow."
648 746 msgstr ""
649 747  
650   -#: app/models/tags_block.rb:17
651   -msgid "%s's tags"
  748 +#: app/models/tags_block.rb:20
  749 +msgid "tags"
652 750 msgstr ""
653 751  
654 752 #: app/models/friendship.rb:-
... ... @@ -742,7 +840,7 @@ msgstr &quot;&quot;
742 840 msgid "Manage products"
743 841 msgstr ""
744 842  
745   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  843 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
746 844 msgid "Manage friends"
747 845 msgstr ""
748 846  
... ... @@ -754,25 +852,25 @@ msgstr &quot;&quot;
754 852 msgid "Perform task"
755 853 msgstr ""
756 854  
757   -#: app/models/profile.rb:144
  855 +#: app/models/profile.rb:155
758 856 msgid "An existing profile cannot be renamed."
759 857 msgstr ""
760 858  
761   -#: app/models/profile.rb:299
  859 +#: app/models/profile.rb:319
762 860 msgid "%s's home page"
763 861 msgstr ""
764 862  
765   -#: app/models/profile.rb:299
  863 +#: app/models/profile.rb:319
766 864 msgid ""
767 865 "<p>This is a default homepage created for %s. It can be changed though the "
768 866 "control panel.</p>"
769 867 msgstr ""
770 868  
771   -#: app/models/profile.rb:318
  869 +#: app/models/profile.rb:338
772 870 msgid "%s can't has members"
773 871 msgstr ""
774 872  
775   -#: app/models/profile.rb:335
  873 +#: app/models/profile.rb:355
776 874 msgid "%s can't has moderators"
777 875 msgstr ""
778 876  
... ... @@ -800,10 +898,6 @@ msgstr &quot;&quot;
800 898 msgid "%{fn} was already assigned to another category."
801 899 msgstr ""
802 900  
803   -#: app/models/category.rb:13
804   -msgid "%{fn} must be the same as the parents'"
805   -msgstr ""
806   -
807 901 #: app/models/article_block.rb:4
808 902 msgid "Display one of your contents."
809 903 msgstr ""
... ... @@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
1009 1103 msgstr ""
1010 1104  
1011 1105 #: app/models/profile_list_block.rb:75
1012   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1106 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1013 1107 msgid "None"
1014 1108 msgstr ""
1015 1109  
... ... @@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
1053 1147 msgid "thumbnail"
1054 1148 msgstr ""
1055 1149  
  1150 +#: app/models/enterprise_homepage.rb:4
  1151 +msgid "Enterprise homepage."
  1152 +msgstr ""
  1153 +
  1154 +#: app/models/enterprise_homepage.rb:8
  1155 +msgid "Display the summary of profile."
  1156 +msgstr ""
  1157 +
1056 1158 #: app/models/sellers_search_block.rb:4
1057 1159 msgid "A search for enterprises by products selled and local"
1058 1160 msgstr ""
... ... @@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
1375 1477 msgid "URL:"
1376 1478 msgstr ""
1377 1479  
1378   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1379   -#: app/views/cms/_event.rhtml:12
1380   -msgid "Address:"
1381   -msgstr ""
1382   -
1383 1480 #: app/models/event.rb:77
1384 1481 msgid "When:"
1385 1482 msgstr ""
... ... @@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
1457 1554 msgid "%s still needs to accept being your friend."
1458 1555 msgstr ""
1459 1556  
1460   -#: app/controllers/my_profile/cms_controller.rb:97
  1557 +#: app/controllers/my_profile/cms_controller.rb:103
1461 1558 msgid "Article \"%s\" configured as home page."
1462 1559 msgstr ""
1463 1560  
... ... @@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
1525 1622 msgid "This action is not available for \"%s\"."
1526 1623 msgstr ""
1527 1624  
1528   -#: app/controllers/public/search_controller.rb:182
1529   -msgid "Newer profiles"
  1625 +#: app/controllers/public/search_controller.rb:196
  1626 +msgid "Newer people"
1530 1627 msgstr ""
1531 1628  
1532   -#: app/controllers/public/search_controller.rb:183
1533   -msgid "Newer communities"
  1629 +#: app/controllers/public/search_controller.rb:197
  1630 +msgid "Newer enterprises"
1534 1631 msgstr ""
1535 1632  
1536   -#: app/controllers/public/search_controller.rb:184
1537   -msgid "Newer articles"
  1633 +#: app/controllers/public/search_controller.rb:199
  1634 +msgid "Upcoming events"
1538 1635 msgstr ""
1539 1636  
1540   -#: app/controllers/public/search_controller.rb:185
1541   -msgid "Most commented articles"
  1637 +#: app/controllers/public/search_controller.rb:200
  1638 +msgid "Newer communities"
1542 1639 msgstr ""
1543 1640  
1544   -#: app/controllers/public/search_controller.rb:186
1545   -msgid "Newer enterprises"
  1641 +#: app/controllers/public/search_controller.rb:201
  1642 +msgid "Newer articles"
1546 1643 msgstr ""
1547 1644  
1548   -#: app/controllers/public/search_controller.rb:187
1549   -msgid "Near events TODO"
  1645 +#: app/controllers/public/search_controller.rb:202
  1646 +msgid "Most commented articles"
1550 1647 msgstr ""
1551 1648  
1552   -#: app/controllers/public/account_controller.rb:21
  1649 +#: app/controllers/public/account_controller.rb:23
1553 1650 msgid "Logged in successfully"
1554 1651 msgstr ""
1555 1652  
1556   -#: app/controllers/public/account_controller.rb:23
  1653 +#: app/controllers/public/account_controller.rb:25
1557 1654 msgid "Incorrect username or password"
1558 1655 msgstr ""
1559 1656  
1560   -#: app/controllers/public/account_controller.rb:51
  1657 +#: app/controllers/public/account_controller.rb:53
1561 1658 msgid "Thanks for signing up!"
1562 1659 msgstr ""
1563 1660  
1564   -#: app/controllers/public/account_controller.rb:69
  1661 +#: app/controllers/public/account_controller.rb:71
1565 1662 msgid "You have been logged out."
1566 1663 msgstr ""
1567 1664  
1568   -#: app/controllers/public/account_controller.rb:80
  1665 +#: app/controllers/public/account_controller.rb:82
1569 1666 msgid "Your password has been changed successfully!"
1570 1667 msgstr ""
1571 1668  
1572   -#: app/controllers/public/account_controller.rb:83
  1669 +#: app/controllers/public/account_controller.rb:85
1573 1670 msgid "The supplied current password is incorrect."
1574 1671 msgstr ""
1575 1672  
... ... @@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
1626 1723 msgstr ""
1627 1724  
1628 1725 #: app/views/memberships/index.rhtml:26
1629   -#: app/views/profile_editor/index.rhtml:46
  1726 +#: app/views/profile_editor/index.rhtml:51
1630 1727 #: app/views/profile/enterprises.rhtml:15
1631 1728 msgid "Register a new Enterprise"
1632 1729 msgstr ""
1633 1730  
1634 1731 #: app/views/memberships/index.rhtml:27
1635   -#: app/views/profile_editor/index.rhtml:45
  1732 +#: app/views/profile_editor/index.rhtml:50
1636 1733 #: app/views/profile/communities.rhtml:15
1637 1734 msgid "Create a new community"
1638 1735 msgstr ""
... ... @@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
1926 2023 msgid "Add a block"
1927 2024 msgstr ""
1928 2025  
  2026 +#: app/views/box_organizer/_products_block.rhtml:5
  2027 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2028 +msgid "Select the products that must be shown."
  2029 +msgstr ""
  2030 +
1929 2031 #: app/views/box_organizer/edit.rhtml:1
1930 2032 msgid "Editing block"
1931 2033 msgstr ""
... ... @@ -2124,10 +2226,6 @@ msgid &quot;&quot;
2124 2226 "profile"
2125 2227 msgstr ""
2126 2228  
2127   -#: app/views/enterprise_registration/basic_information.rhtml:32
2128   -msgid "Next"
2129   -msgstr ""
2130   -
2131 2229 #: app/views/enterprise_editor/_form.rhtml:7
2132 2230 #: app/views/enterprise_validation/list_processed.rhtml:13
2133 2231 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
2174 2272 msgid "Contact phone:"
2175 2273 msgstr ""
2176 2274  
2177   -#: app/views/enterprise_editor/index.rhtml:8
2178   -msgid "Contact person:"
2179   -msgstr ""
2180   -
2181 2275 #: app/views/enterprise_editor/index.rhtml:9
2182 2276 msgid "Acronym:"
2183 2277 msgstr ""
2184 2278  
2185   -#: app/views/enterprise_editor/index.rhtml:10
2186   -msgid "Foundation year:"
2187   -msgstr ""
2188   -
2189 2279 #: app/views/enterprise_editor/index.rhtml:11
2190 2280 msgid "Legal Form:"
2191 2281 msgstr ""
2192 2282  
2193   -#: app/views/enterprise_editor/index.rhtml:12
2194   -msgid "Economic activity:"
2195   -msgstr ""
2196   -
2197 2283 #: app/views/enterprise_editor/index.rhtml:13
2198 2284 msgid "Management infomation:"
2199 2285 msgstr ""
... ... @@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
2234 2320 msgid "My profile"
2235 2321 msgstr ""
2236 2322  
2237   -#: app/views/profile_editor/index.rhtml:9
  2323 +#: app/views/profile_editor/index.rhtml:11
2238 2324 msgid "Edit Profile"
2239 2325 msgstr ""
2240 2326  
2241   -#: app/views/profile_editor/index.rhtml:11
  2327 +#: app/views/profile_editor/index.rhtml:13
2242 2328 msgid "Mail settings"
2243 2329 msgstr ""
2244 2330  
2245   -#: app/views/profile_editor/index.rhtml:13
  2331 +#: app/views/profile_editor/index.rhtml:15
2246 2332 msgid "Pending tasks"
2247 2333 msgstr ""
2248 2334  
2249   -#: app/views/profile_editor/index.rhtml:15
  2335 +#: app/views/profile_editor/index.rhtml:17
2250 2336 msgid "Edit Visual Design"
2251 2337 msgstr ""
2252 2338  
2253   -#: app/views/profile_editor/index.rhtml:17
  2339 +#: app/views/profile_editor/index.rhtml:19
2254 2340 msgid "Manage Content"
2255 2341 msgstr ""
2256 2342  
2257   -#: app/views/profile_editor/index.rhtml:19
  2343 +#: app/views/profile_editor/index.rhtml:21
2258 2344 msgid "Change Password"
2259 2345 msgstr ""
2260 2346  
2261   -#: app/views/profile_editor/index.rhtml:23
  2347 +#: app/views/profile_editor/index.rhtml:25
2262 2348 msgid "Manage Members"
2263 2349 msgstr ""
2264 2350  
2265   -#: app/views/profile_editor/index.rhtml:25
  2351 +#: app/views/profile_editor/index.rhtml:27
2266 2352 msgid "Manage Products and Services"
2267 2353 msgstr ""
2268 2354  
2269   -#: app/views/profile_editor/index.rhtml:27
  2355 +#: app/views/profile_editor/index.rhtml:29
2270 2356 msgid "Enterprise Validation"
2271 2357 msgstr ""
2272 2358  
2273   -#: app/views/profile_editor/index.rhtml:33
  2359 +#: app/views/profile_editor/index.rhtml:35
2274 2360 msgid "Disable Enterprise"
2275 2361 msgstr ""
2276 2362  
2277   -#: app/views/profile_editor/index.rhtml:35
  2363 +#: app/views/profile_editor/index.rhtml:37
2278 2364 msgid "Enable Enterprise"
2279 2365 msgstr ""
2280 2366  
2281   -#: app/views/profile_editor/index.rhtml:42
  2367 +#: app/views/profile_editor/index.rhtml:47
2282 2368 msgid "Manage my groups"
2283 2369 msgstr ""
2284 2370  
... ... @@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
2330 2416 msgstr ""
2331 2417  
2332 2418 #: app/views/profile_editor/_organization.rhtml:12
2333   -msgid "Closed organization"
2334   -msgstr ""
2335   -
2336   -#: app/views/profile_editor/_person.rhtml:5
2337   -msgid "Male"
2338   -msgstr ""
2339   -
2340   -#: app/views/profile_editor/_person.rhtml:5
2341   -msgid "Female"
  2419 +msgid ""
  2420 +"New members must be approved by an administrator before joining this group?"
2342 2421 msgstr ""
2343 2422  
2344 2423 #: app/views/profile_editor/enable.rhtml:1
... ... @@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
2419 2498 msgid "Homepage: "
2420 2499 msgstr ""
2421 2500  
2422   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2501 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2423 2502 msgid "Products/Services"
2424 2503 msgstr ""
2425 2504  
... ... @@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
2480 2559 msgstr ""
2481 2560  
2482 2561 #: app/views/search/products.rhtml:3
2483   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2562 +msgid ""
  2563 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2564 +"{category}\""
2484 2565 msgstr ""
2485 2566  
2486 2567 #: app/views/search/products.rhtml:3
2487   -msgid "Products results for \"%s\""
  2568 +msgid "Products and Services results for \"%s\""
  2569 +msgstr ""
  2570 +
  2571 +#: app/views/search/products.rhtml:5
  2572 +msgid "Products and Services of enterprises in \"%s\""
2488 2573 msgstr ""
2489 2574  
2490 2575 #: app/views/search/products.rhtml:5
2491   -msgid "Products of enterprises in \"%s\""
  2576 +msgid "Products and Services"
2492 2577 msgstr ""
2493 2578  
2494   -#: app/views/search/products.rhtml:10
  2579 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2495 2580 msgid "Within %s km from %s"
2496 2581 msgstr ""
2497 2582  
2498 2583 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2499   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2500   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2584 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2585 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2501 2586 msgid "Refine your search"
2502 2587 msgstr ""
2503 2588  
... ... @@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
2505 2590 msgid "by %{author} on \"%{article}\""
2506 2591 msgstr ""
2507 2592  
2508   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2509   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2510   -#: app/views/search/articles.rhtml:12
  2593 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2594 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2511 2595 msgid "Search results for \"%{query}\" in \"%{category}\""
2512 2596 msgstr ""
2513 2597  
2514   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2515   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2516   -#: app/views/search/articles.rhtml:12
  2598 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2599 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2517 2600 msgid "Search results for \"%s\""
2518 2601 msgstr ""
2519 2602  
2520   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2521   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2522   -msgid "(recently added)"
  2603 +#: app/views/search/_product_categories_menu.rhtml:13
  2604 +msgid "There is no sub-categories for %s."
2523 2605 msgstr ""
2524 2606  
2525   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2526   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2527   -msgid "Browse by name"
  2607 +#: app/views/search/_product_categories_menu.rhtml:15
  2608 +msgid "There is no categories."
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/search/enterprises.rhtml:3
  2612 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/search/enterprises.rhtml:3
  2616 +msgid "Enterprise results for \"%s\""
2528 2617 msgstr ""
2529 2618  
2530   -#: app/views/search/_directory.rhtml:2
2531   -msgid "Recent"
  2619 +#: app/views/search/enterprises.rhtml:5
  2620 +msgid "Enterprises in \"%s\""
2532 2621 msgstr ""
2533 2622  
2534   -#: app/views/search/_display_results.rhtml:18
2535   -msgid "more..."
  2623 +#: app/views/search/_display_results.rhtml:21
  2624 +msgid "see all (%d)"
  2625 +msgstr ""
  2626 +
  2627 +#: app/views/search/_display_results.rhtml:21
  2628 +msgid "see all..."
2536 2629 msgstr ""
2537 2630  
2538 2631 #: app/views/search/popup.rhtml:3
2539 2632 msgid "Search %s"
2540 2633 msgstr ""
2541 2634  
  2635 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2636 +#: app/views/search/articles.rhtml:11
  2637 +msgid "(recently added)"
  2638 +msgstr ""
  2639 +
  2640 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2641 +#: app/views/search/articles.rhtml:17
  2642 +msgid "Browse by name"
  2643 +msgstr ""
  2644 +
2542 2645 #: app/views/search/_sellers_form.rhtml:1
2543 2646 msgid "Search for sellers"
2544 2647 msgstr ""
... ... @@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
2547 2650 msgid "Search in:"
2548 2651 msgstr ""
2549 2652  
2550   -#: app/views/search/_sellers_form.rhtml:13
2551   -#: app/views/search/_search_form.rhtml:27
  2653 +#: app/views/search/_sellers_form.rhtml:17
2552 2654 msgid "Distance (km): "
2553 2655 msgstr ""
2554 2656  
2555   -#: app/views/search/_sellers_form.rhtml:16
2556   -#: app/views/search/_search_form.rhtml:28
2557   -msgid "From: "
2558   -msgstr ""
2559   -
2560   -#: app/views/search/_product.rhtml:10
  2657 +#: app/views/search/_product.rhtml:15
2561 2658 msgid "Price: %d"
2562 2659 msgstr ""
2563 2660  
2564   -#: app/views/search/_product.rhtml:12
  2661 +#: app/views/search/_product.rhtml:17
2565 2662 msgid "Suplier: %s"
2566 2663 msgstr ""
2567 2664  
... ... @@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
2581 2678 msgid "Search within:"
2582 2679 msgstr ""
2583 2680  
2584   -#: app/views/search/_search_form.rhtml:35
  2681 +#: app/views/search/_search_form.rhtml:28
  2682 +msgid "Distance (km):"
  2683 +msgstr ""
  2684 +
  2685 +#: app/views/search/_search_form.rhtml:33
  2686 +msgid "From:"
  2687 +msgstr ""
  2688 +
  2689 +#: app/views/search/_search_form.rhtml:42
2585 2690 msgid "Search for:"
2586 2691 msgstr ""
2587 2692  
2588   -#: app/views/search/_search_form.rhtml:49
  2693 +#: app/views/search/_search_form.rhtml:56
2589 2694 msgid "Advanced search"
2590 2695 msgstr ""
2591 2696  
... ... @@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
2597 2702 msgid "Last update: %s."
2598 2703 msgstr ""
2599 2704  
2600   -#: app/views/search/_google_maps.rhtml:48
  2705 +#: app/views/search/_google_maps.rhtml:68
2601 2706 msgid ""
2602 2707 "One or more items don't have geographical information, and won't be shown in "
2603 2708 "the map. Choose \"Display in list\" to see them."
... ... @@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
2655 2760 msgid "Join this enterprise"
2656 2761 msgstr ""
2657 2762  
2658   -#: app/views/blocks/profile_info.rhtml:6
  2763 +#: app/views/blocks/profile_info.rhtml:17
2659 2764 msgid "Since %{year}/%{month}"
2660 2765 msgstr ""
2661 2766  
2662   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  2767 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2663 2768 msgid "Homepage"
2664 2769 msgstr ""
2665 2770  
2666   -#: app/views/blocks/profile_info.rhtml:8
  2771 +#: app/views/blocks/profile_info.rhtml:19
2667 2772 msgid "View profile"
2668 2773 msgstr ""
2669 2774  
2670   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  2775 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2671 2776 msgid "Control panel"
2672 2777 msgstr ""
2673 2778  
... ... @@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
2792 2897 msgid "Properties"
2793 2898 msgstr ""
2794 2899  
2795   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  2900 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
2796 2901 msgid "Public view"
2797 2902 msgstr ""
2798 2903  
2799 2904 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  2905 +msgid "Use as homepage"
  2906 +msgstr ""
  2907 +
  2908 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
2800 2909 msgid "Delete"
2801 2910 msgstr ""
2802 2911  
2803   -#: app/views/cms/view.rhtml:42
  2912 +#: app/views/cms/view.rhtml:43
2804 2913 msgid ""
2805 2914 "Are you sure that you want to remove this folder? Note that all the items "
2806 2915 "inside it will also be removed!"
2807 2916 msgstr ""
2808 2917  
2809   -#: app/views/cms/view.rhtml:67
2810   -msgid "Use as homepage"
2811   -msgstr ""
2812   -
2813   -#: app/views/cms/view.rhtml:68
  2918 +#: app/views/cms/view.rhtml:69
2814 2919 msgid "Are you sure that you want to remove this item?"
2815 2920 msgstr ""
2816 2921  
... ... @@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
3412 3517 msgid "We need to be sure that you wrote correctly your password."
3413 3518 msgstr ""
3414 3519  
3415   -#: app/views/account/signup.rhtml:33
  3520 +#: app/views/account/signup.rhtml:35
3416 3521 #: app/views/account/activate_enterprise.rhtml:37
3417 3522 msgid "I accept the terms of use"
3418 3523 msgstr ""
3419 3524  
3420   -#: app/views/account/signup.rhtml:38
  3525 +#: app/views/account/signup.rhtml:40
3421 3526 #: app/views/account/activate_enterprise.rhtml:42
3422 3527 msgid "Sign up"
3423 3528 msgstr ""
... ...
po/nl/noosfero.po
  Diff comments   View file @b24d068
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.10.1\n"
10   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
  10 +"POT-Creation-Date: 2008-07-08 19:03-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"
... ... @@ -23,7 +23,7 @@ msgstr &quot;&quot;
23 23  
24 24 #: app/helpers/application_helper.rb:81
25 25 #: app/views/box_organizer/add_block.rhtml:18
26   -#: app/views/search/_search_form.rhtml:56
  26 +#: app/views/search/_search_form.rhtml:63
27 27 msgid "Close"
28 28 msgstr ""
29 29  
... ... @@ -31,61 +31,63 @@ msgstr &quot;&quot;
31 31 msgid "This is %s, version %s"
32 32 msgstr ""
33 33  
34   -#: app/helpers/application_helper.rb:318
35   -#: app/views/memberships/new_community.rhtml:12
36   -#: app/views/box_organizer/edit.rhtml:9
37   -#: app/views/admin_panel/site_info.rhtml:11
38   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
39   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
40   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
41   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
42   -msgid "Cancel"
43   -msgstr ""
44   -
45   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  34 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
46 35 msgid "Uncategorized product"
47 36 msgstr ""
48 37  
49   -#: app/helpers/application_helper.rb:366
  38 +#: app/helpers/application_helper.rb:252
50 39 msgid "No product"
51 40 msgstr ""
52 41  
53   -#: app/helpers/application_helper.rb:472
  42 +#: app/helpers/application_helper.rb:338
  43 +msgid "non registered gender"
  44 +msgstr ""
  45 +
  46 +#: app/helpers/application_helper.rb:338
  47 +#: app/views/profile_editor/_person.rhtml:5
  48 +msgid "Male"
  49 +msgstr ""
  50 +
  51 +#: app/helpers/application_helper.rb:338
  52 +#: app/views/profile_editor/_person.rhtml:5
  53 +msgid "Female"
  54 +msgstr ""
  55 +
  56 +#: app/helpers/application_helper.rb:366
54 57 msgid "Click on this icon to go to the <b>%s</b>'s home page"
55 58 msgstr ""
56 59  
57   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  60 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
58 61 #: app/views/content_viewer/view_page.rhtml:65
59 62 msgid "Categories"
60 63 msgstr ""
61 64  
62   -#: app/helpers/application_helper.rb:532
  65 +#: app/helpers/application_helper.rb:417
63 66 msgid "open"
64 67 msgstr ""
65 68  
66   -#: app/helpers/application_helper.rb:568
  69 +#: app/helpers/application_helper.rb:453
67 70 msgid "Search..."
68 71 msgstr ""
69 72  
70   -#: app/helpers/application_helper.rb:570
  73 +#: app/helpers/application_helper.rb:455
71 74 msgid "This is a search box. Click, write your query, and press enter to find"
72 75 msgstr ""
73 76  
74   -#: app/helpers/application_helper.rb:571
  77 +#: app/helpers/application_helper.rb:456
75 78 msgid "Click, write and press enter to find"
76 79 msgstr ""
77 80  
78   -#: app/helpers/application_helper.rb:577
  81 +#: app/helpers/application_helper.rb:462
79 82 #: app/views/region_validators/region.rhtml:23
80   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
81   -#: app/views/search/_sellers_form.rhtml:22
  83 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
82 84 #: app/views/search/_search_form.rhtml:16
83   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  85 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
84 86 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
85 87 msgid "Search"
86 88 msgstr ""
87 89  
88   -#: app/helpers/application_helper.rb:652
  90 +#: app/helpers/application_helper.rb:518
89 91 msgid "Are you sure you want to visit this web site?"
90 92 msgstr ""
91 93  
... ... @@ -97,6 +99,39 @@ msgstr &quot;&quot;
97 99 msgid "Display in map"
98 100 msgstr ""
99 101  
  102 +#: app/helpers/search_helper.rb:53
  103 +msgid "E-Mail: "
  104 +msgstr ""
  105 +
  106 +#: app/helpers/search_helper.rb:56
  107 +msgid "Phone(s): "
  108 +msgstr ""
  109 +
  110 +#: app/helpers/search_helper.rb:59
  111 +msgid "Location: "
  112 +msgstr ""
  113 +
  114 +#: app/helpers/search_helper.rb:62
  115 +msgid "Address: "
  116 +msgstr ""
  117 +
  118 +#: app/helpers/search_helper.rb:65
  119 +msgid "Products/Services: "
  120 +msgstr ""
  121 +
  122 +#: app/helpers/search_helper.rb:68
  123 +msgid "Distance: "
  124 +msgstr ""
  125 +
  126 +#: app/helpers/search_helper.rb:81
  127 +msgid "Previous"
  128 +msgstr ""
  129 +
  130 +#: app/helpers/search_helper.rb:81
  131 +#: app/views/enterprise_registration/basic_information.rhtml:32
  132 +msgid "Next"
  133 +msgstr ""
  134 +
100 135 #: app/helpers/dates_helper.rb:6
101 136 msgid "January"
102 137 msgstr ""
... ... @@ -145,47 +180,47 @@ msgstr &quot;&quot;
145 180 msgid "December"
146 181 msgstr ""
147 182  
148   -#: app/helpers/dates_helper.rb:23
149   -msgid "%d %B %Y"
  183 +#: app/helpers/dates_helper.rb:27
  184 +msgid "%{month} %{day}, %{year}"
150 185 msgstr ""
151 186  
152   -#: app/helpers/dates_helper.rb:32
  187 +#: app/helpers/dates_helper.rb:36
153 188 msgid "%d %B %Y, %H:%m"
154 189 msgstr ""
155 190  
156   -#: app/helpers/dates_helper.rb:42
  191 +#: app/helpers/dates_helper.rb:46
157 192 msgid "from %s to %s"
158 193 msgstr ""
159 194  
160   -#: app/helpers/dates_helper.rb:49
  195 +#: app/helpers/dates_helper.rb:53
161 196 msgid "Sunday"
162 197 msgstr ""
163 198  
164   -#: app/helpers/dates_helper.rb:50
  199 +#: app/helpers/dates_helper.rb:54
165 200 msgid "Monday"
166 201 msgstr ""
167 202  
168   -#: app/helpers/dates_helper.rb:51
  203 +#: app/helpers/dates_helper.rb:55
169 204 msgid "Tuesday"
170 205 msgstr ""
171 206  
172   -#: app/helpers/dates_helper.rb:52
  207 +#: app/helpers/dates_helper.rb:56
173 208 msgid "Wednesday"
174 209 msgstr ""
175 210  
176   -#: app/helpers/dates_helper.rb:53
  211 +#: app/helpers/dates_helper.rb:57
177 212 msgid "Thursday"
178 213 msgstr ""
179 214  
180   -#: app/helpers/dates_helper.rb:54
  215 +#: app/helpers/dates_helper.rb:58
181 216 msgid "Friday"
182 217 msgstr ""
183 218  
184   -#: app/helpers/dates_helper.rb:55
  219 +#: app/helpers/dates_helper.rb:59
185 220 msgid "Saturday"
186 221 msgstr ""
187 222  
188   -#: app/helpers/dates_helper.rb:71
  223 +#: app/helpers/dates_helper.rb:72
189 224 msgid "%{month} %{year}"
190 225 msgstr ""
191 226  
... ... @@ -207,32 +242,68 @@ msgid &quot;&quot;
207 242 "It does not affect the language of the content created by other users."
208 243 msgstr ""
209 244  
  245 +#: app/helpers/enterprise_homepage_helper.rb:6
  246 +#: app/views/enterprise_editor/index.rhtml:8
  247 +msgid "Contact person:"
  248 +msgstr ""
  249 +
  250 +#: app/helpers/enterprise_homepage_helper.rb:7
  251 +msgid "e-Mail:"
  252 +msgstr ""
  253 +
  254 +#: app/helpers/enterprise_homepage_helper.rb:8
  255 +msgid "Phone(s):"
  256 +msgstr ""
  257 +
  258 +#: app/helpers/enterprise_homepage_helper.rb:9
  259 +msgid "Location:"
  260 +msgstr ""
  261 +
  262 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  263 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  264 +msgid "Address:"
  265 +msgstr ""
  266 +
  267 +#: app/helpers/enterprise_homepage_helper.rb:11
  268 +msgid "Legal form:"
  269 +msgstr ""
  270 +
  271 +#: app/helpers/enterprise_homepage_helper.rb:12
  272 +#: app/views/enterprise_editor/index.rhtml:10
  273 +msgid "Foundation year:"
  274 +msgstr ""
  275 +
  276 +#: app/helpers/enterprise_homepage_helper.rb:13
  277 +#: app/views/enterprise_editor/index.rhtml:12
  278 +msgid "Economic activity:"
  279 +msgstr ""
  280 +
  281 +#: app/helpers/enterprise_homepage_helper.rb:21
  282 +msgid "Distance:"
  283 +msgstr ""
  284 +
210 285 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
211 286 msgid "Main content"
212 287 msgstr ""
213 288  
214   -#: app/helpers/boxes_helper.rb:124
  289 +#: app/helpers/boxes_helper.rb:125
215 290 msgid "Move block up"
216 291 msgstr ""
217 292  
218   -#: app/helpers/boxes_helper.rb:125
  293 +#: app/helpers/boxes_helper.rb:129
219 294 msgid "Move block down"
220 295 msgstr ""
221 296  
222   -#: app/helpers/boxes_helper.rb:126
223   -msgid "Remove block"
224   -msgstr ""
225   -
226   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  297 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
227 298 #: app/views/manage_products/index.rhtml:14
228 299 #: app/views/manage_products/index.rhtml:40
229   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  300 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
230 301 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
231 302 msgid "Edit"
232 303 msgstr ""
233 304  
234   -#: app/helpers/profile_helper.rb:7
235   -msgid "edit your information"
  305 +#: app/helpers/boxes_helper.rb:137
  306 +msgid "Remove block"
236 307 msgstr ""
237 308  
238 309 #: app/helpers/tags_helper.rb:33
... ... @@ -255,6 +326,24 @@ msgstr &quot;&quot;
255 326 msgid "Administrator assigns validator organizations per region."
256 327 msgstr ""
257 328  
  329 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  330 +#: app/views/box_organizer/edit.rhtml:9
  331 +#: app/views/admin_panel/site_info.rhtml:11
  332 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  333 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  334 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  335 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  336 +msgid "Cancel"
  337 +msgstr ""
  338 +
  339 +#: app/helpers/forms_helper.rb:64
  340 +msgid "State:"
  341 +msgstr ""
  342 +
  343 +#: app/helpers/forms_helper.rb:65
  344 +msgid "City:"
  345 +msgstr ""
  346 +
258 347 #: app/helpers/categories_helper.rb:6
259 348 msgid "Do not display at the menu"
260 349 msgstr ""
... ... @@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
296 385 msgstr ""
297 386  
298 387 #: app/helpers/assets_helper.rb:7
299   -#: app/controllers/public/search_controller.rb:92
  388 +#: app/controllers/public/search_controller.rb:133
300 389 msgid "Articles"
301 390 msgstr ""
302 391  
303 392 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
304   -#: app/controllers/public/search_controller.rb:94
  393 +#: app/controllers/public/search_controller.rb:135
305 394 msgid "People"
306 395 msgstr ""
307 396  
308   -#: app/helpers/assets_helper.rb:9
309   -#: app/controllers/public/search_controller.rb:96
310   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  397 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  398 +#: app/controllers/public/search_controller.rb:137
  399 +#: app/views/search/_sellers_form.rhtml:7
311 400 msgid "Products"
312 401 msgstr ""
313 402  
314 403 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
315   -#: app/controllers/public/search_controller.rb:93
  404 +#: app/controllers/public/search_controller.rb:134
316 405 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
317 406 msgid "Enterprises"
318 407 msgstr ""
319 408  
320 409 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
321   -#: app/controllers/public/search_controller.rb:95
  410 +#: app/controllers/public/search_controller.rb:136
322 411 #: app/views/profile/index.rhtml:22
323 412 msgid "Communities"
324 413 msgstr ""
325 414  
326 415 #: app/helpers/assets_helper.rb:12
327   -#: app/controllers/public/search_controller.rb:97
  416 +#: app/controllers/public/search_controller.rb:138
328 417 msgid "Events"
329 418 msgstr ""
330 419  
331 420 #: app/models/enterprise.rb:5 app/models/product.rb:-
  421 +#: app/views/search/enterprises.rhtml:5
332 422 msgid "Enterprise"
333 423 msgstr ""
334 424  
... ... @@ -336,37 +426,37 @@ msgstr &quot;&quot;
336 426 msgid "Community"
337 427 msgstr ""
338 428  
339   -#: app/models/organization.rb:43
  429 +#: app/models/organization.rb:41
340 430 msgid "Contact person"
341 431 msgstr ""
342 432  
343   -#: app/models/organization.rb:43 app/models/environment.rb:-
  433 +#: app/models/organization.rb:41 app/models/environment.rb:-
344 434 msgid "Contact email"
345 435 msgstr ""
346 436  
347   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  437 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
348 438 #: app/views/enterprise_validation/_details.rhtml:19
349 439 msgid "Acronym"
350 440 msgstr ""
351 441  
352   -#: app/models/organization.rb:43
  442 +#: app/models/organization.rb:41
353 443 msgid "Foundation year"
354 444 msgstr ""
355 445  
356   -#: app/models/organization.rb:43
  446 +#: app/models/organization.rb:41
357 447 msgid "Legal form"
358 448 msgstr ""
359 449  
360   -#: app/models/organization.rb:43
  450 +#: app/models/organization.rb:41
361 451 msgid "Economic activity"
362 452 msgstr ""
363 453  
364   -#: app/models/organization.rb:43
  454 +#: app/models/organization.rb:41
365 455 #: app/views/enterprise_registration/basic_information.rhtml:27
366 456 msgid "Management information"
367 457 msgstr ""
368 458  
369   -#: app/models/organization.rb:43
  459 +#: app/models/organization.rb:41
370 460 msgid "Validated"
371 461 msgstr ""
372 462  
... ... @@ -441,8 +531,12 @@ msgstr &quot;&quot;
441 531 msgid "The task was cancelled at %s"
442 532 msgstr ""
443 533  
  534 +#: app/models/link_list_block.rb:7
  535 +msgid "Display a list of links."
  536 +msgstr ""
  537 +
444 538 #: app/models/favorite_enterprises_block.rb:4
445   -#: app/views/profile_editor/index.rhtml:29
  539 +#: app/views/profile_editor/index.rhtml:31
446 540 msgid "Favorite Enterprises"
447 541 msgstr ""
448 542  
... ... @@ -637,6 +731,10 @@ msgstr &quot;&quot;
637 731 msgid "Virtual"
638 732 msgstr ""
639 733  
  734 +#: app/models/products_block.rb:16
  735 +msgid "View all products"
  736 +msgstr ""
  737 +
640 738 #: app/models/tags_block.rb:8
641 739 msgid "Block listing content count by tag"
642 740 msgstr ""
... ... @@ -647,8 +745,8 @@ msgid &quot;&quot;
647 745 " Try to add some tags to some articles and see your tag cloud to grow."
648 746 msgstr ""
649 747  
650   -#: app/models/tags_block.rb:17
651   -msgid "%s's tags"
  748 +#: app/models/tags_block.rb:20
  749 +msgid "tags"
652 750 msgstr ""
653 751  
654 752 #: app/models/friendship.rb:-
... ... @@ -742,7 +840,7 @@ msgstr &quot;&quot;
742 840 msgid "Manage products"
743 841 msgstr ""
744 842  
745   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  843 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
746 844 msgid "Manage friends"
747 845 msgstr ""
748 846  
... ... @@ -754,25 +852,25 @@ msgstr &quot;&quot;
754 852 msgid "Perform task"
755 853 msgstr ""
756 854  
757   -#: app/models/profile.rb:144
  855 +#: app/models/profile.rb:155
758 856 msgid "An existing profile cannot be renamed."
759 857 msgstr ""
760 858  
761   -#: app/models/profile.rb:299
  859 +#: app/models/profile.rb:319
762 860 msgid "%s's home page"
763 861 msgstr ""
764 862  
765   -#: app/models/profile.rb:299
  863 +#: app/models/profile.rb:319
766 864 msgid ""
767 865 "<p>This is a default homepage created for %s. It can be changed though the "
768 866 "control panel.</p>"
769 867 msgstr ""
770 868  
771   -#: app/models/profile.rb:318
  869 +#: app/models/profile.rb:338
772 870 msgid "%s can't has members"
773 871 msgstr ""
774 872  
775   -#: app/models/profile.rb:335
  873 +#: app/models/profile.rb:355
776 874 msgid "%s can't has moderators"
777 875 msgstr ""
778 876  
... ... @@ -800,10 +898,6 @@ msgstr &quot;&quot;
800 898 msgid "%{fn} was already assigned to another category."
801 899 msgstr ""
802 900  
803   -#: app/models/category.rb:13
804   -msgid "%{fn} must be the same as the parents'"
805   -msgstr ""
806   -
807 901 #: app/models/article_block.rb:4
808 902 msgid "Display one of your contents."
809 903 msgstr ""
... ... @@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
1009 1103 msgstr ""
1010 1104  
1011 1105 #: app/models/profile_list_block.rb:75
1012   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1106 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1013 1107 msgid "None"
1014 1108 msgstr ""
1015 1109  
... ... @@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
1053 1147 msgid "thumbnail"
1054 1148 msgstr ""
1055 1149  
  1150 +#: app/models/enterprise_homepage.rb:4
  1151 +msgid "Enterprise homepage."
  1152 +msgstr ""
  1153 +
  1154 +#: app/models/enterprise_homepage.rb:8
  1155 +msgid "Display the summary of profile."
  1156 +msgstr ""
  1157 +
1056 1158 #: app/models/sellers_search_block.rb:4
1057 1159 msgid "A search for enterprises by products selled and local"
1058 1160 msgstr ""
... ... @@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
1375 1477 msgid "URL:"
1376 1478 msgstr ""
1377 1479  
1378   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1379   -#: app/views/cms/_event.rhtml:12
1380   -msgid "Address:"
1381   -msgstr ""
1382   -
1383 1480 #: app/models/event.rb:77
1384 1481 msgid "When:"
1385 1482 msgstr ""
... ... @@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
1457 1554 msgid "%s still needs to accept being your friend."
1458 1555 msgstr ""
1459 1556  
1460   -#: app/controllers/my_profile/cms_controller.rb:97
  1557 +#: app/controllers/my_profile/cms_controller.rb:103
1461 1558 msgid "Article \"%s\" configured as home page."
1462 1559 msgstr ""
1463 1560  
... ... @@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
1525 1622 msgid "This action is not available for \"%s\"."
1526 1623 msgstr ""
1527 1624  
1528   -#: app/controllers/public/search_controller.rb:182
1529   -msgid "Newer profiles"
  1625 +#: app/controllers/public/search_controller.rb:196
  1626 +msgid "Newer people"
1530 1627 msgstr ""
1531 1628  
1532   -#: app/controllers/public/search_controller.rb:183
1533   -msgid "Newer communities"
  1629 +#: app/controllers/public/search_controller.rb:197
  1630 +msgid "Newer enterprises"
1534 1631 msgstr ""
1535 1632  
1536   -#: app/controllers/public/search_controller.rb:184
1537   -msgid "Newer articles"
  1633 +#: app/controllers/public/search_controller.rb:199
  1634 +msgid "Upcoming events"
1538 1635 msgstr ""
1539 1636  
1540   -#: app/controllers/public/search_controller.rb:185
1541   -msgid "Most commented articles"
  1637 +#: app/controllers/public/search_controller.rb:200
  1638 +msgid "Newer communities"
1542 1639 msgstr ""
1543 1640  
1544   -#: app/controllers/public/search_controller.rb:186
1545   -msgid "Newer enterprises"
  1641 +#: app/controllers/public/search_controller.rb:201
  1642 +msgid "Newer articles"
1546 1643 msgstr ""
1547 1644  
1548   -#: app/controllers/public/search_controller.rb:187
1549   -msgid "Near events TODO"
  1645 +#: app/controllers/public/search_controller.rb:202
  1646 +msgid "Most commented articles"
1550 1647 msgstr ""
1551 1648  
1552   -#: app/controllers/public/account_controller.rb:21
  1649 +#: app/controllers/public/account_controller.rb:23
1553 1650 msgid "Logged in successfully"
1554 1651 msgstr ""
1555 1652  
1556   -#: app/controllers/public/account_controller.rb:23
  1653 +#: app/controllers/public/account_controller.rb:25
1557 1654 msgid "Incorrect username or password"
1558 1655 msgstr ""
1559 1656  
1560   -#: app/controllers/public/account_controller.rb:51
  1657 +#: app/controllers/public/account_controller.rb:53
1561 1658 msgid "Thanks for signing up!"
1562 1659 msgstr ""
1563 1660  
1564   -#: app/controllers/public/account_controller.rb:69
  1661 +#: app/controllers/public/account_controller.rb:71
1565 1662 msgid "You have been logged out."
1566 1663 msgstr ""
1567 1664  
1568   -#: app/controllers/public/account_controller.rb:80
  1665 +#: app/controllers/public/account_controller.rb:82
1569 1666 msgid "Your password has been changed successfully!"
1570 1667 msgstr ""
1571 1668  
1572   -#: app/controllers/public/account_controller.rb:83
  1669 +#: app/controllers/public/account_controller.rb:85
1573 1670 msgid "The supplied current password is incorrect."
1574 1671 msgstr ""
1575 1672  
... ... @@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
1626 1723 msgstr ""
1627 1724  
1628 1725 #: app/views/memberships/index.rhtml:26
1629   -#: app/views/profile_editor/index.rhtml:46
  1726 +#: app/views/profile_editor/index.rhtml:51
1630 1727 #: app/views/profile/enterprises.rhtml:15
1631 1728 msgid "Register a new Enterprise"
1632 1729 msgstr ""
1633 1730  
1634 1731 #: app/views/memberships/index.rhtml:27
1635   -#: app/views/profile_editor/index.rhtml:45
  1732 +#: app/views/profile_editor/index.rhtml:50
1636 1733 #: app/views/profile/communities.rhtml:15
1637 1734 msgid "Create a new community"
1638 1735 msgstr ""
... ... @@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
1926 2023 msgid "Add a block"
1927 2024 msgstr ""
1928 2025  
  2026 +#: app/views/box_organizer/_products_block.rhtml:5
  2027 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2028 +msgid "Select the products that must be shown."
  2029 +msgstr ""
  2030 +
1929 2031 #: app/views/box_organizer/edit.rhtml:1
1930 2032 msgid "Editing block"
1931 2033 msgstr ""
... ... @@ -2124,10 +2226,6 @@ msgid &quot;&quot;
2124 2226 "profile"
2125 2227 msgstr ""
2126 2228  
2127   -#: app/views/enterprise_registration/basic_information.rhtml:32
2128   -msgid "Next"
2129   -msgstr ""
2130   -
2131 2229 #: app/views/enterprise_editor/_form.rhtml:7
2132 2230 #: app/views/enterprise_validation/list_processed.rhtml:13
2133 2231 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
2174 2272 msgid "Contact phone:"
2175 2273 msgstr ""
2176 2274  
2177   -#: app/views/enterprise_editor/index.rhtml:8
2178   -msgid "Contact person:"
2179   -msgstr ""
2180   -
2181 2275 #: app/views/enterprise_editor/index.rhtml:9
2182 2276 msgid "Acronym:"
2183 2277 msgstr ""
2184 2278  
2185   -#: app/views/enterprise_editor/index.rhtml:10
2186   -msgid "Foundation year:"
2187   -msgstr ""
2188   -
2189 2279 #: app/views/enterprise_editor/index.rhtml:11
2190 2280 msgid "Legal Form:"
2191 2281 msgstr ""
2192 2282  
2193   -#: app/views/enterprise_editor/index.rhtml:12
2194   -msgid "Economic activity:"
2195   -msgstr ""
2196   -
2197 2283 #: app/views/enterprise_editor/index.rhtml:13
2198 2284 msgid "Management infomation:"
2199 2285 msgstr ""
... ... @@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
2234 2320 msgid "My profile"
2235 2321 msgstr ""
2236 2322  
2237   -#: app/views/profile_editor/index.rhtml:9
  2323 +#: app/views/profile_editor/index.rhtml:11
2238 2324 msgid "Edit Profile"
2239 2325 msgstr ""
2240 2326  
2241   -#: app/views/profile_editor/index.rhtml:11
  2327 +#: app/views/profile_editor/index.rhtml:13
2242 2328 msgid "Mail settings"
2243 2329 msgstr ""
2244 2330  
2245   -#: app/views/profile_editor/index.rhtml:13
  2331 +#: app/views/profile_editor/index.rhtml:15
2246 2332 msgid "Pending tasks"
2247 2333 msgstr ""
2248 2334  
2249   -#: app/views/profile_editor/index.rhtml:15
  2335 +#: app/views/profile_editor/index.rhtml:17
2250 2336 msgid "Edit Visual Design"
2251 2337 msgstr ""
2252 2338  
2253   -#: app/views/profile_editor/index.rhtml:17
  2339 +#: app/views/profile_editor/index.rhtml:19
2254 2340 msgid "Manage Content"
2255 2341 msgstr ""
2256 2342  
2257   -#: app/views/profile_editor/index.rhtml:19
  2343 +#: app/views/profile_editor/index.rhtml:21
2258 2344 msgid "Change Password"
2259 2345 msgstr ""
2260 2346  
2261   -#: app/views/profile_editor/index.rhtml:23
  2347 +#: app/views/profile_editor/index.rhtml:25
2262 2348 msgid "Manage Members"
2263 2349 msgstr ""
2264 2350  
2265   -#: app/views/profile_editor/index.rhtml:25
  2351 +#: app/views/profile_editor/index.rhtml:27
2266 2352 msgid "Manage Products and Services"
2267 2353 msgstr ""
2268 2354  
2269   -#: app/views/profile_editor/index.rhtml:27
  2355 +#: app/views/profile_editor/index.rhtml:29
2270 2356 msgid "Enterprise Validation"
2271 2357 msgstr ""
2272 2358  
2273   -#: app/views/profile_editor/index.rhtml:33
  2359 +#: app/views/profile_editor/index.rhtml:35
2274 2360 msgid "Disable Enterprise"
2275 2361 msgstr ""
2276 2362  
2277   -#: app/views/profile_editor/index.rhtml:35
  2363 +#: app/views/profile_editor/index.rhtml:37
2278 2364 msgid "Enable Enterprise"
2279 2365 msgstr ""
2280 2366  
2281   -#: app/views/profile_editor/index.rhtml:42
  2367 +#: app/views/profile_editor/index.rhtml:47
2282 2368 msgid "Manage my groups"
2283 2369 msgstr ""
2284 2370  
... ... @@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
2330 2416 msgstr ""
2331 2417  
2332 2418 #: app/views/profile_editor/_organization.rhtml:12
2333   -msgid "Closed organization"
2334   -msgstr ""
2335   -
2336   -#: app/views/profile_editor/_person.rhtml:5
2337   -msgid "Male"
2338   -msgstr ""
2339   -
2340   -#: app/views/profile_editor/_person.rhtml:5
2341   -msgid "Female"
  2419 +msgid ""
  2420 +"New members must be approved by an administrator before joining this group?"
2342 2421 msgstr ""
2343 2422  
2344 2423 #: app/views/profile_editor/enable.rhtml:1
... ... @@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
2419 2498 msgid "Homepage: "
2420 2499 msgstr ""
2421 2500  
2422   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2501 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2423 2502 msgid "Products/Services"
2424 2503 msgstr ""
2425 2504  
... ... @@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
2480 2559 msgstr ""
2481 2560  
2482 2561 #: app/views/search/products.rhtml:3
2483   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2562 +msgid ""
  2563 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2564 +"{category}\""
2484 2565 msgstr ""
2485 2566  
2486 2567 #: app/views/search/products.rhtml:3
2487   -msgid "Products results for \"%s\""
  2568 +msgid "Products and Services results for \"%s\""
  2569 +msgstr ""
  2570 +
  2571 +#: app/views/search/products.rhtml:5
  2572 +msgid "Products and Services of enterprises in \"%s\""
2488 2573 msgstr ""
2489 2574  
2490 2575 #: app/views/search/products.rhtml:5
2491   -msgid "Products of enterprises in \"%s\""
  2576 +msgid "Products and Services"
2492 2577 msgstr ""
2493 2578  
2494   -#: app/views/search/products.rhtml:10
  2579 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2495 2580 msgid "Within %s km from %s"
2496 2581 msgstr ""
2497 2582  
2498 2583 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2499   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2500   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2584 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2585 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2501 2586 msgid "Refine your search"
2502 2587 msgstr ""
2503 2588  
... ... @@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
2505 2590 msgid "by %{author} on \"%{article}\""
2506 2591 msgstr ""
2507 2592  
2508   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2509   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2510   -#: app/views/search/articles.rhtml:12
  2593 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2594 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2511 2595 msgid "Search results for \"%{query}\" in \"%{category}\""
2512 2596 msgstr ""
2513 2597  
2514   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2515   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2516   -#: app/views/search/articles.rhtml:12
  2598 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2599 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2517 2600 msgid "Search results for \"%s\""
2518 2601 msgstr ""
2519 2602  
2520   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2521   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2522   -msgid "(recently added)"
  2603 +#: app/views/search/_product_categories_menu.rhtml:13
  2604 +msgid "There is no sub-categories for %s."
2523 2605 msgstr ""
2524 2606  
2525   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2526   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2527   -msgid "Browse by name"
  2607 +#: app/views/search/_product_categories_menu.rhtml:15
  2608 +msgid "There is no categories."
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/search/enterprises.rhtml:3
  2612 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/search/enterprises.rhtml:3
  2616 +msgid "Enterprise results for \"%s\""
2528 2617 msgstr ""
2529 2618  
2530   -#: app/views/search/_directory.rhtml:2
2531   -msgid "Recent"
  2619 +#: app/views/search/enterprises.rhtml:5
  2620 +msgid "Enterprises in \"%s\""
2532 2621 msgstr ""
2533 2622  
2534   -#: app/views/search/_display_results.rhtml:18
2535   -msgid "more..."
  2623 +#: app/views/search/_display_results.rhtml:21
  2624 +msgid "see all (%d)"
  2625 +msgstr ""
  2626 +
  2627 +#: app/views/search/_display_results.rhtml:21
  2628 +msgid "see all..."
2536 2629 msgstr ""
2537 2630  
2538 2631 #: app/views/search/popup.rhtml:3
2539 2632 msgid "Search %s"
2540 2633 msgstr ""
2541 2634  
  2635 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2636 +#: app/views/search/articles.rhtml:11
  2637 +msgid "(recently added)"
  2638 +msgstr ""
  2639 +
  2640 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2641 +#: app/views/search/articles.rhtml:17
  2642 +msgid "Browse by name"
  2643 +msgstr ""
  2644 +
2542 2645 #: app/views/search/_sellers_form.rhtml:1
2543 2646 msgid "Search for sellers"
2544 2647 msgstr ""
... ... @@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
2547 2650 msgid "Search in:"
2548 2651 msgstr ""
2549 2652  
2550   -#: app/views/search/_sellers_form.rhtml:13
2551   -#: app/views/search/_search_form.rhtml:27
  2653 +#: app/views/search/_sellers_form.rhtml:17
2552 2654 msgid "Distance (km): "
2553 2655 msgstr ""
2554 2656  
2555   -#: app/views/search/_sellers_form.rhtml:16
2556   -#: app/views/search/_search_form.rhtml:28
2557   -msgid "From: "
2558   -msgstr ""
2559   -
2560   -#: app/views/search/_product.rhtml:10
  2657 +#: app/views/search/_product.rhtml:15
2561 2658 msgid "Price: %d"
2562 2659 msgstr ""
2563 2660  
2564   -#: app/views/search/_product.rhtml:12
  2661 +#: app/views/search/_product.rhtml:17
2565 2662 msgid "Suplier: %s"
2566 2663 msgstr ""
2567 2664  
... ... @@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
2581 2678 msgid "Search within:"
2582 2679 msgstr ""
2583 2680  
2584   -#: app/views/search/_search_form.rhtml:35
  2681 +#: app/views/search/_search_form.rhtml:28
  2682 +msgid "Distance (km):"
  2683 +msgstr ""
  2684 +
  2685 +#: app/views/search/_search_form.rhtml:33
  2686 +msgid "From:"
  2687 +msgstr ""
  2688 +
  2689 +#: app/views/search/_search_form.rhtml:42
2585 2690 msgid "Search for:"
2586 2691 msgstr ""
2587 2692  
2588   -#: app/views/search/_search_form.rhtml:49
  2693 +#: app/views/search/_search_form.rhtml:56
2589 2694 msgid "Advanced search"
2590 2695 msgstr ""
2591 2696  
... ... @@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
2597 2702 msgid "Last update: %s."
2598 2703 msgstr ""
2599 2704  
2600   -#: app/views/search/_google_maps.rhtml:48
  2705 +#: app/views/search/_google_maps.rhtml:68
2601 2706 msgid ""
2602 2707 "One or more items don't have geographical information, and won't be shown in "
2603 2708 "the map. Choose \"Display in list\" to see them."
... ... @@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
2655 2760 msgid "Join this enterprise"
2656 2761 msgstr ""
2657 2762  
2658   -#: app/views/blocks/profile_info.rhtml:6
  2763 +#: app/views/blocks/profile_info.rhtml:17
2659 2764 msgid "Since %{year}/%{month}"
2660 2765 msgstr ""
2661 2766  
2662   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  2767 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2663 2768 msgid "Homepage"
2664 2769 msgstr ""
2665 2770  
2666   -#: app/views/blocks/profile_info.rhtml:8
  2771 +#: app/views/blocks/profile_info.rhtml:19
2667 2772 msgid "View profile"
2668 2773 msgstr ""
2669 2774  
2670   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  2775 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2671 2776 msgid "Control panel"
2672 2777 msgstr ""
2673 2778  
... ... @@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
2792 2897 msgid "Properties"
2793 2898 msgstr ""
2794 2899  
2795   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  2900 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
2796 2901 msgid "Public view"
2797 2902 msgstr ""
2798 2903  
2799 2904 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  2905 +msgid "Use as homepage"
  2906 +msgstr ""
  2907 +
  2908 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
2800 2909 msgid "Delete"
2801 2910 msgstr ""
2802 2911  
2803   -#: app/views/cms/view.rhtml:42
  2912 +#: app/views/cms/view.rhtml:43
2804 2913 msgid ""
2805 2914 "Are you sure that you want to remove this folder? Note that all the items "
2806 2915 "inside it will also be removed!"
2807 2916 msgstr ""
2808 2917  
2809   -#: app/views/cms/view.rhtml:67
2810   -msgid "Use as homepage"
2811   -msgstr ""
2812   -
2813   -#: app/views/cms/view.rhtml:68
  2918 +#: app/views/cms/view.rhtml:69
2814 2919 msgid "Are you sure that you want to remove this item?"
2815 2920 msgstr ""
2816 2921  
... ... @@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
3412 3517 msgid "We need to be sure that you wrote correctly your password."
3413 3518 msgstr ""
3414 3519  
3415   -#: app/views/account/signup.rhtml:33
  3520 +#: app/views/account/signup.rhtml:35
3416 3521 #: app/views/account/activate_enterprise.rhtml:37
3417 3522 msgid "I accept the terms of use"
3418 3523 msgstr ""
3419 3524  
3420   -#: app/views/account/signup.rhtml:38
  3525 +#: app/views/account/signup.rhtml:40
3421 3526 #: app/views/account/activate_enterprise.rhtml:42
3422 3527 msgid "Sign up"
3423 3528 msgstr ""
... ...
po/noosfero.pot
  Diff comments   View file @b24d068
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.10.1\n"
10   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
  10 +"POT-Creation-Date: 2008-07-08 19:03-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"
... ... @@ -23,7 +23,7 @@ msgstr &quot;&quot;
23 23  
24 24 #: app/helpers/application_helper.rb:81
25 25 #: app/views/box_organizer/add_block.rhtml:18
26   -#: app/views/search/_search_form.rhtml:56
  26 +#: app/views/search/_search_form.rhtml:63
27 27 msgid "Close"
28 28 msgstr ""
29 29  
... ... @@ -31,61 +31,63 @@ msgstr &quot;&quot;
31 31 msgid "This is %s, version %s"
32 32 msgstr ""
33 33  
34   -#: app/helpers/application_helper.rb:318
35   -#: app/views/memberships/new_community.rhtml:12
36   -#: app/views/box_organizer/edit.rhtml:9
37   -#: app/views/admin_panel/site_info.rhtml:11
38   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
39   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
40   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
41   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
42   -msgid "Cancel"
43   -msgstr ""
44   -
45   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  34 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
46 35 msgid "Uncategorized product"
47 36 msgstr ""
48 37  
49   -#: app/helpers/application_helper.rb:366
  38 +#: app/helpers/application_helper.rb:252
50 39 msgid "No product"
51 40 msgstr ""
52 41  
53   -#: app/helpers/application_helper.rb:472
  42 +#: app/helpers/application_helper.rb:338
  43 +msgid "non registered gender"
  44 +msgstr ""
  45 +
  46 +#: app/helpers/application_helper.rb:338
  47 +#: app/views/profile_editor/_person.rhtml:5
  48 +msgid "Male"
  49 +msgstr ""
  50 +
  51 +#: app/helpers/application_helper.rb:338
  52 +#: app/views/profile_editor/_person.rhtml:5
  53 +msgid "Female"
  54 +msgstr ""
  55 +
  56 +#: app/helpers/application_helper.rb:366
54 57 msgid "Click on this icon to go to the <b>%s</b>'s home page"
55 58 msgstr ""
56 59  
57   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  60 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
58 61 #: app/views/content_viewer/view_page.rhtml:65
59 62 msgid "Categories"
60 63 msgstr ""
61 64  
62   -#: app/helpers/application_helper.rb:532
  65 +#: app/helpers/application_helper.rb:417
63 66 msgid "open"
64 67 msgstr ""
65 68  
66   -#: app/helpers/application_helper.rb:568
  69 +#: app/helpers/application_helper.rb:453
67 70 msgid "Search..."
68 71 msgstr ""
69 72  
70   -#: app/helpers/application_helper.rb:570
  73 +#: app/helpers/application_helper.rb:455
71 74 msgid "This is a search box. Click, write your query, and press enter to find"
72 75 msgstr ""
73 76  
74   -#: app/helpers/application_helper.rb:571
  77 +#: app/helpers/application_helper.rb:456
75 78 msgid "Click, write and press enter to find"
76 79 msgstr ""
77 80  
78   -#: app/helpers/application_helper.rb:577
  81 +#: app/helpers/application_helper.rb:462
79 82 #: app/views/region_validators/region.rhtml:23
80   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
81   -#: app/views/search/_sellers_form.rhtml:22
  83 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
82 84 #: app/views/search/_search_form.rhtml:16
83   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  85 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
84 86 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
85 87 msgid "Search"
86 88 msgstr ""
87 89  
88   -#: app/helpers/application_helper.rb:652
  90 +#: app/helpers/application_helper.rb:518
89 91 msgid "Are you sure you want to visit this web site?"
90 92 msgstr ""
91 93  
... ... @@ -97,6 +99,39 @@ msgstr &quot;&quot;
97 99 msgid "Display in map"
98 100 msgstr ""
99 101  
  102 +#: app/helpers/search_helper.rb:53
  103 +msgid "E-Mail: "
  104 +msgstr ""
  105 +
  106 +#: app/helpers/search_helper.rb:56
  107 +msgid "Phone(s): "
  108 +msgstr ""
  109 +
  110 +#: app/helpers/search_helper.rb:59
  111 +msgid "Location: "
  112 +msgstr ""
  113 +
  114 +#: app/helpers/search_helper.rb:62
  115 +msgid "Address: "
  116 +msgstr ""
  117 +
  118 +#: app/helpers/search_helper.rb:65
  119 +msgid "Products/Services: "
  120 +msgstr ""
  121 +
  122 +#: app/helpers/search_helper.rb:68
  123 +msgid "Distance: "
  124 +msgstr ""
  125 +
  126 +#: app/helpers/search_helper.rb:81
  127 +msgid "Previous"
  128 +msgstr ""
  129 +
  130 +#: app/helpers/search_helper.rb:81
  131 +#: app/views/enterprise_registration/basic_information.rhtml:32
  132 +msgid "Next"
  133 +msgstr ""
  134 +
100 135 #: app/helpers/dates_helper.rb:6
101 136 msgid "January"
102 137 msgstr ""
... ... @@ -145,47 +180,47 @@ msgstr &quot;&quot;
145 180 msgid "December"
146 181 msgstr ""
147 182  
148   -#: app/helpers/dates_helper.rb:23
149   -msgid "%d %B %Y"
  183 +#: app/helpers/dates_helper.rb:27
  184 +msgid "%{month} %{day}, %{year}"
150 185 msgstr ""
151 186  
152   -#: app/helpers/dates_helper.rb:32
  187 +#: app/helpers/dates_helper.rb:36
153 188 msgid "%d %B %Y, %H:%m"
154 189 msgstr ""
155 190  
156   -#: app/helpers/dates_helper.rb:42
  191 +#: app/helpers/dates_helper.rb:46
157 192 msgid "from %s to %s"
158 193 msgstr ""
159 194  
160   -#: app/helpers/dates_helper.rb:49
  195 +#: app/helpers/dates_helper.rb:53
161 196 msgid "Sunday"
162 197 msgstr ""
163 198  
164   -#: app/helpers/dates_helper.rb:50
  199 +#: app/helpers/dates_helper.rb:54
165 200 msgid "Monday"
166 201 msgstr ""
167 202  
168   -#: app/helpers/dates_helper.rb:51
  203 +#: app/helpers/dates_helper.rb:55
169 204 msgid "Tuesday"
170 205 msgstr ""
171 206  
172   -#: app/helpers/dates_helper.rb:52
  207 +#: app/helpers/dates_helper.rb:56
173 208 msgid "Wednesday"
174 209 msgstr ""
175 210  
176   -#: app/helpers/dates_helper.rb:53
  211 +#: app/helpers/dates_helper.rb:57
177 212 msgid "Thursday"
178 213 msgstr ""
179 214  
180   -#: app/helpers/dates_helper.rb:54
  215 +#: app/helpers/dates_helper.rb:58
181 216 msgid "Friday"
182 217 msgstr ""
183 218  
184   -#: app/helpers/dates_helper.rb:55
  219 +#: app/helpers/dates_helper.rb:59
185 220 msgid "Saturday"
186 221 msgstr ""
187 222  
188   -#: app/helpers/dates_helper.rb:71
  223 +#: app/helpers/dates_helper.rb:72
189 224 msgid "%{month} %{year}"
190 225 msgstr ""
191 226  
... ... @@ -207,32 +242,68 @@ msgid &quot;&quot;
207 242 "It does not affect the language of the content created by other users."
208 243 msgstr ""
209 244  
  245 +#: app/helpers/enterprise_homepage_helper.rb:6
  246 +#: app/views/enterprise_editor/index.rhtml:8
  247 +msgid "Contact person:"
  248 +msgstr ""
  249 +
  250 +#: app/helpers/enterprise_homepage_helper.rb:7
  251 +msgid "e-Mail:"
  252 +msgstr ""
  253 +
  254 +#: app/helpers/enterprise_homepage_helper.rb:8
  255 +msgid "Phone(s):"
  256 +msgstr ""
  257 +
  258 +#: app/helpers/enterprise_homepage_helper.rb:9
  259 +msgid "Location:"
  260 +msgstr ""
  261 +
  262 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  263 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  264 +msgid "Address:"
  265 +msgstr ""
  266 +
  267 +#: app/helpers/enterprise_homepage_helper.rb:11
  268 +msgid "Legal form:"
  269 +msgstr ""
  270 +
  271 +#: app/helpers/enterprise_homepage_helper.rb:12
  272 +#: app/views/enterprise_editor/index.rhtml:10
  273 +msgid "Foundation year:"
  274 +msgstr ""
  275 +
  276 +#: app/helpers/enterprise_homepage_helper.rb:13
  277 +#: app/views/enterprise_editor/index.rhtml:12
  278 +msgid "Economic activity:"
  279 +msgstr ""
  280 +
  281 +#: app/helpers/enterprise_homepage_helper.rb:21
  282 +msgid "Distance:"
  283 +msgstr ""
  284 +
210 285 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
211 286 msgid "Main content"
212 287 msgstr ""
213 288  
214   -#: app/helpers/boxes_helper.rb:124
  289 +#: app/helpers/boxes_helper.rb:125
215 290 msgid "Move block up"
216 291 msgstr ""
217 292  
218   -#: app/helpers/boxes_helper.rb:125
  293 +#: app/helpers/boxes_helper.rb:129
219 294 msgid "Move block down"
220 295 msgstr ""
221 296  
222   -#: app/helpers/boxes_helper.rb:126
223   -msgid "Remove block"
224   -msgstr ""
225   -
226   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  297 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
227 298 #: app/views/manage_products/index.rhtml:14
228 299 #: app/views/manage_products/index.rhtml:40
229   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  300 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
230 301 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
231 302 msgid "Edit"
232 303 msgstr ""
233 304  
234   -#: app/helpers/profile_helper.rb:7
235   -msgid "edit your information"
  305 +#: app/helpers/boxes_helper.rb:137
  306 +msgid "Remove block"
236 307 msgstr ""
237 308  
238 309 #: app/helpers/tags_helper.rb:33
... ... @@ -255,6 +326,24 @@ msgstr &quot;&quot;
255 326 msgid "Administrator assigns validator organizations per region."
256 327 msgstr ""
257 328  
  329 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  330 +#: app/views/box_organizer/edit.rhtml:9
  331 +#: app/views/admin_panel/site_info.rhtml:11
  332 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  333 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  334 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  335 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  336 +msgid "Cancel"
  337 +msgstr ""
  338 +
  339 +#: app/helpers/forms_helper.rb:64
  340 +msgid "State:"
  341 +msgstr ""
  342 +
  343 +#: app/helpers/forms_helper.rb:65
  344 +msgid "City:"
  345 +msgstr ""
  346 +
258 347 #: app/helpers/categories_helper.rb:6
259 348 msgid "Do not display at the menu"
260 349 msgstr ""
... ... @@ -296,39 +385,40 @@ msgid &quot;Type of category&quot;
296 385 msgstr ""
297 386  
298 387 #: app/helpers/assets_helper.rb:7
299   -#: app/controllers/public/search_controller.rb:92
  388 +#: app/controllers/public/search_controller.rb:133
300 389 msgid "Articles"
301 390 msgstr ""
302 391  
303 392 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
304   -#: app/controllers/public/search_controller.rb:94
  393 +#: app/controllers/public/search_controller.rb:135
305 394 msgid "People"
306 395 msgstr ""
307 396  
308   -#: app/helpers/assets_helper.rb:9
309   -#: app/controllers/public/search_controller.rb:96
310   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  397 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  398 +#: app/controllers/public/search_controller.rb:137
  399 +#: app/views/search/_sellers_form.rhtml:7
311 400 msgid "Products"
312 401 msgstr ""
313 402  
314 403 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
315   -#: app/controllers/public/search_controller.rb:93
  404 +#: app/controllers/public/search_controller.rb:134
316 405 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
317 406 msgid "Enterprises"
318 407 msgstr ""
319 408  
320 409 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
321   -#: app/controllers/public/search_controller.rb:95
  410 +#: app/controllers/public/search_controller.rb:136
322 411 #: app/views/profile/index.rhtml:22
323 412 msgid "Communities"
324 413 msgstr ""
325 414  
326 415 #: app/helpers/assets_helper.rb:12
327   -#: app/controllers/public/search_controller.rb:97
  416 +#: app/controllers/public/search_controller.rb:138
328 417 msgid "Events"
329 418 msgstr ""
330 419  
331 420 #: app/models/enterprise.rb:5 app/models/product.rb:-
  421 +#: app/views/search/enterprises.rhtml:5
332 422 msgid "Enterprise"
333 423 msgstr ""
334 424  
... ... @@ -336,37 +426,37 @@ msgstr &quot;&quot;
336 426 msgid "Community"
337 427 msgstr ""
338 428  
339   -#: app/models/organization.rb:43
  429 +#: app/models/organization.rb:41
340 430 msgid "Contact person"
341 431 msgstr ""
342 432  
343   -#: app/models/organization.rb:43 app/models/environment.rb:-
  433 +#: app/models/organization.rb:41 app/models/environment.rb:-
344 434 msgid "Contact email"
345 435 msgstr ""
346 436  
347   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  437 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
348 438 #: app/views/enterprise_validation/_details.rhtml:19
349 439 msgid "Acronym"
350 440 msgstr ""
351 441  
352   -#: app/models/organization.rb:43
  442 +#: app/models/organization.rb:41
353 443 msgid "Foundation year"
354 444 msgstr ""
355 445  
356   -#: app/models/organization.rb:43
  446 +#: app/models/organization.rb:41
357 447 msgid "Legal form"
358 448 msgstr ""
359 449  
360   -#: app/models/organization.rb:43
  450 +#: app/models/organization.rb:41
361 451 msgid "Economic activity"
362 452 msgstr ""
363 453  
364   -#: app/models/organization.rb:43
  454 +#: app/models/organization.rb:41
365 455 #: app/views/enterprise_registration/basic_information.rhtml:27
366 456 msgid "Management information"
367 457 msgstr ""
368 458  
369   -#: app/models/organization.rb:43
  459 +#: app/models/organization.rb:41
370 460 msgid "Validated"
371 461 msgstr ""
372 462  
... ... @@ -441,8 +531,12 @@ msgstr &quot;&quot;
441 531 msgid "The task was cancelled at %s"
442 532 msgstr ""
443 533  
  534 +#: app/models/link_list_block.rb:7
  535 +msgid "Display a list of links."
  536 +msgstr ""
  537 +
444 538 #: app/models/favorite_enterprises_block.rb:4
445   -#: app/views/profile_editor/index.rhtml:29
  539 +#: app/views/profile_editor/index.rhtml:31
446 540 msgid "Favorite Enterprises"
447 541 msgstr ""
448 542  
... ... @@ -637,6 +731,10 @@ msgstr &quot;&quot;
637 731 msgid "Virtual"
638 732 msgstr ""
639 733  
  734 +#: app/models/products_block.rb:16
  735 +msgid "View all products"
  736 +msgstr ""
  737 +
640 738 #: app/models/tags_block.rb:8
641 739 msgid "Block listing content count by tag"
642 740 msgstr ""
... ... @@ -647,8 +745,8 @@ msgid &quot;&quot;
647 745 " Try to add some tags to some articles and see your tag cloud to grow."
648 746 msgstr ""
649 747  
650   -#: app/models/tags_block.rb:17
651   -msgid "%s's tags"
  748 +#: app/models/tags_block.rb:20
  749 +msgid "tags"
652 750 msgstr ""
653 751  
654 752 #: app/models/friendship.rb:-
... ... @@ -742,7 +840,7 @@ msgstr &quot;&quot;
742 840 msgid "Manage products"
743 841 msgstr ""
744 842  
745   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  843 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
746 844 msgid "Manage friends"
747 845 msgstr ""
748 846  
... ... @@ -754,25 +852,25 @@ msgstr &quot;&quot;
754 852 msgid "Perform task"
755 853 msgstr ""
756 854  
757   -#: app/models/profile.rb:144
  855 +#: app/models/profile.rb:155
758 856 msgid "An existing profile cannot be renamed."
759 857 msgstr ""
760 858  
761   -#: app/models/profile.rb:299
  859 +#: app/models/profile.rb:319
762 860 msgid "%s's home page"
763 861 msgstr ""
764 862  
765   -#: app/models/profile.rb:299
  863 +#: app/models/profile.rb:319
766 864 msgid ""
767 865 "<p>This is a default homepage created for %s. It can be changed though the "
768 866 "control panel.</p>"
769 867 msgstr ""
770 868  
771   -#: app/models/profile.rb:318
  869 +#: app/models/profile.rb:338
772 870 msgid "%s can't has members"
773 871 msgstr ""
774 872  
775   -#: app/models/profile.rb:335
  873 +#: app/models/profile.rb:355
776 874 msgid "%s can't has moderators"
777 875 msgstr ""
778 876  
... ... @@ -800,10 +898,6 @@ msgstr &quot;&quot;
800 898 msgid "%{fn} was already assigned to another category."
801 899 msgstr ""
802 900  
803   -#: app/models/category.rb:13
804   -msgid "%{fn} must be the same as the parents'"
805   -msgstr ""
806   -
807 901 #: app/models/article_block.rb:4
808 902 msgid "Display one of your contents."
809 903 msgstr ""
... ... @@ -1009,7 +1103,7 @@ msgid &quot;Clicking on the people or groups will take you to their home page.&quot;
1009 1103 msgstr ""
1010 1104  
1011 1105 #: app/models/profile_list_block.rb:75
1012   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1106 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1013 1107 msgid "None"
1014 1108 msgstr ""
1015 1109  
... ... @@ -1053,6 +1147,14 @@ msgstr &quot;&quot;
1053 1147 msgid "thumbnail"
1054 1148 msgstr ""
1055 1149  
  1150 +#: app/models/enterprise_homepage.rb:4
  1151 +msgid "Enterprise homepage."
  1152 +msgstr ""
  1153 +
  1154 +#: app/models/enterprise_homepage.rb:8
  1155 +msgid "Display the summary of profile."
  1156 +msgstr ""
  1157 +
1056 1158 #: app/models/sellers_search_block.rb:4
1057 1159 msgid "A search for enterprises by products selled and local"
1058 1160 msgstr ""
... ... @@ -1375,11 +1477,6 @@ msgstr &quot;&quot;
1375 1477 msgid "URL:"
1376 1478 msgstr ""
1377 1479  
1378   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1379   -#: app/views/cms/_event.rhtml:12
1380   -msgid "Address:"
1381   -msgstr ""
1382   -
1383 1480 #: app/models/event.rb:77
1384 1481 msgid "When:"
1385 1482 msgstr ""
... ... @@ -1457,7 +1554,7 @@ msgstr &quot;&quot;
1457 1554 msgid "%s still needs to accept being your friend."
1458 1555 msgstr ""
1459 1556  
1460   -#: app/controllers/my_profile/cms_controller.rb:97
  1557 +#: app/controllers/my_profile/cms_controller.rb:103
1461 1558 msgid "Article \"%s\" configured as home page."
1462 1559 msgstr ""
1463 1560  
... ... @@ -1525,51 +1622,51 @@ msgstr &quot;&quot;
1525 1622 msgid "This action is not available for \"%s\"."
1526 1623 msgstr ""
1527 1624  
1528   -#: app/controllers/public/search_controller.rb:182
1529   -msgid "Newer profiles"
  1625 +#: app/controllers/public/search_controller.rb:196
  1626 +msgid "Newer people"
1530 1627 msgstr ""
1531 1628  
1532   -#: app/controllers/public/search_controller.rb:183
1533   -msgid "Newer communities"
  1629 +#: app/controllers/public/search_controller.rb:197
  1630 +msgid "Newer enterprises"
1534 1631 msgstr ""
1535 1632  
1536   -#: app/controllers/public/search_controller.rb:184
1537   -msgid "Newer articles"
  1633 +#: app/controllers/public/search_controller.rb:199
  1634 +msgid "Upcoming events"
1538 1635 msgstr ""
1539 1636  
1540   -#: app/controllers/public/search_controller.rb:185
1541   -msgid "Most commented articles"
  1637 +#: app/controllers/public/search_controller.rb:200
  1638 +msgid "Newer communities"
1542 1639 msgstr ""
1543 1640  
1544   -#: app/controllers/public/search_controller.rb:186
1545   -msgid "Newer enterprises"
  1641 +#: app/controllers/public/search_controller.rb:201
  1642 +msgid "Newer articles"
1546 1643 msgstr ""
1547 1644  
1548   -#: app/controllers/public/search_controller.rb:187
1549   -msgid "Near events TODO"
  1645 +#: app/controllers/public/search_controller.rb:202
  1646 +msgid "Most commented articles"
1550 1647 msgstr ""
1551 1648  
1552   -#: app/controllers/public/account_controller.rb:21
  1649 +#: app/controllers/public/account_controller.rb:23
1553 1650 msgid "Logged in successfully"
1554 1651 msgstr ""
1555 1652  
1556   -#: app/controllers/public/account_controller.rb:23
  1653 +#: app/controllers/public/account_controller.rb:25
1557 1654 msgid "Incorrect username or password"
1558 1655 msgstr ""
1559 1656  
1560   -#: app/controllers/public/account_controller.rb:51
  1657 +#: app/controllers/public/account_controller.rb:53
1561 1658 msgid "Thanks for signing up!"
1562 1659 msgstr ""
1563 1660  
1564   -#: app/controllers/public/account_controller.rb:69
  1661 +#: app/controllers/public/account_controller.rb:71
1565 1662 msgid "You have been logged out."
1566 1663 msgstr ""
1567 1664  
1568   -#: app/controllers/public/account_controller.rb:80
  1665 +#: app/controllers/public/account_controller.rb:82
1569 1666 msgid "Your password has been changed successfully!"
1570 1667 msgstr ""
1571 1668  
1572   -#: app/controllers/public/account_controller.rb:83
  1669 +#: app/controllers/public/account_controller.rb:85
1573 1670 msgid "The supplied current password is incorrect."
1574 1671 msgstr ""
1575 1672  
... ... @@ -1626,13 +1723,13 @@ msgid &quot;Leave&quot;
1626 1723 msgstr ""
1627 1724  
1628 1725 #: app/views/memberships/index.rhtml:26
1629   -#: app/views/profile_editor/index.rhtml:46
  1726 +#: app/views/profile_editor/index.rhtml:51
1630 1727 #: app/views/profile/enterprises.rhtml:15
1631 1728 msgid "Register a new Enterprise"
1632 1729 msgstr ""
1633 1730  
1634 1731 #: app/views/memberships/index.rhtml:27
1635   -#: app/views/profile_editor/index.rhtml:45
  1732 +#: app/views/profile_editor/index.rhtml:50
1636 1733 #: app/views/profile/communities.rhtml:15
1637 1734 msgid "Create a new community"
1638 1735 msgstr ""
... ... @@ -1926,6 +2023,11 @@ msgstr &quot;&quot;
1926 2023 msgid "Add a block"
1927 2024 msgstr ""
1928 2025  
  2026 +#: app/views/box_organizer/_products_block.rhtml:5
  2027 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2028 +msgid "Select the products that must be shown."
  2029 +msgstr ""
  2030 +
1929 2031 #: app/views/box_organizer/edit.rhtml:1
1930 2032 msgid "Editing block"
1931 2033 msgstr ""
... ... @@ -2124,10 +2226,6 @@ msgid &quot;&quot;
2124 2226 "profile"
2125 2227 msgstr ""
2126 2228  
2127   -#: app/views/enterprise_registration/basic_information.rhtml:32
2128   -msgid "Next"
2129   -msgstr ""
2130   -
2131 2229 #: app/views/enterprise_editor/_form.rhtml:7
2132 2230 #: app/views/enterprise_validation/list_processed.rhtml:13
2133 2231 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2174,26 +2272,14 @@ msgstr &quot;&quot;
2174 2272 msgid "Contact phone:"
2175 2273 msgstr ""
2176 2274  
2177   -#: app/views/enterprise_editor/index.rhtml:8
2178   -msgid "Contact person:"
2179   -msgstr ""
2180   -
2181 2275 #: app/views/enterprise_editor/index.rhtml:9
2182 2276 msgid "Acronym:"
2183 2277 msgstr ""
2184 2278  
2185   -#: app/views/enterprise_editor/index.rhtml:10
2186   -msgid "Foundation year:"
2187   -msgstr ""
2188   -
2189 2279 #: app/views/enterprise_editor/index.rhtml:11
2190 2280 msgid "Legal Form:"
2191 2281 msgstr ""
2192 2282  
2193   -#: app/views/enterprise_editor/index.rhtml:12
2194   -msgid "Economic activity:"
2195   -msgstr ""
2196   -
2197 2283 #: app/views/enterprise_editor/index.rhtml:13
2198 2284 msgid "Management infomation:"
2199 2285 msgstr ""
... ... @@ -2234,51 +2320,51 @@ msgstr &quot;&quot;
2234 2320 msgid "My profile"
2235 2321 msgstr ""
2236 2322  
2237   -#: app/views/profile_editor/index.rhtml:9
  2323 +#: app/views/profile_editor/index.rhtml:11
2238 2324 msgid "Edit Profile"
2239 2325 msgstr ""
2240 2326  
2241   -#: app/views/profile_editor/index.rhtml:11
  2327 +#: app/views/profile_editor/index.rhtml:13
2242 2328 msgid "Mail settings"
2243 2329 msgstr ""
2244 2330  
2245   -#: app/views/profile_editor/index.rhtml:13
  2331 +#: app/views/profile_editor/index.rhtml:15
2246 2332 msgid "Pending tasks"
2247 2333 msgstr ""
2248 2334  
2249   -#: app/views/profile_editor/index.rhtml:15
  2335 +#: app/views/profile_editor/index.rhtml:17
2250 2336 msgid "Edit Visual Design"
2251 2337 msgstr ""
2252 2338  
2253   -#: app/views/profile_editor/index.rhtml:17
  2339 +#: app/views/profile_editor/index.rhtml:19
2254 2340 msgid "Manage Content"
2255 2341 msgstr ""
2256 2342  
2257   -#: app/views/profile_editor/index.rhtml:19
  2343 +#: app/views/profile_editor/index.rhtml:21
2258 2344 msgid "Change Password"
2259 2345 msgstr ""
2260 2346  
2261   -#: app/views/profile_editor/index.rhtml:23
  2347 +#: app/views/profile_editor/index.rhtml:25
2262 2348 msgid "Manage Members"
2263 2349 msgstr ""
2264 2350  
2265   -#: app/views/profile_editor/index.rhtml:25
  2351 +#: app/views/profile_editor/index.rhtml:27
2266 2352 msgid "Manage Products and Services"
2267 2353 msgstr ""
2268 2354  
2269   -#: app/views/profile_editor/index.rhtml:27
  2355 +#: app/views/profile_editor/index.rhtml:29
2270 2356 msgid "Enterprise Validation"
2271 2357 msgstr ""
2272 2358  
2273   -#: app/views/profile_editor/index.rhtml:33
  2359 +#: app/views/profile_editor/index.rhtml:35
2274 2360 msgid "Disable Enterprise"
2275 2361 msgstr ""
2276 2362  
2277   -#: app/views/profile_editor/index.rhtml:35
  2363 +#: app/views/profile_editor/index.rhtml:37
2278 2364 msgid "Enable Enterprise"
2279 2365 msgstr ""
2280 2366  
2281   -#: app/views/profile_editor/index.rhtml:42
  2367 +#: app/views/profile_editor/index.rhtml:47
2282 2368 msgid "Manage my groups"
2283 2369 msgstr ""
2284 2370  
... ... @@ -2330,15 +2416,8 @@ msgid &quot;Moderation options&quot;
2330 2416 msgstr ""
2331 2417  
2332 2418 #: app/views/profile_editor/_organization.rhtml:12
2333   -msgid "Closed organization"
2334   -msgstr ""
2335   -
2336   -#: app/views/profile_editor/_person.rhtml:5
2337   -msgid "Male"
2338   -msgstr ""
2339   -
2340   -#: app/views/profile_editor/_person.rhtml:5
2341   -msgid "Female"
  2419 +msgid ""
  2420 +"New members must be approved by an administrator before joining this group?"
2342 2421 msgstr ""
2343 2422  
2344 2423 #: app/views/profile_editor/enable.rhtml:1
... ... @@ -2419,7 +2498,7 @@ msgstr &quot;&quot;
2419 2498 msgid "Homepage: "
2420 2499 msgstr ""
2421 2500  
2422   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2501 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2423 2502 msgid "Products/Services"
2424 2503 msgstr ""
2425 2504  
... ... @@ -2480,24 +2559,30 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
2480 2559 msgstr ""
2481 2560  
2482 2561 #: app/views/search/products.rhtml:3
2483   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2562 +msgid ""
  2563 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2564 +"{category}\""
2484 2565 msgstr ""
2485 2566  
2486 2567 #: app/views/search/products.rhtml:3
2487   -msgid "Products results for \"%s\""
  2568 +msgid "Products and Services results for \"%s\""
  2569 +msgstr ""
  2570 +
  2571 +#: app/views/search/products.rhtml:5
  2572 +msgid "Products and Services of enterprises in \"%s\""
2488 2573 msgstr ""
2489 2574  
2490 2575 #: app/views/search/products.rhtml:5
2491   -msgid "Products of enterprises in \"%s\""
  2576 +msgid "Products and Services"
2492 2577 msgstr ""
2493 2578  
2494   -#: app/views/search/products.rhtml:10
  2579 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2495 2580 msgid "Within %s km from %s"
2496 2581 msgstr ""
2497 2582  
2498 2583 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2499   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2500   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2584 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2585 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2501 2586 msgid "Refine your search"
2502 2587 msgstr ""
2503 2588  
... ... @@ -2505,40 +2590,58 @@ msgstr &quot;&quot;
2505 2590 msgid "by %{author} on \"%{article}\""
2506 2591 msgstr ""
2507 2592  
2508   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2509   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2510   -#: app/views/search/articles.rhtml:12
  2593 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2594 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2511 2595 msgid "Search results for \"%{query}\" in \"%{category}\""
2512 2596 msgstr ""
2513 2597  
2514   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2515   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2516   -#: app/views/search/articles.rhtml:12
  2598 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2599 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2517 2600 msgid "Search results for \"%s\""
2518 2601 msgstr ""
2519 2602  
2520   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2521   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2522   -msgid "(recently added)"
  2603 +#: app/views/search/_product_categories_menu.rhtml:13
  2604 +msgid "There is no sub-categories for %s."
2523 2605 msgstr ""
2524 2606  
2525   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2526   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2527   -msgid "Browse by name"
  2607 +#: app/views/search/_product_categories_menu.rhtml:15
  2608 +msgid "There is no categories."
  2609 +msgstr ""
  2610 +
  2611 +#: app/views/search/enterprises.rhtml:3
  2612 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2613 +msgstr ""
  2614 +
  2615 +#: app/views/search/enterprises.rhtml:3
  2616 +msgid "Enterprise results for \"%s\""
2528 2617 msgstr ""
2529 2618  
2530   -#: app/views/search/_directory.rhtml:2
2531   -msgid "Recent"
  2619 +#: app/views/search/enterprises.rhtml:5
  2620 +msgid "Enterprises in \"%s\""
2532 2621 msgstr ""
2533 2622  
2534   -#: app/views/search/_display_results.rhtml:18
2535   -msgid "more..."
  2623 +#: app/views/search/_display_results.rhtml:21
  2624 +msgid "see all (%d)"
  2625 +msgstr ""
  2626 +
  2627 +#: app/views/search/_display_results.rhtml:21
  2628 +msgid "see all..."
2536 2629 msgstr ""
2537 2630  
2538 2631 #: app/views/search/popup.rhtml:3
2539 2632 msgid "Search %s"
2540 2633 msgstr ""
2541 2634  
  2635 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2636 +#: app/views/search/articles.rhtml:11
  2637 +msgid "(recently added)"
  2638 +msgstr ""
  2639 +
  2640 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2641 +#: app/views/search/articles.rhtml:17
  2642 +msgid "Browse by name"
  2643 +msgstr ""
  2644 +
2542 2645 #: app/views/search/_sellers_form.rhtml:1
2543 2646 msgid "Search for sellers"
2544 2647 msgstr ""
... ... @@ -2547,21 +2650,15 @@ msgstr &quot;&quot;
2547 2650 msgid "Search in:"
2548 2651 msgstr ""
2549 2652  
2550   -#: app/views/search/_sellers_form.rhtml:13
2551   -#: app/views/search/_search_form.rhtml:27
  2653 +#: app/views/search/_sellers_form.rhtml:17
2552 2654 msgid "Distance (km): "
2553 2655 msgstr ""
2554 2656  
2555   -#: app/views/search/_sellers_form.rhtml:16
2556   -#: app/views/search/_search_form.rhtml:28
2557   -msgid "From: "
2558   -msgstr ""
2559   -
2560   -#: app/views/search/_product.rhtml:10
  2657 +#: app/views/search/_product.rhtml:15
2561 2658 msgid "Price: %d"
2562 2659 msgstr ""
2563 2660  
2564   -#: app/views/search/_product.rhtml:12
  2661 +#: app/views/search/_product.rhtml:17
2565 2662 msgid "Suplier: %s"
2566 2663 msgstr ""
2567 2664  
... ... @@ -2581,11 +2678,19 @@ msgstr &quot;&quot;
2581 2678 msgid "Search within:"
2582 2679 msgstr ""
2583 2680  
2584   -#: app/views/search/_search_form.rhtml:35
  2681 +#: app/views/search/_search_form.rhtml:28
  2682 +msgid "Distance (km):"
  2683 +msgstr ""
  2684 +
  2685 +#: app/views/search/_search_form.rhtml:33
  2686 +msgid "From:"
  2687 +msgstr ""
  2688 +
  2689 +#: app/views/search/_search_form.rhtml:42
2585 2690 msgid "Search for:"
2586 2691 msgstr ""
2587 2692  
2588   -#: app/views/search/_search_form.rhtml:49
  2693 +#: app/views/search/_search_form.rhtml:56
2589 2694 msgid "Advanced search"
2590 2695 msgstr ""
2591 2696  
... ... @@ -2597,7 +2702,7 @@ msgstr &quot;&quot;
2597 2702 msgid "Last update: %s."
2598 2703 msgstr ""
2599 2704  
2600   -#: app/views/search/_google_maps.rhtml:48
  2705 +#: app/views/search/_google_maps.rhtml:68
2601 2706 msgid ""
2602 2707 "One or more items don't have geographical information, and won't be shown in "
2603 2708 "the map. Choose \"Display in list\" to see them."
... ... @@ -2655,19 +2760,19 @@ msgstr &quot;&quot;
2655 2760 msgid "Join this enterprise"
2656 2761 msgstr ""
2657 2762  
2658   -#: app/views/blocks/profile_info.rhtml:6
  2763 +#: app/views/blocks/profile_info.rhtml:17
2659 2764 msgid "Since %{year}/%{month}"
2660 2765 msgstr ""
2661 2766  
2662   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  2767 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2663 2768 msgid "Homepage"
2664 2769 msgstr ""
2665 2770  
2666   -#: app/views/blocks/profile_info.rhtml:8
  2771 +#: app/views/blocks/profile_info.rhtml:19
2667 2772 msgid "View profile"
2668 2773 msgstr ""
2669 2774  
2670   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  2775 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2671 2776 msgid "Control panel"
2672 2777 msgstr ""
2673 2778  
... ... @@ -2792,25 +2897,25 @@ msgstr &quot;&quot;
2792 2897 msgid "Properties"
2793 2898 msgstr ""
2794 2899  
2795   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  2900 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
2796 2901 msgid "Public view"
2797 2902 msgstr ""
2798 2903  
2799 2904 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  2905 +msgid "Use as homepage"
  2906 +msgstr ""
  2907 +
  2908 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
2800 2909 msgid "Delete"
2801 2910 msgstr ""
2802 2911  
2803   -#: app/views/cms/view.rhtml:42
  2912 +#: app/views/cms/view.rhtml:43
2804 2913 msgid ""
2805 2914 "Are you sure that you want to remove this folder? Note that all the items "
2806 2915 "inside it will also be removed!"
2807 2916 msgstr ""
2808 2917  
2809   -#: app/views/cms/view.rhtml:67
2810   -msgid "Use as homepage"
2811   -msgstr ""
2812   -
2813   -#: app/views/cms/view.rhtml:68
  2918 +#: app/views/cms/view.rhtml:69
2814 2919 msgid "Are you sure that you want to remove this item?"
2815 2920 msgstr ""
2816 2921  
... ... @@ -3412,12 +3517,12 @@ msgstr &quot;&quot;
3412 3517 msgid "We need to be sure that you wrote correctly your password."
3413 3518 msgstr ""
3414 3519  
3415   -#: app/views/account/signup.rhtml:33
  3520 +#: app/views/account/signup.rhtml:35
3416 3521 #: app/views/account/activate_enterprise.rhtml:37
3417 3522 msgid "I accept the terms of use"
3418 3523 msgstr ""
3419 3524  
3420   -#: app/views/account/signup.rhtml:38
  3525 +#: app/views/account/signup.rhtml:40
3421 3526 #: app/views/account/activate_enterprise.rhtml:42
3422 3527 msgid "Sign up"
3423 3528 msgstr ""
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @b24d068
... ... @@ -9,8 +9,8 @@
9 9 msgid ""
10 10 msgstr ""
11 11 "Project-Id-Version: noosfero 0.10.1\n"
12   -"POT-Creation-Date: 2008-06-27 14:57-0300\n"
13   -"PO-Revision-Date: 2008-07-08 18:56-0300\n"
  12 +"POT-Creation-Date: 2008-07-08 19:03-0300\n"
  13 +"PO-Revision-Date: 2008-06-27 14:54-0300\n"
14 14 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
15 15 "Language-Team: \n"
16 16 "MIME-Version: 1.0\n"
... ... @@ -26,7 +26,7 @@ msgstr &quot;Ajuda&quot;
26 26  
27 27 #: app/helpers/application_helper.rb:81
28 28 #: app/views/box_organizer/add_block.rhtml:18
29   -#: app/views/search/_search_form.rhtml:56
  29 +#: app/views/search/_search_form.rhtml:63
30 30 msgid "Close"
31 31 msgstr "Fechar"
32 32  
... ... @@ -34,63 +34,66 @@ msgstr &quot;Fechar&quot;
34 34 msgid "This is %s, version %s"
35 35 msgstr "%s, versão %s"
36 36  
37   -#: app/helpers/application_helper.rb:318
38   -#: app/views/memberships/new_community.rhtml:12
39   -#: app/views/box_organizer/edit.rhtml:9
40   -#: app/views/admin_panel/site_info.rhtml:11
41   -#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
42   -#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
43   -#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
44   -#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
45   -msgid "Cancel"
46   -msgstr "Cancelar"
47   -
48   -#: app/helpers/application_helper.rb:360 app/models/product.rb:39
  37 +#: app/helpers/application_helper.rb:246 app/models/product.rb:39
49 38 msgid "Uncategorized product"
50 39 msgstr "Produto não categorizado"
51 40  
52   -#: app/helpers/application_helper.rb:366
  41 +#: app/helpers/application_helper.rb:252
53 42 msgid "No product"
54 43 msgstr "Sem produto"
55 44  
56   -#: app/helpers/application_helper.rb:472
  45 +#: app/helpers/application_helper.rb:338
  46 +#, fuzzy
  47 +msgid "non registered gender"
  48 +msgstr "Pessoas registradas recentemente"
  49 +
  50 +#: app/helpers/application_helper.rb:338
  51 +#: app/views/profile_editor/_person.rhtml:5
  52 +msgid "Male"
  53 +msgstr "Masculino"
  54 +
  55 +#: app/helpers/application_helper.rb:338
  56 +#: app/views/profile_editor/_person.rhtml:5
  57 +msgid "Female"
  58 +msgstr "Feminino"
  59 +
  60 +#: app/helpers/application_helper.rb:366
57 61 msgid "Click on this icon to go to the <b>%s</b>'s home page"
58 62 msgstr "Clique nesse ícone para ir para a página inicial de <b>%s</b>"
59 63  
60   -#: app/helpers/application_helper.rb:509 app/views/categories/index.rhtml:1
  64 +#: app/helpers/application_helper.rb:394 app/views/categories/index.rhtml:1
61 65 #: app/views/content_viewer/view_page.rhtml:65
62 66 msgid "Categories"
63 67 msgstr "Categorias"
64 68  
65   -#: app/helpers/application_helper.rb:532
  69 +#: app/helpers/application_helper.rb:417
66 70 msgid "open"
67 71 msgstr "aberto"
68 72  
69   -#: app/helpers/application_helper.rb:568
  73 +#: app/helpers/application_helper.rb:453
70 74 msgid "Search..."
71 75 msgstr "Busca..."
72 76  
73   -#: app/helpers/application_helper.rb:570
  77 +#: app/helpers/application_helper.rb:455
74 78 msgid "This is a search box. Click, write your query, and press enter to find"
75 79 msgstr ""
76 80 "Isto é uma caixa de busca. Clique, escreva sua consulta, e pressione enter "
77 81 "para pesquisar"
78 82  
79   -#: app/helpers/application_helper.rb:571
  83 +#: app/helpers/application_helper.rb:456
80 84 msgid "Click, write and press enter to find"
81 85 msgstr "Clique, escreva e pressione enter para pesquisar"
82 86  
83   -#: app/helpers/application_helper.rb:577
  87 +#: app/helpers/application_helper.rb:462
84 88 #: app/views/region_validators/region.rhtml:23
85   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
86   -#: app/views/search/_sellers_form.rhtml:22
  89 +#: app/views/search/people.rhtml:21 app/views/search/_sellers_form.rhtml:21
87 90 #: app/views/search/_search_form.rhtml:16
88   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  91 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
89 92 #: app/views/home/index.rhtml:6 app/views/home/index.rhtml:12
90 93 msgid "Search"
91 94 msgstr "Busca"
92 95  
93   -#: app/helpers/application_helper.rb:652
  96 +#: app/helpers/application_helper.rb:518
94 97 msgid "Are you sure you want to visit this web site?"
95 98 msgstr "Tem certeza que quer visitar este web site?"
96 99  
... ... @@ -102,6 +105,44 @@ msgstr &quot;Mostrar como lista&quot;
102 105 msgid "Display in map"
103 106 msgstr "Mostrar no mapa"
104 107  
  108 +#: app/helpers/search_helper.rb:53
  109 +#, fuzzy
  110 +msgid "E-Mail: "
  111 +msgstr "e-Mail"
  112 +
  113 +#: app/helpers/search_helper.rb:56
  114 +msgid "Phone(s): "
  115 +msgstr ""
  116 +
  117 +#: app/helpers/search_helper.rb:59
  118 +#, fuzzy
  119 +msgid "Location: "
  120 +msgstr "Ações: %s"
  121 +
  122 +#: app/helpers/search_helper.rb:62
  123 +#, fuzzy
  124 +msgid "Address: "
  125 +msgstr "Endereço:"
  126 +
  127 +#: app/helpers/search_helper.rb:65
  128 +#, fuzzy
  129 +msgid "Products/Services: "
  130 +msgstr "Produtos/Serviços"
  131 +
  132 +#: app/helpers/search_helper.rb:68
  133 +#, fuzzy
  134 +msgid "Distance: "
  135 +msgstr "Distância (km): "
  136 +
  137 +#: app/helpers/search_helper.rb:81
  138 +msgid "Previous"
  139 +msgstr "Anterior"
  140 +
  141 +#: app/helpers/search_helper.rb:81
  142 +#: app/views/enterprise_registration/basic_information.rhtml:32
  143 +msgid "Next"
  144 +msgstr "Próximo"
  145 +
105 146 #: app/helpers/dates_helper.rb:6
106 147 msgid "January"
107 148 msgstr "Janeiro"
... ... @@ -150,47 +191,48 @@ msgstr &quot;Novembro&quot;
150 191 msgid "December"
151 192 msgstr "Dezembro"
152 193  
153   -#: app/helpers/dates_helper.rb:23
154   -msgid "%d %B %Y"
155   -msgstr "%d de %B de %Y"
  194 +#: app/helpers/dates_helper.rb:27
  195 +#, fuzzy
  196 +msgid "%{month} %{day}, %{year}"
  197 +msgstr "%{month} %{year}"
156 198  
157   -#: app/helpers/dates_helper.rb:32
  199 +#: app/helpers/dates_helper.rb:36
158 200 msgid "%d %B %Y, %H:%m"
159 201 msgstr "%d de %B de %Y, %H:%m"
160 202  
161   -#: app/helpers/dates_helper.rb:42
  203 +#: app/helpers/dates_helper.rb:46
162 204 msgid "from %s to %s"
163   -msgstr "%s a %s"
  205 +msgstr "de %s para %s"
164 206  
165   -#: app/helpers/dates_helper.rb:49
  207 +#: app/helpers/dates_helper.rb:53
166 208 msgid "Sunday"
167 209 msgstr "Domingo"
168 210  
169   -#: app/helpers/dates_helper.rb:50
  211 +#: app/helpers/dates_helper.rb:54
170 212 msgid "Monday"
171 213 msgstr "Segunda"
172 214  
173   -#: app/helpers/dates_helper.rb:51
  215 +#: app/helpers/dates_helper.rb:55
174 216 msgid "Tuesday"
175 217 msgstr "Terça"
176 218  
177   -#: app/helpers/dates_helper.rb:52
  219 +#: app/helpers/dates_helper.rb:56
178 220 msgid "Wednesday"
179 221 msgstr "Quarta"
180 222  
181   -#: app/helpers/dates_helper.rb:53
  223 +#: app/helpers/dates_helper.rb:57
182 224 msgid "Thursday"
183 225 msgstr "Quinta"
184 226  
185   -#: app/helpers/dates_helper.rb:54
  227 +#: app/helpers/dates_helper.rb:58
186 228 msgid "Friday"
187 229 msgstr "Sexta"
188 230  
189   -#: app/helpers/dates_helper.rb:55
  231 +#: app/helpers/dates_helper.rb:59
190 232 msgid "Saturday"
191 233 msgstr "Sábado"
192 234  
193   -#: app/helpers/dates_helper.rb:71
  235 +#: app/helpers/dates_helper.rb:72
194 236 msgid "%{month} %{year}"
195 237 msgstr "%{month} %{year}"
196 238  
... ... @@ -214,33 +256,73 @@ msgstr &quot;&quot;
214 256 "O idioma que você escolher aqui será usado para opções, botões, etc. Ele não "
215 257 "afeta o idioma do conteúdo criado por outros usuários."
216 258  
  259 +#: app/helpers/enterprise_homepage_helper.rb:6
  260 +#: app/views/enterprise_editor/index.rhtml:8
  261 +msgid "Contact person:"
  262 +msgstr "Pessoa de contato:"
  263 +
  264 +#: app/helpers/enterprise_homepage_helper.rb:7
  265 +#, fuzzy
  266 +msgid "e-Mail:"
  267 +msgstr "e-Mail"
  268 +
  269 +#: app/helpers/enterprise_homepage_helper.rb:8
  270 +msgid "Phone(s):"
  271 +msgstr ""
  272 +
  273 +#: app/helpers/enterprise_homepage_helper.rb:9
  274 +#, fuzzy
  275 +msgid "Location:"
  276 +msgstr "Ações"
  277 +
  278 +#: app/helpers/enterprise_homepage_helper.rb:10 app/models/event.rb:73
  279 +#: app/views/enterprise_editor/index.rhtml:6 app/views/cms/_event.rhtml:12
  280 +msgid "Address:"
  281 +msgstr "Endereço:"
  282 +
  283 +#: app/helpers/enterprise_homepage_helper.rb:11
  284 +#, fuzzy
  285 +msgid "Legal form:"
  286 +msgstr "Formulário Legal"
  287 +
  288 +#: app/helpers/enterprise_homepage_helper.rb:12
  289 +#: app/views/enterprise_editor/index.rhtml:10
  290 +msgid "Foundation year:"
  291 +msgstr "Ano de fundação:"
  292 +
  293 +#: app/helpers/enterprise_homepage_helper.rb:13
  294 +#: app/views/enterprise_editor/index.rhtml:12
  295 +msgid "Economic activity:"
  296 +msgstr "Atividade econômica:"
  297 +
  298 +#: app/helpers/enterprise_homepage_helper.rb:21
  299 +#, fuzzy
  300 +msgid "Distance:"
  301 +msgstr "Distância (km): "
  302 +
217 303 #: app/helpers/boxes_helper.rb:17 app/helpers/boxes_helper.rb:34
218 304 msgid "Main content"
219 305 msgstr "Gerenciar conteúdo"
220 306  
221   -#: app/helpers/boxes_helper.rb:124
  307 +#: app/helpers/boxes_helper.rb:125
222 308 msgid "Move block up"
223 309 msgstr "Mover para cima"
224 310  
225   -#: app/helpers/boxes_helper.rb:125
  311 +#: app/helpers/boxes_helper.rb:129
226 312 msgid "Move block down"
227 313 msgstr "Mover para baixo"
228 314  
229   -#: app/helpers/boxes_helper.rb:126
230   -msgid "Remove block"
231   -msgstr "Remover bloco"
232   -
233   -#: app/helpers/boxes_helper.rb:129 app/views/categories/_category.rhtml:8
  315 +#: app/helpers/boxes_helper.rb:133 app/views/categories/_category.rhtml:8
234 316 #: app/views/manage_products/index.rhtml:14
235 317 #: app/views/manage_products/index.rhtml:40
236   -#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:65
  318 +#: app/views/content_viewer/view_page.rhtml:35 app/views/cms/view.rhtml:66
237 319 #: app/views/role/index.rhtml:6 app/views/profile_members/index.rhtml:14
238 320 msgid "Edit"
239 321 msgstr "Editar"
240 322  
241   -#: app/helpers/profile_helper.rb:7
242   -msgid "edit your information"
243   -msgstr "editar suas informações"
  323 +#: app/helpers/boxes_helper.rb:137
  324 +msgid "Remove block"
  325 +msgstr "Remover bloco"
244 326  
245 327 #: app/helpers/tags_helper.rb:33
246 328 msgid "No tags yet."
... ... @@ -262,6 +344,26 @@ msgstr &quot;Administrador tem que aprovar todas as novas organizações&quot;
262 344 msgid "Administrator assigns validator organizations per region."
263 345 msgstr "Administrador atribui organizações validadoras por região."
264 346  
  347 +#: app/helpers/forms_helper.rb:34 app/views/memberships/new_community.rhtml:12
  348 +#: app/views/box_organizer/edit.rhtml:9
  349 +#: app/views/admin_panel/site_info.rhtml:11
  350 +#: app/views/admin_panel/message_for_disabled_enterprise.rhtml:11
  351 +#: app/views/cms/edit.rhtml:35 app/views/cms/edit.rhtml:37
  352 +#: app/views/cms/select_article_type.rhtml:12 app/views/tasks/_task.rhtml:12
  353 +#: app/views/account/login.rhtml:24 app/views/shared/_change_image.rhtml:2
  354 +msgid "Cancel"
  355 +msgstr "Cancelar"
  356 +
  357 +#: app/helpers/forms_helper.rb:64
  358 +#, fuzzy
  359 +msgid "State:"
  360 +msgstr "Estado"
  361 +
  362 +#: app/helpers/forms_helper.rb:65
  363 +#, fuzzy
  364 +msgid "City:"
  365 +msgstr "Cidade"
  366 +
265 367 #: app/helpers/categories_helper.rb:6
266 368 msgid "Do not display at the menu"
267 369 msgstr "Não exibir no menu"
... ... @@ -303,39 +405,40 @@ msgid &quot;Type of category&quot;
303 405 msgstr "Tipo de categoria"
304 406  
305 407 #: app/helpers/assets_helper.rb:7
306   -#: app/controllers/public/search_controller.rb:92
  408 +#: app/controllers/public/search_controller.rb:133
307 409 msgid "Articles"
308 410 msgstr "Artigos"
309 411  
310 412 #: app/helpers/assets_helper.rb:8 app/models/people_block.rb:4
311   -#: app/controllers/public/search_controller.rb:94
  413 +#: app/controllers/public/search_controller.rb:135
312 414 msgid "People"
313 415 msgstr "Pessoas"
314 416  
315   -#: app/helpers/assets_helper.rb:9
316   -#: app/controllers/public/search_controller.rb:96
317   -#: app/views/search/products.rhtml:5 app/views/search/_sellers_form.rhtml:7
  417 +#: app/helpers/assets_helper.rb:9 app/models/products_block.rb:8
  418 +#: app/controllers/public/search_controller.rb:137
  419 +#: app/views/search/_sellers_form.rhtml:7
318 420 msgid "Products"
319 421 msgstr "Produtos"
320 422  
321 423 #: app/helpers/assets_helper.rb:10 app/models/enterprises_block.rb:4
322   -#: app/controllers/public/search_controller.rb:93
  424 +#: app/controllers/public/search_controller.rb:134
323 425 #: app/views/profile/index.rhtml:23 app/views/search/_sellers_form.rhtml:8
324 426 msgid "Enterprises"
325 427 msgstr "Empreendimentos"
326 428  
327 429 #: app/helpers/assets_helper.rb:11 app/models/communities_block.rb:8
328   -#: app/controllers/public/search_controller.rb:95
  430 +#: app/controllers/public/search_controller.rb:136
329 431 #: app/views/profile/index.rhtml:22
330 432 msgid "Communities"
331 433 msgstr "Comunidades"
332 434  
333 435 #: app/helpers/assets_helper.rb:12
334   -#: app/controllers/public/search_controller.rb:97
  436 +#: app/controllers/public/search_controller.rb:138
335 437 msgid "Events"
336 438 msgstr "Eventos"
337 439  
338 440 #: app/models/enterprise.rb:5 app/models/product.rb:-
  441 +#: app/views/search/enterprises.rhtml:5
339 442 msgid "Enterprise"
340 443 msgstr "Empreendimento"
341 444  
... ... @@ -343,37 +446,37 @@ msgstr &quot;Empreendimento&quot;
343 446 msgid "Community"
344 447 msgstr "Comunidade"
345 448  
346   -#: app/models/organization.rb:43
  449 +#: app/models/organization.rb:41
347 450 msgid "Contact person"
348 451 msgstr "Pessoa de contato"
349 452  
350   -#: app/models/organization.rb:43 app/models/environment.rb:-
  453 +#: app/models/organization.rb:41 app/models/environment.rb:-
351 454 msgid "Contact email"
352 455 msgstr "Email de contato"
353 456  
354   -#: app/models/organization.rb:43 app/views/enterprise_editor/_form.rhtml:13
  457 +#: app/models/organization.rb:41 app/views/enterprise_editor/_form.rhtml:13
355 458 #: app/views/enterprise_validation/_details.rhtml:19
356 459 msgid "Acronym"
357 460 msgstr "Sigla"
358 461  
359   -#: app/models/organization.rb:43
  462 +#: app/models/organization.rb:41
360 463 msgid "Foundation year"
361 464 msgstr "Ano de fundação"
362 465  
363   -#: app/models/organization.rb:43
  466 +#: app/models/organization.rb:41
364 467 msgid "Legal form"
365 468 msgstr "Formulário Legal"
366 469  
367   -#: app/models/organization.rb:43
  470 +#: app/models/organization.rb:41
368 471 msgid "Economic activity"
369 472 msgstr "Atividade econômica"
370 473  
371   -#: app/models/organization.rb:43
  474 +#: app/models/organization.rb:41
372 475 #: app/views/enterprise_registration/basic_information.rhtml:27
373 476 msgid "Management information"
374 477 msgstr "Gerenciamento de informação"
375 478  
376   -#: app/models/organization.rb:43
  479 +#: app/models/organization.rb:41
377 480 #, fuzzy
378 481 msgid "Validated"
379 482 msgstr "1 validador"
... ... @@ -451,8 +554,13 @@ msgstr &quot;A tarefa foi finalizada em %s&quot;
451 554 msgid "The task was cancelled at %s"
452 555 msgstr "A tarefa foi cancelada em %s"
453 556  
  557 +#: app/models/link_list_block.rb:7
  558 +#, fuzzy
  559 +msgid "Display a list of links."
  560 +msgstr "Mostrar como lista"
  561 +
454 562 #: app/models/favorite_enterprises_block.rb:4
455   -#: app/views/profile_editor/index.rhtml:29
  563 +#: app/views/profile_editor/index.rhtml:31
456 564 msgid "Favorite Enterprises"
457 565 msgstr "Empreendimentos Favoritos"
458 566  
... ... @@ -664,6 +772,11 @@ msgstr &quot;Categoria&quot;
664 772 msgid "Virtual"
665 773 msgstr ""
666 774  
  775 +#: app/models/products_block.rb:16
  776 +#, fuzzy
  777 +msgid "View all products"
  778 +msgstr "Novo produto"
  779 +
667 780 #: app/models/tags_block.rb:8
668 781 msgid "Block listing content count by tag"
669 782 msgstr "Block que lista a contagem de conteúdo por tag"
... ... @@ -676,9 +789,10 @@ msgstr &quot;&quot;
676 789 "A tag é criada quando você a adiciona ao seu artigo.<p/>Trente adicionar "
677 790 "algumas tags para alguns artigos e veja sua nuvem de tags crescer."
678 791  
679   -#: app/models/tags_block.rb:17
680   -msgid "%s's tags"
681   -msgstr "Tags de %s"
  792 +#: app/models/tags_block.rb:20
  793 +#, fuzzy
  794 +msgid "tags"
  795 +msgstr "tarefa"
682 796  
683 797 #: app/models/friendship.rb:-
684 798 msgid "friendship"
... ... @@ -772,7 +886,7 @@ msgstr &quot;Editar design de perfil&quot;
772 886 msgid "Manage products"
773 887 msgstr "Gerenciar produtos"
774 888  
775   -#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:21
  889 +#: app/models/profile.rb:34 app/views/profile_editor/index.rhtml:23
776 890 msgid "Manage friends"
777 891 msgstr "Gerenciar amigos"
778 892  
... ... @@ -784,15 +898,15 @@ msgstr &quot;validar empreendimento&quot;
784 898 msgid "Perform task"
785 899 msgstr "Realizar tarefa"
786 900  
787   -#: app/models/profile.rb:144
  901 +#: app/models/profile.rb:155
788 902 msgid "An existing profile cannot be renamed."
789 903 msgstr "Um perfil existente não pode ser renomeado"
790 904  
791   -#: app/models/profile.rb:299
  905 +#: app/models/profile.rb:319
792 906 msgid "%s's home page"
793 907 msgstr "Página inicial de %s"
794 908  
795   -#: app/models/profile.rb:299
  909 +#: app/models/profile.rb:319
796 910 msgid ""
797 911 "<p>This is a default homepage created for %s. It can be changed though the "
798 912 "control panel.</p>"
... ... @@ -800,11 +914,11 @@ msgstr &quot;&quot;
800 914 "<p>Esta é a pagina inicial padrão criada para %s. Esta página pode ser "
801 915 "modificada pelo painel de controle.</p>"
802 916  
803   -#: app/models/profile.rb:318
  917 +#: app/models/profile.rb:338
804 918 msgid "%s can't has members"
805 919 msgstr "%s não pode ter integrantes"
806 920  
807   -#: app/models/profile.rb:335
  921 +#: app/models/profile.rb:355
808 922 msgid "%s can't has moderators"
809 923 msgstr "%s não pode ter moderadores"
810 924  
... ... @@ -834,10 +948,6 @@ msgstr &quot;%{fn} já está sendo usado por outra categoria.&quot;
834 948 msgid "%{fn} was already assigned to another category."
835 949 msgstr "%{fn} já foi atribuído a outra categoria."
836 950  
837   -#: app/models/category.rb:13
838   -msgid "%{fn} must be the same as the parents'"
839   -msgstr "%{fn} tem que ser o mesmo que o dos pais'"
840   -
841 951 #: app/models/article_block.rb:4
842 952 msgid "Display one of your contents."
843 953 msgstr "Apresentar um dos seus conteúdos."
... ... @@ -1060,7 +1170,7 @@ msgstr &quot;&quot;
1060 1170 "Clicando em uma pessoa ou grupo você será enviado para sua página inicial."
1061 1171  
1062 1172 #: app/models/profile_list_block.rb:75
1063   -#: app/views/search/_display_results.rhtml:40 app/views/cms/view.rhtml:74
  1173 +#: app/views/search/_display_results.rhtml:45 app/views/cms/view.rhtml:75
1064 1174 msgid "None"
1065 1175 msgstr "Nenhum(a)"
1066 1176  
... ... @@ -1107,6 +1217,15 @@ msgstr &quot;Uma coleção de fotos, logos ou outros tipos de imagens.&quot;
1107 1217 msgid "thumbnail"
1108 1218 msgstr "miniatura"
1109 1219  
  1220 +#: app/models/enterprise_homepage.rb:4
  1221 +#, fuzzy
  1222 +msgid "Enterprise homepage."
  1223 +msgstr "Empreendimento"
  1224 +
  1225 +#: app/models/enterprise_homepage.rb:8
  1226 +msgid "Display the summary of profile."
  1227 +msgstr ""
  1228 +
1110 1229 #: app/models/sellers_search_block.rb:4
1111 1230 msgid "A search for enterprises by products selled and local"
1112 1231 msgstr "Uma busca de empreendimentos por produtos vendidos e localização"
... ... @@ -1453,11 +1572,6 @@ msgstr &quot;Evento&quot;
1453 1572 msgid "URL:"
1454 1573 msgstr "URL:"
1455 1574  
1456   -#: app/models/event.rb:73 app/views/enterprise_editor/index.rhtml:6
1457   -#: app/views/cms/_event.rhtml:12
1458   -msgid "Address:"
1459   -msgstr "Endereço:"
1460   -
1461 1575 #: app/models/event.rb:77
1462 1576 msgid "When:"
1463 1577 msgstr "Quando:"
... ... @@ -1535,7 +1649,7 @@ msgstr &quot;%s não foi desabilitado.&quot;
1535 1649 msgid "%s still needs to accept being your friend."
1536 1650 msgstr "%s ainda precisa aceitar ser seu(sua) amigo(a)."
1537 1651  
1538   -#: app/controllers/my_profile/cms_controller.rb:97
  1652 +#: app/controllers/my_profile/cms_controller.rb:103
1539 1653 msgid "Article \"%s\" configured as home page."
1540 1654 msgstr "Artigo \"%s\" configurado como página inicial."
1541 1655  
... ... @@ -1603,55 +1717,55 @@ msgstr &quot;Empreendimento ativado com sucesso&quot;
1603 1717 msgid "This action is not available for \"%s\"."
1604 1718 msgstr "Esta ação não está disponível para \"%s\"."
1605 1719  
1606   -#: app/controllers/public/search_controller.rb:182
  1720 +#: app/controllers/public/search_controller.rb:196
1607 1721 #, fuzzy
1608   -msgid "Newer profiles"
  1722 +msgid "Newer people"
1609 1723 msgstr "Ver perfil"
1610 1724  
1611   -#: app/controllers/public/search_controller.rb:183
  1725 +#: app/controllers/public/search_controller.rb:197
  1726 +#, fuzzy
  1727 +msgid "Newer enterprises"
  1728 +msgstr "Registrar empreendimento"
  1729 +
  1730 +#: app/controllers/public/search_controller.rb:199
  1731 +msgid "Upcoming events"
  1732 +msgstr ""
  1733 +
  1734 +#: app/controllers/public/search_controller.rb:200
1612 1735 #, fuzzy
1613 1736 msgid "Newer communities"
1614 1737 msgstr "Todas comunidades"
1615 1738  
1616   -#: app/controllers/public/search_controller.rb:184
  1739 +#: app/controllers/public/search_controller.rb:201
1617 1740 #, fuzzy
1618 1741 msgid "Newer articles"
1619 1742 msgstr "Novo artigo"
1620 1743  
1621   -#: app/controllers/public/search_controller.rb:185
  1744 +#: app/controllers/public/search_controller.rb:202
1622 1745 msgid "Most commented articles"
1623 1746 msgstr "Artigos mais comentados"
1624 1747  
1625   -#: app/controllers/public/search_controller.rb:186
1626   -#, fuzzy
1627   -msgid "Newer enterprises"
1628   -msgstr "Registrar empreendimento"
1629   -
1630   -#: app/controllers/public/search_controller.rb:187
1631   -msgid "Near events TODO"
1632   -msgstr ""
1633   -
1634   -#: app/controllers/public/account_controller.rb:21
  1748 +#: app/controllers/public/account_controller.rb:23
1635 1749 msgid "Logged in successfully"
1636 1750 msgstr "Login bem sucedido"
1637 1751  
1638   -#: app/controllers/public/account_controller.rb:23
  1752 +#: app/controllers/public/account_controller.rb:25
1639 1753 msgid "Incorrect username or password"
1640 1754 msgstr "Nome ou senha incorreto"
1641 1755  
1642   -#: app/controllers/public/account_controller.rb:51
  1756 +#: app/controllers/public/account_controller.rb:53
1643 1757 msgid "Thanks for signing up!"
1644 1758 msgstr "Obrigado por se registrar!"
1645 1759  
1646   -#: app/controllers/public/account_controller.rb:69
  1760 +#: app/controllers/public/account_controller.rb:71
1647 1761 msgid "You have been logged out."
1648 1762 msgstr "Você saiu do sistema."
1649 1763  
1650   -#: app/controllers/public/account_controller.rb:80
  1764 +#: app/controllers/public/account_controller.rb:82
1651 1765 msgid "Your password has been changed successfully!"
1652 1766 msgstr "Sua senha foi alterada com sucesso!"
1653 1767  
1654   -#: app/controllers/public/account_controller.rb:83
  1768 +#: app/controllers/public/account_controller.rb:85
1655 1769 msgid "The supplied current password is incorrect."
1656 1770 msgstr "A senha informada está incorreta"
1657 1771  
... ... @@ -1708,13 +1822,13 @@ msgid &quot;Leave&quot;
1708 1822 msgstr "Sair"
1709 1823  
1710 1824 #: app/views/memberships/index.rhtml:26
1711   -#: app/views/profile_editor/index.rhtml:46
  1825 +#: app/views/profile_editor/index.rhtml:51
1712 1826 #: app/views/profile/enterprises.rhtml:15
1713 1827 msgid "Register a new Enterprise"
1714 1828 msgstr "Registrar novo Empreendimento"
1715 1829  
1716 1830 #: app/views/memberships/index.rhtml:27
1717   -#: app/views/profile_editor/index.rhtml:45
  1831 +#: app/views/profile_editor/index.rhtml:50
1718 1832 #: app/views/profile/communities.rhtml:15
1719 1833 msgid "Create a new community"
1720 1834 msgstr "Criar nova comunidade"
... ... @@ -2008,6 +2122,11 @@ msgstr &quot;Editar aparência&quot;
2008 2122 msgid "Add a block"
2009 2123 msgstr "Adicionar um bloco"
2010 2124  
  2125 +#: app/views/box_organizer/_products_block.rhtml:5
  2126 +#: app/views/box_organizer/_link_list_block.rhtml:3
  2127 +msgid "Select the products that must be shown."
  2128 +msgstr ""
  2129 +
2011 2130 #: app/views/box_organizer/edit.rhtml:1
2012 2131 msgid "Editing block"
2013 2132 msgstr "Editando bloco"
... ... @@ -2218,10 +2337,6 @@ msgstr &quot;&quot;
2218 2337 "empreendimento seja submetido a avaliação pela entidade de sua escolha. Uma "
2219 2338 "vez aprovada, você poderá ativar o perfil do empreendimento"
2220 2339  
2221   -#: app/views/enterprise_registration/basic_information.rhtml:32
2222   -msgid "Next"
2223   -msgstr "Próximo"
2224   -
2225 2340 #: app/views/enterprise_editor/_form.rhtml:7
2226 2341 #: app/views/enterprise_validation/list_processed.rhtml:13
2227 2342 #: app/views/enterprise_validation/index.rhtml:18
... ... @@ -2268,26 +2383,14 @@ msgstr &quot;Identificador: &quot;
2268 2383 msgid "Contact phone:"
2269 2384 msgstr "Telefone de contato:"
2270 2385  
2271   -#: app/views/enterprise_editor/index.rhtml:8
2272   -msgid "Contact person:"
2273   -msgstr "Pessoa de contato:"
2274   -
2275 2386 #: app/views/enterprise_editor/index.rhtml:9
2276 2387 msgid "Acronym:"
2277 2388 msgstr "Sigla:"
2278 2389  
2279   -#: app/views/enterprise_editor/index.rhtml:10
2280   -msgid "Foundation year:"
2281   -msgstr "Ano de fundação:"
2282   -
2283 2390 #: app/views/enterprise_editor/index.rhtml:11
2284 2391 msgid "Legal Form:"
2285 2392 msgstr "Estaturo jurídico:"
2286 2393  
2287   -#: app/views/enterprise_editor/index.rhtml:12
2288   -msgid "Economic activity:"
2289   -msgstr "Atividade econômica:"
2290   -
2291 2394 #: app/views/enterprise_editor/index.rhtml:13
2292 2395 msgid "Management infomation:"
2293 2396 msgstr "Informação de gerenciamento:"
... ... @@ -2328,51 +2431,51 @@ msgstr &quot;Atualizar&quot;
2328 2431 msgid "My profile"
2329 2432 msgstr "Meu perfil"
2330 2433  
2331   -#: app/views/profile_editor/index.rhtml:9
  2434 +#: app/views/profile_editor/index.rhtml:11
2332 2435 msgid "Edit Profile"
2333 2436 msgstr "Editar Perfil"
2334 2437  
2335   -#: app/views/profile_editor/index.rhtml:11
  2438 +#: app/views/profile_editor/index.rhtml:13
2336 2439 msgid "Mail settings"
2337 2440 msgstr "Configurações de e-mail"
2338 2441  
2339   -#: app/views/profile_editor/index.rhtml:13
  2442 +#: app/views/profile_editor/index.rhtml:15
2340 2443 msgid "Pending tasks"
2341 2444 msgstr "Tarefas pendentes"
2342 2445  
2343   -#: app/views/profile_editor/index.rhtml:15
  2446 +#: app/views/profile_editor/index.rhtml:17
2344 2447 msgid "Edit Visual Design"
2345 2448 msgstr "Editar Aparência"
2346 2449  
2347   -#: app/views/profile_editor/index.rhtml:17
  2450 +#: app/views/profile_editor/index.rhtml:19
2348 2451 msgid "Manage Content"
2349 2452 msgstr "Gerenciar conteúdo"
2350 2453  
2351   -#: app/views/profile_editor/index.rhtml:19
  2454 +#: app/views/profile_editor/index.rhtml:21
2352 2455 msgid "Change Password"
2353 2456 msgstr "Alterar Senha"
2354 2457  
2355   -#: app/views/profile_editor/index.rhtml:23
  2458 +#: app/views/profile_editor/index.rhtml:25
2356 2459 msgid "Manage Members"
2357 2460 msgstr "Gerenciar Integrantes"
2358 2461  
2359   -#: app/views/profile_editor/index.rhtml:25
  2462 +#: app/views/profile_editor/index.rhtml:27
2360 2463 msgid "Manage Products and Services"
2361 2464 msgstr "Gerenciar Produtos e Serviços"
2362 2465  
2363   -#: app/views/profile_editor/index.rhtml:27
  2466 +#: app/views/profile_editor/index.rhtml:29
2364 2467 msgid "Enterprise Validation"
2365 2468 msgstr "Validações de empreendimento"
2366 2469  
2367   -#: app/views/profile_editor/index.rhtml:33
  2470 +#: app/views/profile_editor/index.rhtml:35
2368 2471 msgid "Disable Enterprise"
2369 2472 msgstr "Desabilitar Empreendimento"
2370 2473  
2371   -#: app/views/profile_editor/index.rhtml:35
  2474 +#: app/views/profile_editor/index.rhtml:37
2372 2475 msgid "Enable Enterprise"
2373 2476 msgstr "Habilitar Empreendimento"
2374 2477  
2375   -#: app/views/profile_editor/index.rhtml:42
  2478 +#: app/views/profile_editor/index.rhtml:47
2376 2479 msgid "Manage my groups"
2377 2480 msgstr "Gerenciar meus grupos"
2378 2481  
... ... @@ -2424,16 +2527,9 @@ msgid &quot;Moderation options&quot;
2424 2527 msgstr "Opções de moderação"
2425 2528  
2426 2529 #: app/views/profile_editor/_organization.rhtml:12
2427   -msgid "Closed organization"
2428   -msgstr "Organização fechada"
2429   -
2430   -#: app/views/profile_editor/_person.rhtml:5
2431   -msgid "Male"
2432   -msgstr "Masculino"
2433   -
2434   -#: app/views/profile_editor/_person.rhtml:5
2435   -msgid "Female"
2436   -msgstr "Feminino"
  2530 +msgid ""
  2531 +"New members must be approved by an administrator before joining this group?"
  2532 +msgstr ""
2437 2533  
2438 2534 #: app/views/profile_editor/enable.rhtml:1
2439 2535 msgid "Enabling '%s' enterprise"
... ... @@ -2515,7 +2611,7 @@ msgstr &quot;Perfil de %s&quot;
2515 2611 msgid "Homepage: "
2516 2612 msgstr "Página: "
2517 2613  
2518   -#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:9
  2614 +#: app/views/profile/index.rhtml:29 app/views/blocks/profile_info.rhtml:20
2519 2615 msgid "Products/Services"
2520 2616 msgstr "Produtos/Serviços"
2521 2617  
... ... @@ -2576,25 +2672,35 @@ msgid &quot;%s&#39;s favorite enterprises&quot;
2576 2672 msgstr "Empreendimentos favoritos de %s"
2577 2673  
2578 2674 #: app/views/search/products.rhtml:3
2579   -msgid "Products results for \"%{query}\" of enterprises in \"%{category}\""
  2675 +#, fuzzy
  2676 +msgid ""
  2677 +"Products and Services results for \"%{query}\" of enterprises in \"%"
  2678 +"{category}\""
2580 2679 msgstr ""
2581 2680 "Resultados da busca por \"%{query}\" de empreendimentos em \"%{category}\""
2582 2681  
2583 2682 #: app/views/search/products.rhtml:3
2584   -msgid "Products results for \"%s\""
  2683 +#, fuzzy
  2684 +msgid "Products and Services results for \"%s\""
2585 2685 msgstr "Produtos encontrados por \"%s\""
2586 2686  
2587 2687 #: app/views/search/products.rhtml:5
2588   -msgid "Products of enterprises in \"%s\""
  2688 +#, fuzzy
  2689 +msgid "Products and Services of enterprises in \"%s\""
2589 2690 msgstr "Produtos de empreendimento em \"%s\""
2590 2691  
2591   -#: app/views/search/products.rhtml:10
  2692 +#: app/views/search/products.rhtml:5
  2693 +#, fuzzy
  2694 +msgid "Products and Services"
  2695 +msgstr "Gerenciar Produtos e Serviços"
  2696 +
  2697 +#: app/views/search/products.rhtml:10 app/views/search/enterprises.rhtml:10
2592 2698 msgid "Within %s km from %s"
2593 2699 msgstr "No raio de %s km até %s"
2594 2700  
2595 2701 #: app/views/search/products.rhtml:13 app/views/search/index.rhtml:5
2596   -#: app/views/search/enterprises.rhtml:19 app/views/search/people.rhtml:19
2597   -#: app/views/search/communities.rhtml:19 app/views/search/articles.rhtml:19
  2702 +#: app/views/search/enterprises.rhtml:13 app/views/search/people.rhtml:21
  2703 +#: app/views/search/communities.rhtml:21 app/views/search/articles.rhtml:21
2598 2704 msgid "Refine your search"
2599 2705 msgstr "Refine sua busca"
2600 2706  
... ... @@ -2602,40 +2708,63 @@ msgstr &quot;Refine sua busca&quot;
2602 2708 msgid "by %{author} on \"%{article}\""
2603 2709 msgstr "por %{author} em \"%{article}\""
2604 2710  
2605   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2606   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2607   -#: app/views/search/articles.rhtml:12
  2711 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2712 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2608 2713 msgid "Search results for \"%{query}\" in \"%{category}\""
2609 2714 msgstr "Resultados da busca por \"%{query}\" em \"%{category}\""
2610 2715  
2611   -#: app/views/search/index.rhtml:3 app/views/search/enterprises.rhtml:12
2612   -#: app/views/search/people.rhtml:12 app/views/search/communities.rhtml:12
2613   -#: app/views/search/articles.rhtml:12
  2716 +#: app/views/search/index.rhtml:3 app/views/search/people.rhtml:15
  2717 +#: app/views/search/communities.rhtml:15 app/views/search/articles.rhtml:15
2614 2718 msgid "Search results for \"%s\""
2615 2719 msgstr "Resultados da busca por \"%s\""
2616 2720  
2617   -#: app/views/search/enterprises.rhtml:7 app/views/search/people.rhtml:7
2618   -#: app/views/search/communities.rhtml:7 app/views/search/articles.rhtml:7
2619   -msgid "(recently added)"
2620   -msgstr "(adicionado recentemente)"
  2721 +#: app/views/search/_product_categories_menu.rhtml:13
  2722 +#, fuzzy
  2723 +msgid "There is no sub-categories for %s."
  2724 +msgstr "Não há página: %s"
2621 2725  
2622   -#: app/views/search/enterprises.rhtml:14 app/views/search/people.rhtml:14
2623   -#: app/views/search/communities.rhtml:14 app/views/search/articles.rhtml:14
2624   -msgid "Browse by name"
2625   -msgstr "Navegar por nome"
  2726 +#: app/views/search/_product_categories_menu.rhtml:15
  2727 +#, fuzzy
  2728 +msgid "There is no categories."
  2729 +msgstr "Não há página: %s"
  2730 +
  2731 +#: app/views/search/enterprises.rhtml:3
  2732 +#, fuzzy
  2733 +msgid "Enterprise results for \"%{query}\" in \"%{category}\""
  2734 +msgstr "Resultados da busca por \"%{query}\" em \"%{category}\""
2626 2735  
2627   -#: app/views/search/_directory.rhtml:2
2628   -msgid "Recent"
2629   -msgstr "Recentes"
  2736 +#: app/views/search/enterprises.rhtml:3
  2737 +#, fuzzy
  2738 +msgid "Enterprise results for \"%s\""
  2739 +msgstr "Resultados da busca por \"%s\""
2630 2740  
2631   -#: app/views/search/_display_results.rhtml:18
2632   -msgid "more..."
2633   -msgstr "mais ..."
  2741 +#: app/views/search/enterprises.rhtml:5
  2742 +#, fuzzy
  2743 +msgid "Enterprises in \"%s\""
  2744 +msgstr "Cadastro de empreendimento: \"%s\""
  2745 +
  2746 +#: app/views/search/_display_results.rhtml:21
  2747 +msgid "see all (%d)"
  2748 +msgstr ""
  2749 +
  2750 +#: app/views/search/_display_results.rhtml:21
  2751 +msgid "see all..."
  2752 +msgstr ""
2634 2753  
2635 2754 #: app/views/search/popup.rhtml:3
2636 2755 msgid "Search %s"
2637 2756 msgstr "Busca em %s"
2638 2757  
  2758 +#: app/views/search/people.rhtml:11 app/views/search/communities.rhtml:11
  2759 +#: app/views/search/articles.rhtml:11
  2760 +msgid "(recently added)"
  2761 +msgstr "(adicionado recentemente)"
  2762 +
  2763 +#: app/views/search/people.rhtml:17 app/views/search/communities.rhtml:17
  2764 +#: app/views/search/articles.rhtml:17
  2765 +msgid "Browse by name"
  2766 +msgstr "Navegar por nome"
  2767 +
2639 2768 #: app/views/search/_sellers_form.rhtml:1
2640 2769 msgid "Search for sellers"
2641 2770 msgstr "Buscar por vendedores:"
... ... @@ -2644,21 +2773,15 @@ msgstr &quot;Buscar por vendedores:&quot;
2644 2773 msgid "Search in:"
2645 2774 msgstr "Buscar em:"
2646 2775  
2647   -#: app/views/search/_sellers_form.rhtml:13
2648   -#: app/views/search/_search_form.rhtml:27
  2776 +#: app/views/search/_sellers_form.rhtml:17
2649 2777 msgid "Distance (km): "
2650 2778 msgstr "Distância (km): "
2651 2779  
2652   -#: app/views/search/_sellers_form.rhtml:16
2653   -#: app/views/search/_search_form.rhtml:28
2654   -msgid "From: "
2655   -msgstr "De: "
2656   -
2657   -#: app/views/search/_product.rhtml:10
  2780 +#: app/views/search/_product.rhtml:15
2658 2781 msgid "Price: %d"
2659 2782 msgstr "Preço: %d"
2660 2783  
2661   -#: app/views/search/_product.rhtml:12
  2784 +#: app/views/search/_product.rhtml:17
2662 2785 msgid "Suplier: %s"
2663 2786 msgstr "Fornecedor: %s"
2664 2787  
... ... @@ -2678,11 +2801,21 @@ msgstr &quot;Pesquisar em todo o site&quot;
2678 2801 msgid "Search within:"
2679 2802 msgstr "Buscar dentro de:"
2680 2803  
2681   -#: app/views/search/_search_form.rhtml:35
  2804 +#: app/views/search/_search_form.rhtml:28
  2805 +#, fuzzy
  2806 +msgid "Distance (km):"
  2807 +msgstr "Distância (km): "
  2808 +
  2809 +#: app/views/search/_search_form.rhtml:33
  2810 +#, fuzzy
  2811 +msgid "From:"
  2812 +msgstr "De: "
  2813 +
  2814 +#: app/views/search/_search_form.rhtml:42
2682 2815 msgid "Search for:"
2683 2816 msgstr "Buscar por:"
2684 2817  
2685   -#: app/views/search/_search_form.rhtml:49
  2818 +#: app/views/search/_search_form.rhtml:56
2686 2819 msgid "Advanced search"
2687 2820 msgstr "Busca avançada"
2688 2821  
... ... @@ -2694,7 +2827,7 @@ msgstr &quot;por %s&quot;
2694 2827 msgid "Last update: %s."
2695 2828 msgstr "Última atualização: %s."
2696 2829  
2697   -#: app/views/search/_google_maps.rhtml:48
  2830 +#: app/views/search/_google_maps.rhtml:68
2698 2831 msgid ""
2699 2832 "One or more items don't have geographical information, and won't be shown in "
2700 2833 "the map. Choose \"Display in list\" to see them."
... ... @@ -2754,19 +2887,19 @@ msgstr &quot;Sair deste empreendimento&quot;
2754 2887 msgid "Join this enterprise"
2755 2888 msgstr "Entrar neste empreendimento"
2756 2889  
2757   -#: app/views/blocks/profile_info.rhtml:6
  2890 +#: app/views/blocks/profile_info.rhtml:17
2758 2891 msgid "Since %{year}/%{month}"
2759 2892 msgstr "Desde %{month}/%{year}"
2760 2893  
2761   -#: app/views/blocks/profile_info.rhtml:7 app/views/account/user_info.rhtml:7
  2894 +#: app/views/blocks/profile_info.rhtml:18 app/views/account/user_info.rhtml:7
2762 2895 msgid "Homepage"
2763 2896 msgstr "Página inicial"
2764 2897  
2765   -#: app/views/blocks/profile_info.rhtml:8
  2898 +#: app/views/blocks/profile_info.rhtml:19
2766 2899 msgid "View profile"
2767 2900 msgstr "Ver perfil"
2768 2901  
2769   -#: app/views/blocks/profile_info.rhtml:11 app/views/shared/user_menu.rhtml:30
  2902 +#: app/views/blocks/profile_info.rhtml:22 app/views/shared/user_menu.rhtml:30
2770 2903 msgid "Control panel"
2771 2904 msgstr "Painel de controle"
2772 2905  
... ... @@ -2902,15 +3035,19 @@ msgstr &quot;Novo artigo&quot;
2902 3035 msgid "Properties"
2903 3036 msgstr "Características"
2904 3037  
2905   -#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:66
  3038 +#: app/views/cms/view.rhtml:41 app/views/cms/view.rhtml:67
2906 3039 msgid "Public view"
2907 3040 msgstr "Visualização pública"
2908 3041  
2909 3042 #: app/views/cms/view.rhtml:42 app/views/cms/view.rhtml:68
  3043 +msgid "Use as homepage"
  3044 +msgstr "Usar como página incial"
  3045 +
  3046 +#: app/views/cms/view.rhtml:43 app/views/cms/view.rhtml:69
2910 3047 msgid "Delete"
2911 3048 msgstr "Remover"
2912 3049  
2913   -#: app/views/cms/view.rhtml:42
  3050 +#: app/views/cms/view.rhtml:43
2914 3051 msgid ""
2915 3052 "Are you sure that you want to remove this folder? Note that all the items "
2916 3053 "inside it will also be removed!"
... ... @@ -2918,11 +3055,7 @@ msgstr &quot;&quot;
2918 3055 "Tem certeza que quer excluir esta pasta? Perceba que todos os ítens dentro "
2919 3056 "dela também serão removidos!"
2920 3057  
2921   -#: app/views/cms/view.rhtml:67
2922   -msgid "Use as homepage"
2923   -msgstr "Usar como página incial"
2924   -
2925   -#: app/views/cms/view.rhtml:68
  3058 +#: app/views/cms/view.rhtml:69
2926 3059 msgid "Are you sure that you want to remove this item?"
2927 3060 msgstr "Tem certeza que quer excluir este ítem?"
2928 3061  
... ... @@ -3577,12 +3710,12 @@ msgstr &quot;Não use uma senha óbvia, mas tente algo de ser lembrado facilmente.&quot;
3577 3710 msgid "We need to be sure that you wrote correctly your password."
3578 3711 msgstr "Nós precisamos ter certeza que você escreveu sua senha corretamente."
3579 3712  
3580   -#: app/views/account/signup.rhtml:33
  3713 +#: app/views/account/signup.rhtml:35
3581 3714 #: app/views/account/activate_enterprise.rhtml:37
3582 3715 msgid "I accept the terms of use"
3583 3716 msgstr "Eu aceito os termos de uso"
3584 3717  
3585   -#: app/views/account/signup.rhtml:38
  3718 +#: app/views/account/signup.rhtml:40
3586 3719 #: app/views/account/activate_enterprise.rhtml:42
3587 3720 msgid "Sign up"
3588 3721 msgstr "Registre-se."
... ... @@ -3715,6 +3848,27 @@ msgstr &quot;Um projeto FBES&quot;
3715 3848 msgid "Developed by Colivre"
3716 3849 msgstr "Desenvolvimento Colivre"
3717 3850  
  3851 +#~ msgid "%d %B %Y"
  3852 +#~ msgstr "%d de %B de %Y"
  3853 +
  3854 +#~ msgid "edit your information"
  3855 +#~ msgstr "editar suas informações"
  3856 +
  3857 +#~ msgid "%s's tags"
  3858 +#~ msgstr "Tags de %s"
  3859 +
  3860 +#~ msgid "%{fn} must be the same as the parents'"
  3861 +#~ msgstr "%{fn} tem que ser o mesmo que o dos pais'"
  3862 +
  3863 +#~ msgid "Closed organization"
  3864 +#~ msgstr "Organização fechada"
  3865 +
  3866 +#~ msgid "Recent"
  3867 +#~ msgstr "Recentes"
  3868 +
  3869 +#~ msgid "more..."
  3870 +#~ msgstr "mais ..."
  3871 +
3718 3872 #~ msgid "Closed %s"
3719 3873 #~ msgstr "%s fechado(a)"
3720 3874  
... ... @@ -4036,9 +4190,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
4036 4190 #~ msgid "Category: %s"
4037 4191 #~ msgstr "Categoria: %s"
4038 4192  
4039   -#~ msgid "Recently registered people"
4040   -#~ msgstr "Pessoas registradas recentemente"
4041   -
4042 4193 #~ msgid "Recently created communities"
4043 4194 #~ msgstr "Comunidades criadas recentemente"
4044 4195  
... ... @@ -4415,9 +4566,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
4415 4566 #~ msgid "Max number of links"
4416 4567 #~ msgstr "Número máximo de links"
4417 4568  
4418   -#~ msgid "Previous"
4419   -#~ msgstr "Anterior"
4420   -
4421 4569 #~ msgid "Adicionar"
4422 4570 #~ msgstr "Adicionar"
4423 4571  
... ... @@ -4723,9 +4871,6 @@ msgstr &quot;Desenvolvimento Colivre&quot;
4723 4871 #~ msgid "Main content block"
4724 4872 #~ msgstr "Bloco de conteúdo principal"
4725 4873  
4726   -#~ msgid "There is no page %s"
4727   -#~ msgstr "Não há página: %s"
4728   -
4729 4874 #~ msgid "Edit enterprise info"
4730 4875 #~ msgstr "Editar informação de empreendimento"
4731 4876  
... ...
public/stylesheets/common.css
  Diff comments   View file @b24d068
... ... @@ -218,6 +218,7 @@ div#notice {
218 218 }
219 219  
220 220 /* tables */
  221 +
221 222 table {
222 223 border-collapse: collapse;
223 224 }
... ... @@ -243,6 +244,24 @@ table.noborder th, table.noborder td{
243 244 border: none;
244 245 }
245 246  
  247 +#edit-link-list-block {
  248 + overflow: auto;
  249 + overflow-x: hidden;
  250 + height: 120px;
  251 +}
  252 +
  253 +#edit-link-list-block table {
  254 + width: 100%;
  255 +}
  256 +
  257 +#edit-link-list-block table .cel-address {
  258 + width: 300px;
  259 +}
  260 +
  261 +#edit-link-list-block table .cel-address input {
  262 + width: 100%;
  263 +}
  264 +
246 265 /* for fields with auto-completion */
247 266 div.auto-complete {
248 267 display: block;
... ...
test/functional/environment_design_controller_test.rb
  Diff comments   View file @b24d068
... ... @@ -22,4 +22,29 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
22 22 should 'indicate only actual blocks as such' do
23 23 assert(@controller.available_blocks.all? {|item| item.new.is_a? Block})
24 24 end
  25 +
  26 + should 'LinkListBlock is available' do
  27 + assert_includes @controller.available_blocks, LinkListBlock
  28 + end
  29 +
  30 + should 'be able to edit LinkListBlock' do
  31 + login_as(create_admin_user(Environment.default))
  32 + l = LinkListBlock.create!()
  33 + Environment.default.boxes.create!
  34 + Environment.default.boxes.first.blocks << l
  35 + get :edit, :id => l.id
  36 + assert_tag :tag => 'input', :attributes => { :name => 'block[links][][name]' }
  37 + assert_tag :tag => 'input', :attributes => { :name => 'block[links][][address]' }
  38 + end
  39 +
  40 + should 'be able to save LinkListBlock' do
  41 + login_as(create_admin_user(Environment.default))
  42 + l = LinkListBlock.create!()
  43 + Environment.default.boxes.create!
  44 + Environment.default.boxes.first.blocks << l
  45 + post :save, :id => l.id, :block => { :links => [{:name => 'link 1', :address => '/address_1'}] }
  46 + l.reload
  47 + assert_equal [{'name' => 'link 1', 'address' => '/address_1'}], l.links
  48 + end
  49 +
25 50 end
... ...
test/unit/link_list_block_test.rb 0 → 100644
  Diff comments   View file @b24d068
... ... @@ -0,0 +1,36 @@
  1 +require File.dirname(__FILE__) + '/../test_helper'
  2 +
  3 +class LinkListBlockTest < ActiveSupport::TestCase
  4 +
  5 + should 'default describe' do
  6 + assert_not_equal Block.description, LinkListBlock.description
  7 + end
  8 +
  9 + should 'have field links' do
  10 + l = LinkListBlock.new
  11 + assert_respond_to l, :links
  12 + end
  13 +
  14 + should 'default value of links' do
  15 + l = LinkListBlock.new
  16 + assert_equal [], l.links
  17 + end
  18 +
  19 + should 'is editable' do
  20 + l = LinkListBlock.new
  21 + assert l.editable?
  22 + end
  23 +
  24 + should 'list links' do
  25 + l = LinkListBlock.new(:links => [{:name => 'products', :address => '/cat/products'}])
  26 + l.expects(:links).returns([{:name => 'products', :address => '/cat/products'}])
  27 + assert_match /products/, l.content
  28 + end
  29 +
  30 + should 'remove links with blank fields' do
  31 + l = LinkListBlock.new(:links => [{:name => 'categ', :address => '/address'}, {:name => '', :address => ''}])
  32 + l.save!
  33 + assert_equal [{:name => 'categ', :address => '/address'}], l.links
  34 + end
  35 +
  36 +end
... ...