Download as
Browse Code »

Commit b90cfca9adce19b9a021f8d362f6c72bf687eb6a

Authored by Antonio Terceiro
1 parent a89b2521
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1049: changing "nickname" for "Business name" for enterprises

Showing 12 changed files with 148 additions and 102 deletions   Show diff stats
app/models/community.rb
  Diff comments   View file @b90cfca
... ... @@ -8,6 +8,7 @@ class Community < Organization
8 8 xss_terminate :only => [ :name, :address, :contact_phone, :description ]
9 9  
10 10 FIELDS = %w[
  11 + nickname
11 12 description
12 13 language
13 14 ]
... ...
app/models/enterprise.rb
  Diff comments   View file @b90cfca
... ... @@ -12,7 +12,16 @@ class Enterprise < Organization
12 12  
13 13 settings_items :organization_website, :historic_and_current_context, :activities_short_description, :zip_code, :city, :state, :country
14 14  
  15 + def business_name
  16 + self.nickname
  17 + end
  18 + def business_name=(value)
  19 + self.nickname = value
  20 + end
  21 + N_('Business name')
  22 +
15 23 FIELDS = %w[
  24 + business_name
16 25 zip_code
17 26 city
18 27 state
... ...
app/models/organization.rb
  Diff comments   View file @b90cfca
... ... @@ -44,7 +44,6 @@ class Organization < Profile
44 44 end
45 45  
46 46 FIELDS = %w[
47   - nickname
48 47 contact_person
49 48 contact_phone
50 49 contact_email
... ...
po/bg/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/de/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/es/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/fr/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@ msgid &quot;&quot;
7 7 msgstr ""
8 8 "Project-Id-Version: noosfero 0.18.0\n"
9 9 "Report-Msgid-Bugs-To: \n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-0300\n"
11 11 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
12 12 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
13 13 "Language-Team: LANGUAGE <LL@li.org>\n"
... ... @@ -1801,8 +1801,8 @@ msgstr &quot;école&quot;
1801 1801 msgid "family"
1802 1802 msgstr "famille"
1803 1803  
1804   -#: app/models/person.rb:77 app/models/community.rb:22
1805   -#: app/models/enterprise.rb:32
  1804 +#: app/models/person.rb:77 app/models/community.rb:23
  1805 +#: app/models/enterprise.rb:41
1806 1806 msgid "%{fn} is mandatory"
1807 1807 msgstr "%{fn} est obligatoire"
1808 1808  
... ... @@ -2088,30 +2088,30 @@ msgstr &quot;catégorie d&#39;articles&quot;
2088 2088 msgid "articlecategorization"
2089 2089 msgstr "categorisationarticle"
2090 2090  
2091   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2091 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2092 2092 msgid "Contact person"
2093 2093 msgstr "Personne de contact"
2094 2094  
2095   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2095 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2096 2096 #: app/views/enterprise_editor/_form.rhtml:13
2097 2097 #: app/views/enterprise_validation/_details.rhtml:19
2098 2098 msgid "Acronym"
2099 2099 msgstr "Sigle"
2100 2100  
2101   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2101 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2102 2102 msgid "Foundation year"
2103 2103 msgstr "Année de création"
2104 2104  
2105   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2105 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2106 2106 #, fuzzy
2107 2107 msgid "Legal form"
2108 2108 msgstr "Forme juridique"
2109 2109  
2110   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2110 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2111 2111 msgid "Economic activity"
2112 2112 msgstr "Activité économique"
2113 2113  
2114   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2114 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2115 2115 #: app/views/enterprise_registration/basic_information.rhtml:27
2116 2116 msgid "Management information"
2117 2117 msgstr "Information sur les dirigeants"
... ... @@ -2467,11 +2467,11 @@ msgstr &quot;profil de catégories&quot;
2467 2467 msgid "profilecategorization"
2468 2468 msgstr "categorisationdeprofils"
2469 2469  
2470   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2470 +#: app/models/organization.rb:68 app/models/environment.rb:-
2471 2471 msgid "Contact email"
2472 2472 msgstr "Adresse électronique de contact"
2473 2473  
2474   -#: app/models/organization.rb:69
  2474 +#: app/models/organization.rb:68
2475 2475 msgid "Validated"
2476 2476 msgstr "Validé(e)"
2477 2477  
... ... @@ -2674,6 +2674,11 @@ msgstr &quot;Description courte des activités&quot;
2674 2674 msgid "ZIP code"
2675 2675 msgstr "Code postal"
2676 2676  
  2677 +#: app/models/enterprise.rb:21
  2678 +#, fuzzy
  2679 +msgid "Business name"
  2680 +msgstr "Nom de fichier"
  2681 +
2677 2682 #: app/models/environment.rb:-
2678 2683 msgid "environment"
2679 2684 msgstr "environnement"
... ...
po/hy/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1742,8 +1742,8 @@ msgstr &quot;դպրոց&quot;
1742 1742 msgid "family"
1743 1743 msgstr "ընտանիք"
1744 1744  
1745   -#: app/models/person.rb:77 app/models/community.rb:22
1746   -#: app/models/enterprise.rb:32
  1745 +#: app/models/person.rb:77 app/models/community.rb:23
  1746 +#: app/models/enterprise.rb:41
1747 1747 msgid "%{fn} is mandatory"
1748 1748 msgstr ""
1749 1749  
... ... @@ -2019,29 +2019,29 @@ msgstr &quot;հոդվածների կատեգորիա&quot;
2019 2019 msgid "articlecategorization"
2020 2020 msgstr "հոդվածների կատեգորիզացում"
2021 2021  
2022   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2023 2023 msgid "Contact person"
2024 2024 msgstr "Կապ պահպանող անձ"
2025 2025  
2026   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2026 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2027 2027 #: app/views/enterprise_editor/_form.rhtml:13
2028 2028 #: app/views/enterprise_validation/_details.rhtml:19
2029 2029 msgid "Acronym"
2030 2030 msgstr "Հապավում"
2031 2031  
2032   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2032 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2033 2033 msgid "Foundation year"
2034 2034 msgstr "Հիմնադրման տարին"
2035 2035  
2036   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2036 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2037 2037 msgid "Legal form"
2038 2038 msgstr "Իրավաբանական հիմք"
2039 2039  
2040   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2040 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2041 2041 msgid "Economic activity"
2042 2042 msgstr "Տնտեսական գործունեություն"
2043 2043  
2044   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2044 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2045 2045 #: app/views/enterprise_registration/basic_information.rhtml:27
2046 2046 msgid "Management information"
2047 2047 msgstr "Տեղեկություններ ղեկավարության մասին"
... ... @@ -2388,11 +2388,11 @@ msgstr &quot;Կատեգորիաների էջ&quot;
2388 2388 msgid "profilecategorization"
2389 2389 msgstr "Անհատական էջի կատեգորիզացում"
2390 2390  
2391   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2391 +#: app/models/organization.rb:68 app/models/environment.rb:-
2392 2392 msgid "Contact email"
2393 2393 msgstr "էլ. հասցե"
2394 2394  
2395   -#: app/models/organization.rb:69
  2395 +#: app/models/organization.rb:68
2396 2396 msgid "Validated"
2397 2397 msgstr "Վավերացված է"
2398 2398  
... ... @@ -2590,6 +2590,10 @@ msgstr &quot;&quot;
2590 2590 msgid "ZIP code"
2591 2591 msgstr ""
2592 2592  
  2593 +#: app/models/enterprise.rb:21
  2594 +msgid "Business name"
  2595 +msgstr ""
  2596 +
2593 2597 #: app/models/environment.rb:-
2594 2598 msgid "environment"
2595 2599 msgstr "համակարգ"
... ...
po/it/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/nl/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/noosfero.pot
  Diff comments   View file @b90cfca
... ... @@ -7,7 +7,7 @@
7 7 msgid ""
8 8 msgstr ""
9 9 "Project-Id-Version: noosfero 0.18.0\n"
10   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
  10 +"POT-Creation-Date: 2009-05-27 12:25-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"
... ... @@ -1723,8 +1723,8 @@ msgstr &quot;&quot;
1723 1723 msgid "family"
1724 1724 msgstr ""
1725 1725  
1726   -#: app/models/person.rb:77 app/models/community.rb:22
1727   -#: app/models/enterprise.rb:32
  1726 +#: app/models/person.rb:77 app/models/community.rb:23
  1727 +#: app/models/enterprise.rb:41
1728 1728 msgid "%{fn} is mandatory"
1729 1729 msgstr ""
1730 1730  
... ... @@ -1997,29 +1997,29 @@ msgstr &quot;&quot;
1997 1997 msgid "articlecategorization"
1998 1998 msgstr ""
1999 1999  
2000   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2000 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2001 2001 msgid "Contact person"
2002 2002 msgstr ""
2003 2003  
2004   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2004 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2005 2005 #: app/views/enterprise_editor/_form.rhtml:13
2006 2006 #: app/views/enterprise_validation/_details.rhtml:19
2007 2007 msgid "Acronym"
2008 2008 msgstr ""
2009 2009  
2010   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2010 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2011 2011 msgid "Foundation year"
2012 2012 msgstr ""
2013 2013  
2014   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2014 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2015 2015 msgid "Legal form"
2016 2016 msgstr ""
2017 2017  
2018   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2018 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2019 2019 msgid "Economic activity"
2020 2020 msgstr ""
2021 2021  
2022   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2022 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2023 2023 #: app/views/enterprise_registration/basic_information.rhtml:27
2024 2024 msgid "Management information"
2025 2025 msgstr ""
... ... @@ -2343,11 +2343,11 @@ msgstr &quot;&quot;
2343 2343 msgid "profilecategorization"
2344 2344 msgstr ""
2345 2345  
2346   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2346 +#: app/models/organization.rb:68 app/models/environment.rb:-
2347 2347 msgid "Contact email"
2348 2348 msgstr ""
2349 2349  
2350   -#: app/models/organization.rb:69
  2350 +#: app/models/organization.rb:68
2351 2351 msgid "Validated"
2352 2352 msgstr ""
2353 2353  
... ... @@ -2541,6 +2541,10 @@ msgstr &quot;&quot;
2541 2541 msgid "ZIP code"
2542 2542 msgstr ""
2543 2543  
  2544 +#: app/models/enterprise.rb:21
  2545 +msgid "Business name"
  2546 +msgstr ""
  2547 +
2544 2548 #: app/models/environment.rb:-
2545 2549 msgid "environment"
2546 2550 msgstr ""
... ...
po/pt_BR/noosfero.po
  Diff comments   View file @b90cfca
... ... @@ -12,8 +12,8 @@
12 12 msgid ""
13 13 msgstr ""
14 14 "Project-Id-Version: noosfero 0.18.0\n"
15   -"POT-Creation-Date: 2009-05-26 19:20-0300\n"
16   -"PO-Revision-Date: 2009-05-26 19:23-0300\n"
  15 +"POT-Creation-Date: 2009-05-27 12:25-0300\n"
  16 +"PO-Revision-Date: 2009-05-27 12:26-0300\n"
17 17 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
18 18 "Language-Team: LANGUAGE <LL@li.org>\n"
19 19 "MIME-Version: 1.0\n"
... ... @@ -1749,8 +1749,8 @@ msgstr &quot;escola&quot;
1749 1749 msgid "family"
1750 1750 msgstr "família"
1751 1751  
1752   -#: app/models/person.rb:77 app/models/community.rb:22
1753   -#: app/models/enterprise.rb:32
  1752 +#: app/models/person.rb:77 app/models/community.rb:23
  1753 +#: app/models/enterprise.rb:41
1754 1754 msgid "%{fn} is mandatory"
1755 1755 msgstr "%{fn} é obrigatório"
1756 1756  
... ... @@ -2027,29 +2027,29 @@ msgstr &quot;artigos categoria&quot;
2027 2027 msgid "articlecategorization"
2028 2028 msgstr "categorizaçãoartigo"
2029 2029  
2030   -#: app/models/create_enterprise.rb:7 app/models/organization.rb:69
  2030 +#: app/models/create_enterprise.rb:7 app/models/organization.rb:68
2031 2031 msgid "Contact person"
2032 2032 msgstr "Pessoa de contato"
2033 2033  
2034   -#: app/models/create_enterprise.rb:8 app/models/organization.rb:69
  2034 +#: app/models/create_enterprise.rb:8 app/models/organization.rb:68
2035 2035 #: app/views/enterprise_editor/_form.rhtml:13
2036 2036 #: app/views/enterprise_validation/_details.rhtml:19
2037 2037 msgid "Acronym"
2038 2038 msgstr "Sigla"
2039 2039  
2040   -#: app/models/create_enterprise.rb:9 app/models/organization.rb:69
  2040 +#: app/models/create_enterprise.rb:9 app/models/organization.rb:68
2041 2041 msgid "Foundation year"
2042 2042 msgstr "Ano de fundação"
2043 2043  
2044   -#: app/models/create_enterprise.rb:10 app/models/organization.rb:69
  2044 +#: app/models/create_enterprise.rb:10 app/models/organization.rb:68
2045 2045 msgid "Legal form"
2046 2046 msgstr "Formulário Legal"
2047 2047  
2048   -#: app/models/create_enterprise.rb:11 app/models/organization.rb:69
  2048 +#: app/models/create_enterprise.rb:11 app/models/organization.rb:68
2049 2049 msgid "Economic activity"
2050 2050 msgstr "Atividade econômica"
2051 2051  
2052   -#: app/models/create_enterprise.rb:12 app/models/organization.rb:69
  2052 +#: app/models/create_enterprise.rb:12 app/models/organization.rb:68
2053 2053 #: app/views/enterprise_registration/basic_information.rhtml:27
2054 2054 msgid "Management information"
2055 2055 msgstr "Gerenciamento de informação"
... ... @@ -2395,11 +2395,11 @@ msgstr &quot;categories perfil&quot;
2395 2395 msgid "profilecategorization"
2396 2396 msgstr "categorizaçãoperfil"
2397 2397  
2398   -#: app/models/organization.rb:69 app/models/environment.rb:-
  2398 +#: app/models/organization.rb:68 app/models/environment.rb:-
2399 2399 msgid "Contact email"
2400 2400 msgstr "Email de contato"
2401 2401  
2402   -#: app/models/organization.rb:69
  2402 +#: app/models/organization.rb:68
2403 2403 msgid "Validated"
2404 2404 msgstr "Validado"
2405 2405  
... ... @@ -2595,6 +2595,10 @@ msgstr &quot;Breve descrição das atividades&quot;
2595 2595 msgid "ZIP code"
2596 2596 msgstr "CEP"
2597 2597  
  2598 +#: app/models/enterprise.rb:21
  2599 +msgid "Business name"
  2600 +msgstr "Nome fantasia"
  2601 +
2598 2602 #: app/models/environment.rb:-
2599 2603 msgid "environment"
2600 2604 msgstr "comunidade virtual"
... ... @@ -5140,7 +5144,7 @@ msgstr &quot;Informações gerais&quot;
5140 5144  
5141 5145 #: app/views/profile_editor/_organization.rhtml:6
5142 5146 msgid "Display name"
5143   -msgstr "Nome de apresentação"
  5147 +msgstr "Nome fantasia"
5144 5148  
5145 5149 #: app/views/profile_editor/_organization.rhtml:9
5146 5150 msgid "A short name by which the organization is know."
... ...