diff --git a/app/models/create_enterprise.rb b/app/models/create_enterprise.rb
index 4d21cd0..345eb31 100644
--- a/app/models/create_enterprise.rb
+++ b/app/models/create_enterprise.rb
@@ -1,15 +1,15 @@
class CreateEnterprise < Task
- N_('CreateEnterprise|Identifier')
- N_('CreateEnterprise|Name')
- N_('CreateEnterprise|Address')
- N_('CreateEnterprise|Contact phone')
- N_('CreateEnterprise|Contact person')
- N_('CreateEnterprise|Acronym')
- N_('CreateEnterprise|Foundation year')
- N_('CreateEnterprise|Legal form')
- N_('CreateEnterprise|Economic activity')
- N_('CreateEnterprise|Management information')
+ N_('Identifier')
+ N_('Name')
+ N_('Address')
+ N_('Contact phone')
+ N_('Contact person')
+ N_('Acronym')
+ N_('Foundation year')
+ N_('Legal form')
+ N_('Economic activity')
+ N_('Management information')
DATA_FIELDS = %w[ name identifier address contact_phone contact_person acronym foundation_year legal_form economic_activity management_information region_id reject_explanation ]
diff --git a/app/models/user.rb b/app/models/user.rb
index cccf0d9..848add7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,8 +4,8 @@ require 'digest/sha1'
# Rails generator.
class User < ActiveRecord::Base
- N_('User|Password')
- N_('User|Password confirmation')
+ N_('Password')
+ N_('Password confirmation')
# FIXME ugly workaround
def self.human_attribute_name(attrib)
diff --git a/po/de/noosfero.po b/po/de/noosfero.po
index 1c17b6e..3a68d2e 100644
--- a/po/de/noosfero.po
+++ b/po/de/noosfero.po
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2007-08-30 18:47-0300\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -283,27 +283,27 @@ msgstr ""
msgid "Main content"
msgstr ""
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr ""
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr ""
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -312,22 +312,22 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr ""
@@ -779,9 +779,9 @@ msgid "profile"
msgstr ""
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -793,7 +793,8 @@ msgstr ""
msgid "Type"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr ""
@@ -801,7 +802,8 @@ msgstr ""
msgid "Active"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -809,7 +811,7 @@ msgstr ""
msgid "Address"
msgstr ""
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr ""
@@ -960,11 +962,11 @@ msgid "Reference article"
msgstr ""
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr ""
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr ""
#: app/models/user.rb:47
@@ -1353,44 +1355,31 @@ msgstr ""
msgid "articlecategorization"
msgstr ""
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr ""
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr ""
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr ""
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr ""
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr ""
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr ""
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr ""
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
msgstr ""
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr ""
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr ""
#: app/models/create_enterprise.rb:128
@@ -1469,6 +1458,10 @@ msgstr ""
msgid "Contact person: %s"
msgstr ""
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr ""
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr ""
@@ -1597,36 +1590,10 @@ msgstr ""
msgid "profilecategorization"
msgstr ""
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr ""
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr ""
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr ""
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr ""
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr ""
@@ -1747,7 +1714,7 @@ msgid ""
"control panel.
"
msgstr ""
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr ""
@@ -3644,23 +3611,23 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
msgstr ""
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr ""
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
msgstr ""
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3669,22 +3636,22 @@ msgid ""
"right."
msgstr ""
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr ""
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr ""
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
" and made by people of all the world parts."
msgstr ""
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr ""
@@ -3790,7 +3757,7 @@ msgid "Validators by Region"
msgstr ""
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr ""
@@ -3870,11 +3837,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr ""
diff --git a/po/es/noosfero.po b/po/es/noosfero.po
index 1c17b6e..3a68d2e 100644
--- a/po/es/noosfero.po
+++ b/po/es/noosfero.po
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2007-08-30 18:47-0300\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -283,27 +283,27 @@ msgstr ""
msgid "Main content"
msgstr ""
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr ""
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr ""
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -312,22 +312,22 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr ""
@@ -779,9 +779,9 @@ msgid "profile"
msgstr ""
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -793,7 +793,8 @@ msgstr ""
msgid "Type"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr ""
@@ -801,7 +802,8 @@ msgstr ""
msgid "Active"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -809,7 +811,7 @@ msgstr ""
msgid "Address"
msgstr ""
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr ""
@@ -960,11 +962,11 @@ msgid "Reference article"
msgstr ""
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr ""
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr ""
#: app/models/user.rb:47
@@ -1353,44 +1355,31 @@ msgstr ""
msgid "articlecategorization"
msgstr ""
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr ""
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr ""
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr ""
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr ""
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr ""
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr ""
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr ""
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
msgstr ""
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr ""
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr ""
#: app/models/create_enterprise.rb:128
@@ -1469,6 +1458,10 @@ msgstr ""
msgid "Contact person: %s"
msgstr ""
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr ""
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr ""
@@ -1597,36 +1590,10 @@ msgstr ""
msgid "profilecategorization"
msgstr ""
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr ""
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr ""
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr ""
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr ""
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr ""
@@ -1747,7 +1714,7 @@ msgid ""
"control panel."
msgstr ""
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr ""
@@ -3644,23 +3611,23 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
msgstr ""
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr ""
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
msgstr ""
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3669,22 +3636,22 @@ msgid ""
"right."
msgstr ""
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr ""
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr ""
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
" and made by people of all the world parts."
msgstr ""
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr ""
@@ -3790,7 +3757,7 @@ msgid "Validators by Region"
msgstr ""
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr ""
@@ -3870,11 +3837,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr ""
diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po
index 79173ca..0ddf179 100644
--- a/po/fr/noosfero.po
+++ b/po/fr/noosfero.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2008-06-13 16:15-0300\n"
"Last-Translator: Raphael Rousseau \n"
"Language-Team: LANGUAGE \n"
@@ -298,27 +298,27 @@ msgstr ""
msgid "Main content"
msgstr "Contenu principal"
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr "Vers le haut"
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr "Vers le bas"
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -327,22 +327,22 @@ msgstr ""
msgid "Edit"
msgstr "Éditer"
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr "Effacer le bloc"
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr "Aide"
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr "Fermer"
@@ -833,9 +833,9 @@ msgid "profile"
msgstr "profil"
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -847,7 +847,8 @@ msgstr "Nom"
msgid "Type"
msgstr "Type"
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr "Identifiant"
@@ -856,7 +857,8 @@ msgstr "Identifiant"
msgid "Active"
msgstr "Activer"
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -864,7 +866,7 @@ msgstr "Activer"
msgid "Address"
msgstr "Adresse"
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
#, fuzzy
msgid "Contact phone"
msgstr "Téléphone de contact :"
@@ -1041,11 +1043,12 @@ msgid "Reference article"
msgstr "Articles récents"
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr "Mot de passe"
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+#, fuzzy
+msgid "Password confirmation"
msgstr "Mot de passe (confirmation)"
#: app/models/user.rb:47
@@ -1483,44 +1486,35 @@ msgstr "catégorie d'articles"
msgid "articlecategorization"
msgstr "categorisationarticle"
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr "Identifiant"
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr "Nom"
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr "Adresse"
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr "Téléphone de contact"
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
-msgstr "Personne de contact"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+#, fuzzy
+msgid "Contact person"
+msgstr "Personne de contact : "
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr "Sigle"
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
-msgstr "Année de création"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+#, fuzzy
+msgid "Foundation year"
+msgstr "Année de création :"
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+#, fuzzy
+msgid "Legal form"
msgstr "Forme juridique"
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
-msgstr "Activité économique"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+#, fuzzy
+msgid "Economic activity"
+msgstr "Activité économique :"
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr "Information sur les dirigeants"
#: app/models/create_enterprise.rb:128
@@ -1616,6 +1610,10 @@ msgstr "Téléphone de contact : %s"
msgid "Contact person: %s"
msgstr "Personne de contact : %s"
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr "Identifiant"
+
#: app/models/event.rb:15
#, fuzzy
msgid "%{fn} cannot come before end date."
@@ -1755,41 +1753,11 @@ msgstr "profil de catégories"
msgid "profilecategorization"
msgstr "categorisationdeprofils"
-#: app/models/organization.rb:46
-#, fuzzy
-msgid "Contact person"
-msgstr "Personne de contact : "
-
#: app/models/organization.rb:46 app/models/environment.rb:-
#, fuzzy
msgid "Contact email"
msgstr "Téléphone de contact"
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr "Sigle"
-
-#: app/models/organization.rb:46
-#, fuzzy
-msgid "Foundation year"
-msgstr "Année de création :"
-
-#: app/models/organization.rb:46
-#, fuzzy
-msgid "Legal form"
-msgstr "Forme juridique"
-
-#: app/models/organization.rb:46
-#, fuzzy
-msgid "Economic activity"
-msgstr "Activité économique :"
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr "Information sur les dirigeants"
-
#: app/models/organization.rb:46
#, fuzzy
msgid "Validated"
@@ -1923,7 +1891,7 @@ msgstr ""
"C'est la page d'accueil par défaut créée pour %s. Elle peut être modifiée "
"dans le panneau de contrôle.
"
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
#, fuzzy
msgid "Intranet"
msgstr "Mes centres d'intérêt"
@@ -4012,7 +3980,7 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
@@ -4021,11 +3989,11 @@ msgstr ""
"Cliquez sur le point d'interrogation au coin haut-droit pour désactiver "
"cette fenêtre d'aide."
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr "Aller au contenu"
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
@@ -4034,7 +4002,7 @@ msgstr ""
"fonctions principales de l'environnement et vous trouverez plus rapidement "
"les informations qui vous intéressent."
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -4048,15 +4016,15 @@ msgstr ""
"de page. La seconde dimension est celle des types contenus, et vous "
"les trouverez dans la barre animée de votre droite."
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr "Activer/désactiver l'aide"
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr "Vote navigateur web est obsolète !"
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
@@ -4067,7 +4035,7 @@ msgstr ""
"web, libre et gratuit\n"
" et élaboré par des gens de partout dans le monde."
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr "Obtenir Firefox maintenant !"
@@ -4183,7 +4151,7 @@ msgid "Validators by Region"
msgstr "Validateurs par région"
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr "Ajouter"
@@ -4272,11 +4240,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr "Dans quel partie désirez-vous placer ce nouveau bloc ?"
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr "Partie %d"
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr "Choisissez le type de bloc que vous voulez ajouter à la page."
@@ -5039,6 +5007,36 @@ msgstr "Développé par Colivre"
msgid "A Ynternet.org project"
msgstr ""
+#~ msgid "User|Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "CreateEnterprise|Name"
+#~ msgstr "Nom"
+
+#~ msgid "CreateEnterprise|Address"
+#~ msgstr "Adresse"
+
+#~ msgid "CreateEnterprise|Contact phone"
+#~ msgstr "Téléphone de contact"
+
+#~ msgid "CreateEnterprise|Contact person"
+#~ msgstr "Personne de contact"
+
+#~ msgid "CreateEnterprise|Acronym"
+#~ msgstr "Sigle"
+
+#~ msgid "CreateEnterprise|Foundation year"
+#~ msgstr "Année de création"
+
+#~ msgid "CreateEnterprise|Legal form"
+#~ msgstr "Forme juridique"
+
+#~ msgid "CreateEnterprise|Economic activity"
+#~ msgstr "Activité économique"
+
+#~ msgid "CreateEnterprise|Management information"
+#~ msgstr "Information sur les dirigeants"
+
#, fuzzy
#~ msgid "Destroy %s"
#~ msgstr "Détruire"
@@ -5602,9 +5600,6 @@ msgstr ""
#~ msgid "Tags"
#~ msgstr "Tags"
-#~ msgid "Password"
-#~ msgstr "Mot de passe"
-
#~ msgid ""
#~ "To change your password, please fill the form on this screen using yout "
#~ "username and your e-mail. You will receive a message at that e-mail "
diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po
index 1c17b6e..3a68d2e 100644
--- a/po/hy/noosfero.po
+++ b/po/hy/noosfero.po
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2007-08-30 18:47-0300\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -283,27 +283,27 @@ msgstr ""
msgid "Main content"
msgstr ""
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr ""
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr ""
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -312,22 +312,22 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr ""
@@ -779,9 +779,9 @@ msgid "profile"
msgstr ""
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -793,7 +793,8 @@ msgstr ""
msgid "Type"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr ""
@@ -801,7 +802,8 @@ msgstr ""
msgid "Active"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -809,7 +811,7 @@ msgstr ""
msgid "Address"
msgstr ""
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr ""
@@ -960,11 +962,11 @@ msgid "Reference article"
msgstr ""
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr ""
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr ""
#: app/models/user.rb:47
@@ -1353,44 +1355,31 @@ msgstr ""
msgid "articlecategorization"
msgstr ""
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr ""
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr ""
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr ""
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr ""
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr ""
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr ""
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr ""
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
msgstr ""
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr ""
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr ""
#: app/models/create_enterprise.rb:128
@@ -1469,6 +1458,10 @@ msgstr ""
msgid "Contact person: %s"
msgstr ""
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr ""
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr ""
@@ -1597,36 +1590,10 @@ msgstr ""
msgid "profilecategorization"
msgstr ""
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr ""
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr ""
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr ""
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr ""
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr ""
@@ -1747,7 +1714,7 @@ msgid ""
"control panel."
msgstr ""
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr ""
@@ -3644,23 +3611,23 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
msgstr ""
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr ""
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
msgstr ""
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3669,22 +3636,22 @@ msgid ""
"right."
msgstr ""
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr ""
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr ""
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
" and made by people of all the world parts."
msgstr ""
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr ""
@@ -3790,7 +3757,7 @@ msgid "Validators by Region"
msgstr ""
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr ""
@@ -3870,11 +3837,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr ""
diff --git a/po/nl/noosfero.po b/po/nl/noosfero.po
index 1c17b6e..3a68d2e 100644
--- a/po/nl/noosfero.po
+++ b/po/nl/noosfero.po
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2007-08-30 18:47-0300\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -283,27 +283,27 @@ msgstr ""
msgid "Main content"
msgstr ""
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr ""
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr ""
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -312,22 +312,22 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr ""
@@ -779,9 +779,9 @@ msgid "profile"
msgstr ""
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -793,7 +793,8 @@ msgstr ""
msgid "Type"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr ""
@@ -801,7 +802,8 @@ msgstr ""
msgid "Active"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -809,7 +811,7 @@ msgstr ""
msgid "Address"
msgstr ""
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr ""
@@ -960,11 +962,11 @@ msgid "Reference article"
msgstr ""
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr ""
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr ""
#: app/models/user.rb:47
@@ -1353,44 +1355,31 @@ msgstr ""
msgid "articlecategorization"
msgstr ""
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr ""
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr ""
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr ""
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr ""
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr ""
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr ""
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr ""
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
msgstr ""
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr ""
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr ""
#: app/models/create_enterprise.rb:128
@@ -1469,6 +1458,10 @@ msgstr ""
msgid "Contact person: %s"
msgstr ""
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr ""
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr ""
@@ -1597,36 +1590,10 @@ msgstr ""
msgid "profilecategorization"
msgstr ""
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr ""
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr ""
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr ""
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr ""
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr ""
@@ -1747,7 +1714,7 @@ msgid ""
"control panel."
msgstr ""
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr ""
@@ -3644,23 +3611,23 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
msgstr ""
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr ""
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
msgstr ""
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3669,22 +3636,22 @@ msgid ""
"right."
msgstr ""
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr ""
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr ""
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
" and made by people of all the world parts."
msgstr ""
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr ""
@@ -3790,7 +3757,7 @@ msgid "Validators by Region"
msgstr ""
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr ""
@@ -3870,11 +3837,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr ""
diff --git a/po/noosfero.pot b/po/noosfero.pot
index 1c17b6e..3a68d2e 100644
--- a/po/noosfero.pot
+++ b/po/noosfero.pot
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
"PO-Revision-Date: 2007-08-30 18:47-0300\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -283,27 +283,27 @@ msgstr ""
msgid "Main content"
msgstr ""
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr ""
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr ""
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr ""
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr ""
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -312,22 +312,22 @@ msgstr ""
msgid "Edit"
msgstr ""
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr ""
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr ""
@@ -779,9 +779,9 @@ msgid "profile"
msgstr ""
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -793,7 +793,8 @@ msgstr ""
msgid "Type"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr ""
@@ -801,7 +802,8 @@ msgstr ""
msgid "Active"
msgstr ""
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -809,7 +811,7 @@ msgstr ""
msgid "Address"
msgstr ""
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr ""
@@ -960,11 +962,11 @@ msgid "Reference article"
msgstr ""
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr ""
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr ""
#: app/models/user.rb:47
@@ -1353,44 +1355,31 @@ msgstr ""
msgid "articlecategorization"
msgstr ""
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr ""
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr ""
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr ""
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr ""
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr ""
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr ""
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr ""
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
msgstr ""
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr ""
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
msgstr ""
#: app/models/create_enterprise.rb:128
@@ -1469,6 +1458,10 @@ msgstr ""
msgid "Contact person: %s"
msgstr ""
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr ""
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr ""
@@ -1597,36 +1590,10 @@ msgstr ""
msgid "profilecategorization"
msgstr ""
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr ""
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr ""
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr ""
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr ""
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr ""
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr ""
@@ -1747,7 +1714,7 @@ msgid ""
"control panel."
msgstr ""
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr ""
@@ -3644,23 +3611,23 @@ msgid ""
"You'll be able to access a webmail from your user menu."
msgstr ""
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
msgstr ""
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr ""
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
msgstr ""
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3669,22 +3636,22 @@ msgid ""
"right."
msgstr ""
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr ""
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr ""
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
" and made by people of all the world parts."
msgstr ""
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr ""
@@ -3790,7 +3757,7 @@ msgid "Validators by Region"
msgstr ""
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr ""
@@ -3870,11 +3837,11 @@ msgstr ""
msgid "In what area do you want to put your new block?"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr ""
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr ""
diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po
index 11982df..b103f63 100644
--- a/po/pt_BR/noosfero.po
+++ b/po/pt_BR/noosfero.po
@@ -11,9 +11,9 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: noosfero 0.11.0\n"
-"POT-Creation-Date: 2008-09-10 12:05-0300\n"
-"PO-Revision-Date: 2008-09-11 18:09-0300\n"
+"Project-Id-Version: noosfero 0.11.4\n"
+"POT-Creation-Date: 2008-09-12 19:33-0300\n"
+"PO-Revision-Date: 2008-09-12 19:35-0300\n"
"Last-Translator: Joenio Costa \n"
"Language-Team: LANGUAGE \n"
"MIME-Version: 1.0\n"
@@ -289,27 +289,27 @@ msgstr "Distância:"
msgid "Main content"
msgstr "Gerenciar conteúdo"
-#: app/helpers/boxes_helper.rb:137
+#: app/helpers/boxes_helper.rb:143
msgid "Can't move up anymore."
msgstr "Impossível move mais acima."
-#: app/helpers/boxes_helper.rb:139
+#: app/helpers/boxes_helper.rb:145
msgid "Move block up"
msgstr "Mover para cima"
-#: app/helpers/boxes_helper.rb:143
+#: app/helpers/boxes_helper.rb:149
msgid "Can't move down anymore."
msgstr "Impossível mover mais abaixo."
-#: app/helpers/boxes_helper.rb:145
+#: app/helpers/boxes_helper.rb:151
msgid "Move block down"
msgstr "Mover para baixo"
-#: app/helpers/boxes_helper.rb:152 app/helpers/boxes_helper.rb:154
+#: app/helpers/boxes_helper.rb:158 app/helpers/boxes_helper.rb:160
msgid "Move to the opposite side"
msgstr "Mover para o lado oposto"
-#: app/helpers/boxes_helper.rb:159 app/views/profile_members/index.rhtml:14
+#: app/helpers/boxes_helper.rb:165 app/views/profile_members/index.rhtml:14
#: app/views/role/index.rhtml:6 app/views/cms/view.rhtml:66
#: app/views/content_viewer/view_page.rhtml:35
#: app/views/categories/_category.rhtml:8
@@ -318,22 +318,22 @@ msgstr "Mover para o lado oposto"
msgid "Edit"
msgstr "Editar"
-#: app/helpers/boxes_helper.rb:163
+#: app/helpers/boxes_helper.rb:169
msgid "Remove block"
msgstr "Remover bloco"
-#: app/helpers/boxes_helper.rb:167
+#: app/helpers/boxes_helper.rb:173
msgid "Help on this block"
msgstr "Ajuda sobre este bloco"
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:63
-#: app/views/layouts/application.rhtml:122 app/views/features/index.rhtml:7
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:63
+#: app/views/layouts/application.rhtml:123 app/views/features/index.rhtml:7
msgid "Help"
msgstr "Ajuda"
-#: app/helpers/boxes_helper.rb:167 app/helpers/application_helper.rb:83
+#: app/helpers/boxes_helper.rb:173 app/helpers/application_helper.rb:83
#: app/views/shared/user_menu.rhtml:63 app/views/search/_search_form.rhtml:57
-#: app/views/box_organizer/add_block.rhtml:18
+#: app/views/box_organizer/add_block.rhtml:19
msgid "Close"
msgstr "Fechar"
@@ -792,9 +792,9 @@ msgid "profile"
msgstr "perfil"
#: app/models/user.rb:- app/models/comment.rb:- app/models/domain.rb:-
-#: app/models/product.rb:- app/models/category.rb:-
-#: app/models/environment.rb:- app/views/cms/view.rhtml:24
-#: app/views/enterprise_editor/_form.rhtml:1
+#: app/models/product.rb:- app/models/create_enterprise.rb:4
+#: app/models/category.rb:- app/models/environment.rb:-
+#: app/views/cms/view.rhtml:24 app/views/enterprise_editor/_form.rhtml:1
#: app/views/content_viewer/_comment_form.rhtml:24
#: app/views/enterprise_validation/_details.rhtml:3
#: app/views/box_organizer/_link_list_block.rhtml:5
@@ -806,7 +806,8 @@ msgstr "Nome"
msgid "Type"
msgstr "Tipo"
-#: app/models/user.rb:- app/views/enterprise_validation/_details.rhtml:23
+#: app/models/user.rb:- app/models/create_enterprise.rb:3
+#: app/views/enterprise_validation/_details.rhtml:23
msgid "Identifier"
msgstr "Identificador"
@@ -814,7 +815,8 @@ msgstr "Identificador"
msgid "Active"
msgstr "Ativar"
-#: app/models/user.rb:- app/views/enterprise_editor/_form.rhtml:4
+#: app/models/user.rb:- app/models/create_enterprise.rb:5
+#: app/views/enterprise_editor/_form.rhtml:4
#: app/views/enterprise_validation/index.rhtml:14
#: app/views/enterprise_validation/_details.rhtml:7
#: app/views/enterprise_validation/list_processed.rhtml:9
@@ -822,7 +824,7 @@ msgstr "Ativar"
msgid "Address"
msgstr "Endereço"
-#: app/models/user.rb:-
+#: app/models/user.rb:- app/models/create_enterprise.rb:6
msgid "Contact phone"
msgstr "Telefone de contato"
@@ -973,11 +975,11 @@ msgid "Reference article"
msgstr "Artigo referenciado"
#: app/models/user.rb:7
-msgid "User|Password"
+msgid "Password"
msgstr "Senha"
#: app/models/user.rb:8
-msgid "User|Password confirmation"
+msgid "Password confirmation"
msgstr "Confirmação de senha"
#: app/models/user.rb:47
@@ -1371,45 +1373,32 @@ msgstr "artigos categoria"
msgid "articlecategorization"
msgstr "categorizaçãoartigo"
-#: app/models/create_enterprise.rb:3 app/models/create_enterprise.rb:164
-msgid "CreateEnterprise|Identifier"
-msgstr "Identificador"
-
-#: app/models/create_enterprise.rb:4
-msgid "CreateEnterprise|Name"
-msgstr "Nome"
-
-#: app/models/create_enterprise.rb:5
-msgid "CreateEnterprise|Address"
-msgstr "Endereço"
-
-#: app/models/create_enterprise.rb:6
-msgid "CreateEnterprise|Contact phone"
-msgstr "Telefone de contato"
-
-#: app/models/create_enterprise.rb:7
-msgid "CreateEnterprise|Contact person"
+#: app/models/create_enterprise.rb:7 app/models/organization.rb:46
+msgid "Contact person"
msgstr "Pessoa de contato"
-#: app/models/create_enterprise.rb:8
-msgid "CreateEnterprise|Acronym"
+#: app/models/create_enterprise.rb:8 app/models/organization.rb:46
+#: app/views/enterprise_editor/_form.rhtml:13
+#: app/views/enterprise_validation/_details.rhtml:19
+msgid "Acronym"
msgstr "Sigla"
-#: app/models/create_enterprise.rb:9
-msgid "CreateEnterprise|Foundation year"
+#: app/models/create_enterprise.rb:9 app/models/organization.rb:46
+msgid "Foundation year"
msgstr "Ano de fundação"
-#: app/models/create_enterprise.rb:10
-msgid "CreateEnterprise|Legal form"
-msgstr "Estatuto Jurídico"
+#: app/models/create_enterprise.rb:10 app/models/organization.rb:46
+msgid "Legal form"
+msgstr "Formulário Legal"
-#: app/models/create_enterprise.rb:11
-msgid "CreateEnterprise|Economic activity"
+#: app/models/create_enterprise.rb:11 app/models/organization.rb:46
+msgid "Economic activity"
msgstr "Atividade econômica"
-#: app/models/create_enterprise.rb:12
-msgid "CreateEnterprise|Management information"
-msgstr "Informação de gerenciamento"
+#: app/models/create_enterprise.rb:12 app/models/organization.rb:46
+#: app/views/enterprise_registration/basic_information.rhtml:27
+msgid "Management information"
+msgstr "Gerenciamento de informação"
#: app/models/create_enterprise.rb:128
msgid "Enterprise registration: \"%s\""
@@ -1503,6 +1492,10 @@ msgstr "Telefone de contato: %s"
msgid "Contact person: %s"
msgstr "Pessoa de contato: %s"
+#: app/models/create_enterprise.rb:164
+msgid "CreateEnterprise|Identifier"
+msgstr "Identificador"
+
#: app/models/event.rb:15
msgid "%{fn} cannot come before end date."
msgstr "%{fn} não pode vir antes da data final."
@@ -1635,36 +1628,10 @@ msgstr "categories perfil"
msgid "profilecategorization"
msgstr "categorizaçãoperfil"
-#: app/models/organization.rb:46
-msgid "Contact person"
-msgstr "Pessoa de contato"
-
#: app/models/organization.rb:46 app/models/environment.rb:-
msgid "Contact email"
msgstr "Email de contato"
-#: app/models/organization.rb:46 app/views/enterprise_editor/_form.rhtml:13
-#: app/views/enterprise_validation/_details.rhtml:19
-msgid "Acronym"
-msgstr "Sigla"
-
-#: app/models/organization.rb:46
-msgid "Foundation year"
-msgstr "Ano de fundação"
-
-#: app/models/organization.rb:46
-msgid "Legal form"
-msgstr "Formulário Legal"
-
-#: app/models/organization.rb:46
-msgid "Economic activity"
-msgstr "Atividade econômica"
-
-#: app/models/organization.rb:46
-#: app/views/enterprise_registration/basic_information.rhtml:27
-msgid "Management information"
-msgstr "Gerenciamento de informação"
-
#: app/models/organization.rb:46
msgid "Validated"
msgstr "Validado"
@@ -1787,7 +1754,7 @@ msgstr ""
"Esta é a pagina inicial padrão criada para mim. Esta página pode ser "
"modificada pelo painel de controle.
"
-#: app/models/profile.rb:345
+#: app/models/profile.rb:344
msgid "Intranet"
msgstr "Intranet"
@@ -2552,8 +2519,7 @@ msgstr "Registre-se"
#: app/views/account/_login_form.rhtml:3 app/views/account/login.rhtml:9
msgid ""
"To join on this environment, click on \"I want to participate!\"."
-msgstr ""
-"Para entrar neste ambiente, clique em \"Quero participar!\"."
+msgstr "Para entrar neste ambiente, clique em \"Quero participar!\"."
#: app/views/account/change_password.rhtml:1
#: app/views/account/change_password.rhtml:14
@@ -3756,7 +3722,7 @@ msgstr ""
"Marcar esta opção te dá uma conta de e-mail com o endereço acima. Você "
"poderá acessar um webmail a partir do seu menu de usuário."
-#: app/views/layouts/application.rhtml:58
+#: app/views/layouts/application.rhtml:59
msgid ""
"Pass the mouse over page elements to get help on them. Click the question "
"mark icon on the top-right corner to deactivate this help window."
@@ -3765,11 +3731,11 @@ msgstr ""
"Clique no ícone de ajuda no canto superior direito para desativar essa "
"janela de ajuda."
-#: app/views/layouts/application.rhtml:81
+#: app/views/layouts/application.rhtml:82
msgid "Go to content"
msgstr "Ir para o conteúdo"
-#: app/views/layouts/application.rhtml:93
+#: app/views/layouts/application.rhtml:94
msgid ""
"This is %s's shortcuts bar. Using it you have access to the main features of "
"the environment and you find the information of your interest more quickly."
@@ -3778,7 +3744,7 @@ msgstr ""
"principais funcionalidades do ambiente e encontra mais rapidamente as "
"informações do seu interesse."
-#: app/views/layouts/application.rhtml:95
+#: app/views/layouts/application.rhtml:96
msgid ""
"This bar helps you find information following two paths or "
"dimensions. First dimension is composed of categories"
@@ -3792,15 +3758,15 @@ msgstr ""
"dimensão contém os tipos de conteúdo que você encontra na aba "
"animada da direita."
-#: app/views/layouts/application.rhtml:121
+#: app/views/layouts/application.rhtml:122
msgid "Turn help on/off"
msgstr "Ligar e desligar a Ajuda"
-#: app/views/layouts/application.rhtml:169
+#: app/views/layouts/application.rhtml:170
msgid "Your web browser is obsolete!"
msgstr "Seu navegador web esta obsoleto!"
-#: app/views/layouts/application.rhtml:170
+#: app/views/layouts/application.rhtml:171
msgid ""
"This website will not look as good as it could.\n"
" Don't you want to use Firefox? That is a great web browser, free,\n"
@@ -3810,7 +3776,7 @@ msgstr ""
"Firefox? É um ótimo navegador, livre e feito por pessoas de todos os cantos "
"do mundo."
-#: app/views/layouts/application.rhtml:174
+#: app/views/layouts/application.rhtml:175
msgid "Get Firefox Now!"
msgstr "Baixe o Firefox Já!"
@@ -3927,7 +3893,7 @@ msgid "Validators by Region"
msgstr "Validadores por região"
#: app/views/region_validators/_search.rhtml:9
-#: app/views/box_organizer/add_block.rhtml:17 app/views/themes/add_css.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:18 app/views/themes/add_css.rhtml:7
msgid "Add"
msgstr "Adicionar"
@@ -4009,11 +3975,11 @@ msgstr "Escolha os produtos que serão exibidos."
msgid "In what area do you want to put your new block?"
msgstr "Em que área você quer colocar seu novo bloco?"
-#: app/views/box_organizer/add_block.rhtml:5
+#: app/views/box_organizer/add_block.rhtml:6
msgid "Area %d"
msgstr "Área %d"
-#: app/views/box_organizer/add_block.rhtml:7
+#: app/views/box_organizer/add_block.rhtml:8
msgid "Select the type of block you want to add to your page."
msgstr "Selecione o tipo de bloco que você quer adicionar à sua página."
@@ -4679,6 +4645,36 @@ msgstr "Desenvolvimento Colivre"
msgid "A Ynternet.org project"
msgstr "Um projeto da Ynternet.org"
+#~ msgid "User|Password"
+#~ msgstr "Senha"
+
+#~ msgid "CreateEnterprise|Name"
+#~ msgstr "Nome"
+
+#~ msgid "CreateEnterprise|Address"
+#~ msgstr "Endereço"
+
+#~ msgid "CreateEnterprise|Contact phone"
+#~ msgstr "Telefone de contato"
+
+#~ msgid "CreateEnterprise|Contact person"
+#~ msgstr "Pessoa de contato"
+
+#~ msgid "CreateEnterprise|Acronym"
+#~ msgstr "Sigla"
+
+#~ msgid "CreateEnterprise|Foundation year"
+#~ msgstr "Ano de fundação"
+
+#~ msgid "CreateEnterprise|Legal form"
+#~ msgstr "Estatuto Jurídico"
+
+#~ msgid "CreateEnterprise|Economic activity"
+#~ msgstr "Atividade econômica"
+
+#~ msgid "CreateEnterprise|Management information"
+#~ msgstr "Informação de gerenciamento"
+
#~ msgid "Destroy %s"
#~ msgstr "Remover %s"
@@ -5361,9 +5357,6 @@ msgstr "Um projeto da Ynternet.org"
#~ msgid "Person|Data"
#~ msgstr "Dados"
-#~ msgid "Password"
-#~ msgstr "Senha"
-
#~ msgid "Do you want to activate the automatic help mode?"
#~ msgstr "Você gostaria de ativar o modo de ajuda automática?"
--
libgit2 0.21.2