From bb4b067a4bc6fefe18df80301cd6d1bffa6bf5fe Mon Sep 17 00:00:00 2001 From: Daniela Soares Feitosa Date: Mon, 22 Aug 2011 17:56:21 -0300 Subject: [PATCH] Updating noosfero.po files --- po/de/noosfero.po | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------- po/eo/noosfero.po | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------- po/es/noosfero.po | 193 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------- po/fr/noosfero.po | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------ po/hy/noosfero.po | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------ po/noosfero.pot | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------- po/pt/noosfero.po | 375 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- po/ru/noosfero.po | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------- 8 files changed, 763 insertions(+), 959 deletions(-) diff --git a/po/de/noosfero.po b/po/de/noosfero.po index 9a82d63..94c02e0 100755 --- a/po/de/noosfero.po +++ b/po/de/noosfero.po @@ -6,8 +6,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2011-03-15 13:14+0100\n" "Last-Translator: Ronny Kursawe \n" "Language-Team: German \n" @@ -100,30 +100,30 @@ msgid "Edit folder" msgstr "Andere Ordner" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "Artikel" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "Nutzer" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Produkte" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -132,15 +132,15 @@ msgstr "Unternehmen" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "Communities" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1270,7 +1270,7 @@ msgstr "Sind Sie sicher, dass Sie diese Web-Site besuchen möchten?" msgid "Change category" msgstr "Ändere Kategorie" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "Preis" @@ -1324,43 +1324,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "1 %{singular_unit}" msgstr[1] "%{num} %{plural_unit}" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "Zeige als Liste" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "Zeige als Map" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "E-Mail:" -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "Telefon:" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "Ort" -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "Adresse" -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "Produkte/Dienste" -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "Entfernung" -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "Anbieter" -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "Kategorie" @@ -1518,27 +1518,27 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "Kommentar erfolgreich gelöscht" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 msgid "More recent people" msgstr "Mehr neue Leute" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 msgid "More active people" msgstr "Mehr aktive Leute" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "Mehr beliebte Leute" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 msgid "More recent communities" msgstr "Mehr neue Communities" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 msgid "More active communities" msgstr "Mehr aktive Communities" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 msgid "More popular communities" msgstr "Mehr populäre Communities" @@ -1574,11 +1574,11 @@ msgstr "Verfügbar!" msgid "Unavailable!" msgstr "Nicht verfügbar!" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "Anstehende Ereignisse" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "Meist kommentierte Artikel" @@ -1998,11 +1998,11 @@ msgstr "keine" msgid "box" msgstr "Box" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "Besitzer-Typ" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "Besitzer" @@ -2280,7 +2280,7 @@ msgstr "Box" msgid "Type" msgstr "Typ" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "Einstellungen" @@ -2294,8 +2294,7 @@ msgstr "Aktiviert" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "Erstellt" @@ -2304,8 +2303,7 @@ msgstr "Erstellt" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "aktualisiert um" @@ -2450,18 +2448,23 @@ msgstr "%{requestor}möchte den Artikel %{linked_subject} veröffentlichen." msgid "The article was removed." msgstr "Der Artikel wurde gelöscht" -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 msgid "%{requestor} wants to publish the article: %{article}." msgstr "%{requestor} möchte den Artikel : %{article} veröffentlichen." -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +#, fuzzy +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "%{requestor} möchte den Artikel : %{article} veröffentlichen." + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" "Sie müssen bei %{system} angemeldet sein, um den Artikel bestätigen oder " "ablehnen zu können." -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2473,20 +2476,20 @@ msgstr "" "stattgegeben. Hier ist der Kommentar des Admins, der Ihren Artikel genehmigt " "hat:\n" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" "Ihrer Anfrage, den Artikel \"%{article}\" zu veröffentlichen, wurde " "stattgegeben." -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 #, fuzzy msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "" "Ihrer Anfrage, den Artikel \"%{article}\" zu veröffentlichen, wurde " "stattgegeben." -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2757,10 +2760,9 @@ msgid "qualifier" msgstr "Kennzeichner" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -3050,10 +3052,6 @@ msgstr "Code" msgid "Target type" msgstr "Zieltyp" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3338,38 +3336,6 @@ msgstr "[%s] Sie haben einen neuen Kommentar erhalten!" msgid "This block presents the main content of your pages." msgstr "Dieser Block zeigt den Hauptinhalt Ihrer Seiten" -#: app/models/environment.rb:- -msgid "environment" -msgstr "Umgebung" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "Kontakt-E-Mail" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "ist Standard" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "Persönlicher Kopfbereich (Header)" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "Persönlicher Fußbereich (footer)" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "Thema" - -#: app/models/environment.rb:- -msgid "Terms of use acceptance text" -msgstr "Nutzungsbedingungen" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "Zeige Administrations-Panel für Umgebung" @@ -3548,7 +3514,7 @@ msgstr "XMPP/Jabber basierender Chat" msgid "Show a zoom link on all article images" msgstr "Zeige einen Zoom-Link für alle Artikelbilder" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "Nur eine virtuelle Community kann als Standard gewählt werden" @@ -3602,6 +3568,18 @@ msgstr "geografische Position" msgid "Nickname" msgstr "Nickname" +#: app/models/profile.rb:- +msgid "Custom header" +msgstr "Persönlicher Kopfbereich (Header)" + +#: app/models/profile.rb:- +msgid "Custom footer" +msgstr "Persönlicher Fußbereich (footer)" + +#: app/models/profile.rb:- +msgid "Theme" +msgstr "Thema" + #: app/models/profile.rb:- app/models/profile.rb:675 msgid "Public profile" msgstr "öffentliches Profil" @@ -3618,19 +3596,6 @@ msgstr "bevorzugte Domain" msgid "Visible" msgstr "Sichtbar" -#: app/models/profile.rb:- -#, fuzzy -msgid "Company name" -msgstr "Namen anzeigen" - -#: app/models/profile.rb:- -msgid "Cnpj" -msgstr "" - -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" -msgstr "bestätigt" - #: app/models/profile.rb:36 msgid "Edit profile" msgstr "Profile ändern" @@ -3991,6 +3956,14 @@ msgstr "Beschränkungen" msgid "Display name" msgstr "Namen anzeigen" +#: app/models/organization.rb:98 +msgid "Contact email" +msgstr "Kontakt-E-Mail" + +#: app/models/organization.rb:98 +msgid "Validated" +msgstr "bestätigt" + #: app/models/organization.rb:116 msgid "Community's profile" msgstr "Communities Profil" @@ -3999,14 +3972,6 @@ msgstr "Communities Profil" msgid "Invite Friends" msgstr "Freunde einladen" -#: app/models/domain.rb:- -msgid "domain" -msgstr "domain" - -#: app/models/domain.rb:- -msgid "Google maps key" -msgstr "Google maps Schlüssel" - #: app/models/domain.rb:13 #, fuzzy msgid "" @@ -8844,6 +8809,25 @@ msgstr "" "\">GNU Affero General Public License Version 3 oder einer späteren " "Version lizensiert ist." +#~ msgid "environment" +#~ msgstr "Umgebung" + +#~ msgid "Is default" +#~ msgstr "ist Standard" + +#~ msgid "Terms of use acceptance text" +#~ msgstr "Nutzungsbedingungen" + +#, fuzzy +#~ msgid "Company name" +#~ msgstr "Namen anzeigen" + +#~ msgid "domain" +#~ msgstr "domain" + +#~ msgid "Google maps key" +#~ msgstr "Google maps Schlüssel" + #~ msgid "Could not upload all files" #~ msgstr "Kann nicht alle Dateien hochladen" diff --git a/po/eo/noosfero.po b/po/eo/noosfero.po index 4a907f5..d2cb245 100644 --- a/po/eo/noosfero.po +++ b/po/eo/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2011-03-30 20:52-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -98,30 +98,30 @@ msgid "Edit folder" msgstr "" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -130,15 +130,15 @@ msgstr "" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Change category" msgstr "" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "" @@ -1313,43 +1313,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "" msgstr[1] "" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "" -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "" -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "" -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "" -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "" -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "" -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "" @@ -1501,27 +1501,27 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 msgid "More recent people" msgstr "" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 msgid "More active people" msgstr "" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 msgid "More recent communities" msgstr "" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 msgid "More active communities" msgstr "" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 msgid "More popular communities" msgstr "" @@ -1557,11 +1557,11 @@ msgstr "" msgid "Unavailable!" msgstr "" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "" @@ -1968,11 +1968,11 @@ msgstr "" msgid "box" msgstr "" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "" @@ -2228,7 +2228,7 @@ msgstr "" msgid "Type" msgstr "" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "" @@ -2242,8 +2242,7 @@ msgstr "" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "" @@ -2252,8 +2251,7 @@ msgstr "" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "" @@ -2398,16 +2396,20 @@ msgstr "" msgid "The article was removed." msgstr "" -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 msgid "%{requestor} wants to publish the article: %{article}." msgstr "" -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "" + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2415,15 +2417,15 @@ msgid "" "%{comment} " msgstr "" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "" -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2693,10 +2695,9 @@ msgid "qualifier" msgstr "" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -2978,10 +2979,6 @@ msgstr "" msgid "Target type" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3257,38 +3254,6 @@ msgstr "" msgid "This block presents the main content of your pages." msgstr "" -#: app/models/environment.rb:- -msgid "environment" -msgstr "" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "" - -#: app/models/environment.rb:- -msgid "Terms of use acceptance text" -msgstr "" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "" @@ -3466,7 +3431,7 @@ msgstr "" msgid "Show a zoom link on all article images" msgstr "" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -3520,32 +3485,32 @@ msgstr "" msgid "Nickname" msgstr "" -#: app/models/profile.rb:- app/models/profile.rb:675 -msgid "Public profile" +#: app/models/profile.rb:- +msgid "Custom header" msgstr "" -#: app/models/profile.rb:- app/views/profile_editor/_person_form.rhtml:19 -msgid "Birth date" +#: app/models/profile.rb:- +msgid "Custom footer" msgstr "" #: app/models/profile.rb:- -msgid "Preferred domain" +msgid "Theme" msgstr "" -#: app/models/profile.rb:- -msgid "Visible" +#: app/models/profile.rb:- app/models/profile.rb:675 +msgid "Public profile" msgstr "" -#: app/models/profile.rb:- -msgid "Company name" +#: app/models/profile.rb:- app/views/profile_editor/_person_form.rhtml:19 +msgid "Birth date" msgstr "" #: app/models/profile.rb:- -msgid "Cnpj" +msgid "Preferred domain" msgstr "" -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" +#: app/models/profile.rb:- +msgid "Visible" msgstr "" #: app/models/profile.rb:36 @@ -3887,20 +3852,20 @@ msgstr "" msgid "Display name" msgstr "" -#: app/models/organization.rb:116 -msgid "Community's profile" +#: app/models/organization.rb:98 +msgid "Contact email" msgstr "" -#: app/models/organization.rb:117 -msgid "Invite Friends" +#: app/models/organization.rb:98 +msgid "Validated" msgstr "" -#: app/models/domain.rb:- -msgid "domain" +#: app/models/organization.rb:116 +msgid "Community's profile" msgstr "" -#: app/models/domain.rb:- -msgid "Google maps key" +#: app/models/organization.rb:117 +msgid "Invite Friends" msgstr "" #: app/models/domain.rb:13 diff --git a/po/es/noosfero.po b/po/es/noosfero.po index 4e9bfb0..eb520a6 100644 --- a/po/es/noosfero.po +++ b/po/es/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2010-04-30 20:14-0300\n" "Last-Translator: Martín Olivera \n" "Language-Team: LANGUAGE \n" @@ -103,30 +103,30 @@ msgid "Edit folder" msgstr "Editar carpeta" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "Artículos" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "Gente" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Productos" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -135,15 +135,15 @@ msgstr "Empresas" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "Comunidades" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1322,7 +1322,7 @@ msgstr "¿Esta seguro de querer visitar este sitio?" msgid "Change category" msgstr "Nueva categoría" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "Precio: " @@ -1382,43 +1382,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "" msgstr[1] "" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "Mostrar en la lista" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "Mostrar en el mapa" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "E-mail: " -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "Teléfono(s): " -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "Ubicación: " -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "Dirección: " -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "Productos/Servicios: " -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "Distancia: " -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "Proveedor: " -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "Categoría: " @@ -1585,29 +1585,29 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "El comentario fue eliminado correctamente" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 msgid "More recent people" msgstr "" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 msgid "More active people" msgstr "" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 #, fuzzy msgid "More recent communities" msgstr "Comunidades" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 #, fuzzy msgid "More active communities" msgstr "Comunidades" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 #, fuzzy msgid "More popular communities" msgstr "Comunidades" @@ -1644,11 +1644,11 @@ msgstr "" msgid "Unavailable!" msgstr "" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "Próximos eventos" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "Artículos más comentados" @@ -2099,11 +2099,11 @@ msgstr "Ninguno" msgid "box" msgstr "" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "Tipo de dueño" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "Dueño" @@ -2389,7 +2389,7 @@ msgstr "Caja" msgid "Type" msgstr "Tipo" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "Configuraciones" @@ -2403,8 +2403,7 @@ msgstr "Habilitado" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "Creado el" @@ -2413,8 +2412,7 @@ msgstr "Creado el" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "Actualizado el" @@ -2578,17 +2576,22 @@ msgstr "%{author} quiere publicar \"%{article}\" en %{community}" msgid "The article was removed." msgstr "%s fue borrado!" -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 #, fuzzy msgid "%{requestor} wants to publish the article: %{article}." msgstr "%{author} quiere publicar \"%{article}\" en %{community}" -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +#, fuzzy +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "%{author} quiere publicar \"%{article}\" en %{community}" + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "Debes ingresar en %{system} para aprobar o rechazar este artículo." -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2596,16 +2599,16 @@ msgid "" "%{comment} " msgstr "" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 #, fuzzy msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "%{author} quiere publicar \"%{article}\" en %{community}" -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2883,10 +2886,9 @@ msgid "qualifier" msgstr "" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -3197,10 +3199,6 @@ msgstr "Código" msgid "Target type" msgstr "Tipo de objetivo" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3495,41 +3493,6 @@ msgstr "[%s] tenes un nuevo comentario!" msgid "This block presents the main content of your pages." msgstr "Este bloque presenta el contenido principal de tus páginas" -# Entorno o ambiente? -#: app/models/environment.rb:- -#, fuzzy -msgid "environment" -msgstr "Entorno" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "Cabecera personalizada" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "Pie de página personalizado" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "Tema" - -#: app/models/environment.rb:- -#, fuzzy -msgid "Terms of use acceptance text" -msgstr "Términos aceptados" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "" @@ -3716,7 +3679,7 @@ msgstr "" msgid "Show a zoom link on all article images" msgstr "" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -3770,6 +3733,18 @@ msgstr "" msgid "Nickname" msgstr "Apodo" +#: app/models/profile.rb:- +msgid "Custom header" +msgstr "Cabecera personalizada" + +#: app/models/profile.rb:- +msgid "Custom footer" +msgstr "Pie de página personalizado" + +#: app/models/profile.rb:- +msgid "Theme" +msgstr "Tema" + #: app/models/profile.rb:- app/models/profile.rb:675 msgid "Public profile" msgstr "Perfil público" @@ -3786,18 +3761,6 @@ msgstr "" msgid "Visible" msgstr "" -#: app/models/profile.rb:- -msgid "Company name" -msgstr "" - -#: app/models/profile.rb:- -msgid "Cnpj" -msgstr "" - -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" -msgstr "" - #: app/models/profile.rb:36 msgid "Edit profile" msgstr "" @@ -4172,6 +4135,14 @@ msgstr "" msgid "Display name" msgstr "" +#: app/models/organization.rb:98 +msgid "Contact email" +msgstr "" + +#: app/models/organization.rb:98 +msgid "Validated" +msgstr "" + #: app/models/organization.rb:116 #, fuzzy msgid "Community's profile" @@ -4182,14 +4153,6 @@ msgstr "Comunidades" msgid "Invite Friends" msgstr "amigos" -#: app/models/domain.rb:- -msgid "domain" -msgstr "dominio" - -#: app/models/domain.rb:- -msgid "Google maps key" -msgstr "" - #: app/models/domain.rb:13 #, fuzzy msgid "" @@ -8971,6 +8934,18 @@ msgid "" "\">GNU Affero General Public License version 3 or any later version." msgstr "" +# Entorno o ambiente? +#, fuzzy +#~ msgid "environment" +#~ msgstr "Entorno" + +#, fuzzy +#~ msgid "Terms of use acceptance text" +#~ msgstr "Términos aceptados" + +#~ msgid "domain" +#~ msgstr "dominio" + #, fuzzy #~ msgid "All files were uploaded successfully" #~ msgstr "Características actualizadas correctamente." diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po index a67f68e..6774413 100644 --- a/po/fr/noosfero.po +++ b/po/fr/noosfero.po @@ -4,9 +4,9 @@ # , 2009. msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" +"Project-Id-Version: noosfero 0.31.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2009-12-04 18:46-0300\n" "Last-Translator: Jean-Claude Bulliard \n" "Language-Team: American English \n" @@ -102,30 +102,30 @@ msgid "Edit folder" msgstr "Éditer le dossier" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "Articles" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "Personnes" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Produits" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -134,15 +134,15 @@ msgstr "Entreprises" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "Groupes" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1319,7 +1319,7 @@ msgstr "Êtes-vous sûr(e) de vouloir visiter ce site web ?" msgid "Change category" msgstr "Nouvelle catégorie" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "Prix :" @@ -1380,43 +1380,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "" msgstr[1] "" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "Afficher en liste" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "Afficher en carte" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "Adresse e-mail :" -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "Téléphone(s) :" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "Localisation : " -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "Adresse :" -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "Produits/services : " -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "Distance :" -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "Fournisseur : " -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "Catégorie :" @@ -1580,31 +1580,31 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "Le commentaire a bien été effacé" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 #, fuzzy msgid "More recent people" msgstr "Les dernières personnes" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 #, fuzzy msgid "More active people" msgstr "Créer un rôle" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 #, fuzzy msgid "More recent communities" msgstr "groupes" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 #, fuzzy msgid "More active communities" msgstr "groupes" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 #, fuzzy msgid "More popular communities" msgstr "groupes" @@ -1641,11 +1641,11 @@ msgstr "Disponible !" msgid "Unavailable!" msgstr "Indisponible" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "Événements à venir" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "Articles les plus commentés" @@ -2101,11 +2101,11 @@ msgstr "Aucun(e)" msgid "box" msgstr "boîte" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "Type de propriétaire" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "Propriétaire" @@ -2402,7 +2402,7 @@ msgstr "Boîte" msgid "Type" msgstr "Type" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "Paramètres" @@ -2416,8 +2416,7 @@ msgstr "Activé" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "Créé le" @@ -2426,8 +2425,7 @@ msgstr "Créé le" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "Mis à jour le" @@ -2593,19 +2591,25 @@ msgstr "" msgid "The article was removed." msgstr "Le texte original a été retiré." -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 #, fuzzy msgid "%{requestor} wants to publish the article: %{article}." msgstr "" "%{author} veut publier l'article «%{article}» sur le groupe %{community}" -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +#, fuzzy +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "" +"%{author} veut publier l'article «%{article}» sur le groupe %{community}" + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" "Vous devez être connecté(e) sur %{system} pour pouvoir modérer cet article." -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2613,17 +2617,17 @@ msgid "" "%{comment} " msgstr "" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 #, fuzzy msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "" "%{author} veut publier l'article «%{article}» sur le groupe %{community}" -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2911,10 +2915,9 @@ msgid "qualifier" msgstr "" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -3230,10 +3233,6 @@ msgstr "Code" msgid "Target type" msgstr "Type de cible" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3540,39 +3539,6 @@ msgstr "[%s] vous avez un nouveau commentaire !" msgid "This block presents the main content of your pages." msgstr "Ce bloc présente le contenu principal de vos pages." -#: app/models/environment.rb:- -msgid "environment" -msgstr "environnement" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "Adresse électronique de contact" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "Est celle par défaut" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "Données d'identité visuelle" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "En-tête sur-mesure" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "Pied de page sur-mesure" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "Thème " - -#: app/models/environment.rb:- -#, fuzzy -msgid "Terms of use acceptance text" -msgstr "J'ai lu les conditions d'utilisation et les accepte" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "Voir le panneau de contrôle de l'environnement" @@ -3764,7 +3730,7 @@ msgstr "" msgid "Show a zoom link on all article images" msgstr "" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "Seule une CoVi peut être celle par défaut" @@ -3819,6 +3785,18 @@ msgstr "Précision geocode" msgid "Nickname" msgstr "Pseudo" +#: app/models/profile.rb:- +msgid "Custom header" +msgstr "En-tête sur-mesure" + +#: app/models/profile.rb:- +msgid "Custom footer" +msgstr "Pied de page sur-mesure" + +#: app/models/profile.rb:- +msgid "Theme" +msgstr "Thème " + #: app/models/profile.rb:- app/models/profile.rb:675 msgid "Public profile" msgstr "Profil public" @@ -3835,19 +3813,6 @@ msgstr "Domaine préféré" msgid "Visible" msgstr "" -#: app/models/profile.rb:- -#, fuzzy -msgid "Company name" -msgstr "Afficher le nom" - -#: app/models/profile.rb:- -msgid "Cnpj" -msgstr "" - -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" -msgstr "Validé(e)" - #: app/models/profile.rb:36 msgid "Edit profile" msgstr "Éditer le profil" @@ -4231,6 +4196,14 @@ msgstr "Restrictions" msgid "Display name" msgstr "Afficher le nom" +#: app/models/organization.rb:98 +msgid "Contact email" +msgstr "Adresse électronique de contact" + +#: app/models/organization.rb:98 +msgid "Validated" +msgstr "Validé(e)" + #: app/models/organization.rb:116 #, fuzzy msgid "Community's profile" @@ -4241,14 +4214,6 @@ msgstr "Templates de groupe" msgid "Invite Friends" msgstr "Inviter mes contacts !" -#: app/models/domain.rb:- -msgid "domain" -msgstr "domaine" - -#: app/models/domain.rb:- -msgid "Google maps key" -msgstr "" - #: app/models/domain.rb:13 #, fuzzy msgid "" @@ -9287,6 +9252,26 @@ msgid "" "\">GNU Affero General Public License version 3 or any later version." msgstr "" +#~ msgid "environment" +#~ msgstr "environnement" + +#~ msgid "Is default" +#~ msgstr "Est celle par défaut" + +#~ msgid "Design data" +#~ msgstr "Données d'identité visuelle" + +#, fuzzy +#~ msgid "Terms of use acceptance text" +#~ msgstr "J'ai lu les conditions d'utilisation et les accepte" + +#, fuzzy +#~ msgid "Company name" +#~ msgstr "Afficher le nom" + +#~ msgid "domain" +#~ msgstr "domaine" + #, fuzzy #~ msgid "Could not upload all files" #~ msgstr "Impossible de téléverser l'image" diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po index a1f1890..7cdafb6 100644 --- a/po/hy/noosfero.po +++ b/po/hy/noosfero.po @@ -5,8 +5,8 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2009-10-26 16:20-0300\n" "Last-Translator: Anahit Minassian \n" "Language-Team: LANGUAGE \n" @@ -101,30 +101,30 @@ msgid "Edit folder" msgstr "" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "Հոդվածներ" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "Մարդիկ" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Արտադրանք" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -133,15 +133,15 @@ msgstr "Ձեռնարկություններ" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "Համայնքներ" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1311,7 +1311,7 @@ msgstr "Ցանկանո՞ւմ եք արդյոք այս կայքն այցելել: msgid "Change category" msgstr "Նոր կատեգորիա" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "Գին" @@ -1372,43 +1372,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "" msgstr[1] "" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "Ցուցադրել ցուցակի մեջ" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "Ցուցադրել քարտեզի վրա" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "էլ.հասցե" -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "Հեռախոս(ներ)" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "Վայր" -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "Հասցե" -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "Արտադրանք/Ծառայություններ" -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "Հեռավորություն" -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "Մատակարար" -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "Կատեգորիա" @@ -1566,31 +1566,31 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "Մեկնաբանությունը հաջողությամբ հեռացված է:" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 #, fuzzy msgid "More recent people" msgstr "Ավելի նոր մարդիկ" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 #, fuzzy msgid "More active people" msgstr "Դեր ստեղծել" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 #, fuzzy msgid "More recent communities" msgstr "Համայնքներ" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 #, fuzzy msgid "More active communities" msgstr "Համայնքներ" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 #, fuzzy msgid "More popular communities" msgstr "Համայնքներ" @@ -1627,11 +1627,11 @@ msgstr "" msgid "Unavailable!" msgstr "" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "Գալիք իրադարձություններ" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "Ամենից հաճախ մեկնաբանվող հոդվածները" @@ -2079,11 +2079,11 @@ msgstr "Չկա" msgid "box" msgstr "պատուհան" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "Սեփականատիրոջ տեսակ" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "Սեփականատեր" @@ -2371,7 +2371,7 @@ msgstr "Պատուհան" msgid "Type" msgstr "Տեսակ" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "Պարամետրեր" @@ -2385,8 +2385,7 @@ msgstr "Ակտիվացված է" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "Ստեղծված է" @@ -2395,8 +2394,7 @@ msgstr "Ստեղծված է" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "Թարմացվել է" @@ -2557,16 +2555,21 @@ msgstr "" msgid "The article was removed." msgstr "Այս անհատական էջը" -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 msgid "%{requestor} wants to publish the article: %{article}." msgstr "" -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +#, fuzzy +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "%s ցանկանում է Ձեր ընկերը դառնալ" + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2574,15 +2577,15 @@ msgid "" "%{comment} " msgstr "" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "" -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2863,10 +2866,9 @@ msgid "qualifier" msgstr "" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -3169,10 +3171,6 @@ msgstr "Կոդ" msgid "Target type" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3466,39 +3464,6 @@ msgstr "" msgid "This block presents the main content of your pages." msgstr "" -#: app/models/environment.rb:- -msgid "environment" -msgstr "համակարգ" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "էլ. հասցե" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "Նախնական արժեքն է" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "Արտաքին տեսքի տվյալներ" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "" - -#: app/models/environment.rb:- -#, fuzzy -msgid "Terms of use acceptance text" -msgstr "Պայմանները ընդունված են" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "Տեսնել համակարգի ադմինիստրատիվ վահանակը" @@ -3686,7 +3651,7 @@ msgstr "" msgid "Show a zoom link on all article images" msgstr "" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "" "Որպես նախնական համայնք, դուք կարող եք ընտրել միայն մեկ վիրտուալ համայնք" @@ -3742,6 +3707,18 @@ msgstr "Գեոկոդի ճշգրտություն" msgid "Nickname" msgstr "Կեղծանուն" +#: app/models/profile.rb:- +msgid "Custom header" +msgstr "" + +#: app/models/profile.rb:- +msgid "Custom footer" +msgstr "" + +#: app/models/profile.rb:- +msgid "Theme" +msgstr "" + #: app/models/profile.rb:- app/models/profile.rb:675 msgid "Public profile" msgstr "" @@ -3758,19 +3735,6 @@ msgstr "" msgid "Visible" msgstr "" -#: app/models/profile.rb:- -#, fuzzy -msgid "Company name" -msgstr "Ցուցադրել անունը" - -#: app/models/profile.rb:- -msgid "Cnpj" -msgstr "" - -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" -msgstr "Վավերացված է" - #: app/models/profile.rb:36 msgid "Edit profile" msgstr "Փոփոխել անհատական էջը" @@ -4146,6 +4110,14 @@ msgstr "Սահմանափակումներ" msgid "Display name" msgstr "Ցուցադրել անունը" +#: app/models/organization.rb:98 +msgid "Contact email" +msgstr "էլ. հասցե" + +#: app/models/organization.rb:98 +msgid "Validated" +msgstr "Վավերացված է" + #: app/models/organization.rb:116 #, fuzzy msgid "Community's profile" @@ -4156,14 +4128,6 @@ msgstr "Համայնքներ" msgid "Invite Friends" msgstr "Կառավարել ընկերներին" -#: app/models/domain.rb:- -msgid "domain" -msgstr "տիրույթ" - -#: app/models/domain.rb:- -msgid "Google maps key" -msgstr "" - #: app/models/domain.rb:13 #, fuzzy msgid "" @@ -9017,6 +8981,26 @@ msgid "" "\">GNU Affero General Public License version 3 or any later version." msgstr "" +#~ msgid "environment" +#~ msgstr "համակարգ" + +#~ msgid "Is default" +#~ msgstr "Նախնական արժեքն է" + +#~ msgid "Design data" +#~ msgstr "Արտաքին տեսքի տվյալներ" + +#, fuzzy +#~ msgid "Terms of use acceptance text" +#~ msgstr "Պայմանները ընդունված են" + +#, fuzzy +#~ msgid "Company name" +#~ msgstr "Ցուցադրել անունը" + +#~ msgid "domain" +#~ msgstr "տիրույթ" + #, fuzzy #~ msgid "All files were uploaded successfully" #~ msgstr "Առանձնահատկությունները հաջողությամբ թարմացված են:" diff --git a/po/noosfero.pot b/po/noosfero.pot index 938d77e..10d4dd1 100644 --- a/po/noosfero.pot +++ b/po/noosfero.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -102,30 +102,30 @@ msgid "Edit folder" msgstr "" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -134,15 +134,15 @@ msgstr "" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1263,7 +1263,7 @@ msgstr "" msgid "Change category" msgstr "" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "" @@ -1317,43 +1317,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "" msgstr[1] "" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "" -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "" -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "" -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "" -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "" -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "" -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "" @@ -1505,27 +1505,27 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 msgid "More recent people" msgstr "" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 msgid "More active people" msgstr "" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 msgid "More recent communities" msgstr "" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 msgid "More active communities" msgstr "" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 msgid "More popular communities" msgstr "" @@ -1561,11 +1561,11 @@ msgstr "" msgid "Unavailable!" msgstr "" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "" @@ -1972,11 +1972,11 @@ msgstr "" msgid "box" msgstr "" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "" @@ -2232,7 +2232,7 @@ msgstr "" msgid "Type" msgstr "" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "" @@ -2246,8 +2246,7 @@ msgstr "" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "" @@ -2256,8 +2255,7 @@ msgstr "" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "" @@ -2402,16 +2400,20 @@ msgstr "" msgid "The article was removed." msgstr "" -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 msgid "%{requestor} wants to publish the article: %{article}." msgstr "" -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "" + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2419,15 +2421,15 @@ msgid "" "%{comment} " msgstr "" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "" -#: app/models/approve_article.rb:115 +#: app/models/approve_article.rb:119 msgid "Your request for publishing the article \"{article}\" was rejected." msgstr "" -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" @@ -2697,10 +2699,9 @@ msgid "qualifier" msgstr "" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -2982,10 +2983,6 @@ msgstr "" msgid "Target type" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3261,38 +3258,6 @@ msgstr "" msgid "This block presents the main content of your pages." msgstr "" -#: app/models/environment.rb:- -msgid "environment" -msgstr "" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "" - -#: app/models/environment.rb:- -msgid "Terms of use acceptance text" -msgstr "" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "" @@ -3470,7 +3435,7 @@ msgstr "" msgid "Show a zoom link on all article images" msgstr "" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "" @@ -3524,32 +3489,32 @@ msgstr "" msgid "Nickname" msgstr "" -#: app/models/profile.rb:- app/models/profile.rb:675 -msgid "Public profile" +#: app/models/profile.rb:- +msgid "Custom header" msgstr "" -#: app/models/profile.rb:- app/views/profile_editor/_person_form.rhtml:19 -msgid "Birth date" +#: app/models/profile.rb:- +msgid "Custom footer" msgstr "" #: app/models/profile.rb:- -msgid "Preferred domain" +msgid "Theme" msgstr "" -#: app/models/profile.rb:- -msgid "Visible" +#: app/models/profile.rb:- app/models/profile.rb:675 +msgid "Public profile" msgstr "" -#: app/models/profile.rb:- -msgid "Company name" +#: app/models/profile.rb:- app/views/profile_editor/_person_form.rhtml:19 +msgid "Birth date" msgstr "" #: app/models/profile.rb:- -msgid "Cnpj" +msgid "Preferred domain" msgstr "" -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" +#: app/models/profile.rb:- +msgid "Visible" msgstr "" #: app/models/profile.rb:36 @@ -3891,20 +3856,20 @@ msgstr "" msgid "Display name" msgstr "" -#: app/models/organization.rb:116 -msgid "Community's profile" +#: app/models/organization.rb:98 +msgid "Contact email" msgstr "" -#: app/models/organization.rb:117 -msgid "Invite Friends" +#: app/models/organization.rb:98 +msgid "Validated" msgstr "" -#: app/models/domain.rb:- -msgid "domain" +#: app/models/organization.rb:116 +msgid "Community's profile" msgstr "" -#: app/models/domain.rb:- -msgid "Google maps key" +#: app/models/organization.rb:117 +msgid "Invite Friends" msgstr "" #: app/models/domain.rb:13 diff --git a/po/pt/noosfero.po b/po/pt/noosfero.po index 599690b..ce9a36d 100644 --- a/po/pt/noosfero.po +++ b/po/pt/noosfero.po @@ -9,11 +9,12 @@ # Joenio Costa , 2008. # # +#, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.31.4\n" -"POT-Creation-Date: 2011-08-16 15:44-0300\n" -"PO-Revision-Date: 2011-08-16 16:07-0300\n" +"Project-Id-Version: noosfero 0.31.5\n" +"POT-Creation-Date: 2011-08-22 16:07-0300\n" +"PO-Revision-Date: 2011-08-22 17:27-0300\n" "Last-Translator: Joenio Costa \n" "Language-Team: LANGUAGE TEAM \n" "MIME-Version: 1.0\n" @@ -107,30 +108,30 @@ msgid "Edit folder" msgstr "Editar pasta" #: app/helpers/assets_helper.rb:7 -#: app/controllers/public/search_controller.rb:131 -#: app/controllers/public/search_controller.rb:203 +#: app/controllers/public/search_controller.rb:130 +#: app/controllers/public/search_controller.rb:199 #: app/views/search/articles.rhtml:1 msgid "Articles" msgstr "Artigos" #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092 -#: app/controllers/public/search_controller.rb:133 -#: app/controllers/public/search_controller.rb:197 +#: app/controllers/public/search_controller.rb:132 +#: app/controllers/public/search_controller.rb:193 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1 msgid "People" msgstr "Pessoas" #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530 -#: app/controllers/public/search_controller.rb:135 -#: app/controllers/public/search_controller.rb:199 +#: app/controllers/public/search_controller.rb:134 +#: app/controllers/public/search_controller.rb:195 #: app/models/enterprise.rb:130 app/models/products_block.rb:8 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8 msgid "Products" msgstr "Produtos" #: app/helpers/assets_helper.rb:10 -#: app/controllers/public/search_controller.rb:132 -#: app/controllers/public/search_controller.rb:198 +#: app/controllers/public/search_controller.rb:131 +#: app/controllers/public/search_controller.rb:194 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7 #: app/views/search/enterprises.rhtml:5 #: app/views/profile/_person_profile.rhtml:38 @@ -139,15 +140,15 @@ msgstr "Empreendimentos" #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515 #: app/helpers/application_helper.rb:1107 -#: app/controllers/public/search_controller.rb:134 -#: app/controllers/public/search_controller.rb:201 +#: app/controllers/public/search_controller.rb:133 +#: app/controllers/public/search_controller.rb:197 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1 #: app/views/profile/_person_profile.rhtml:56 msgid "Communities" msgstr "Comunidades" #: app/helpers/assets_helper.rb:12 -#: app/controllers/public/search_controller.rb:136 +#: app/controllers/public/search_controller.rb:135 #: public/designs/themes/base/navigation.rhtml:7 #: public/designs/themes/noosfero/navigation.rhtml:7 msgid "Events" @@ -1271,7 +1272,7 @@ msgstr "Tem certeza que quer visitar este web site?" msgid "Change category" msgstr "Alterar categoria" -#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77 +#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86 msgid "Price: " msgstr "Preço:" @@ -1325,43 +1326,43 @@ msgid_plural "%{num} %{plural_unit}" msgstr[0] "1 %{singular_unit}" msgstr[1] "%{num} %{plural_unit}" -#: app/helpers/search_helper.rb:22 +#: app/helpers/search_helper.rb:31 msgid "Display in list" msgstr "Mostrar como lista" -#: app/helpers/search_helper.rb:28 +#: app/helpers/search_helper.rb:37 msgid "Display in map" msgstr "Mostrar no mapa" -#: app/helpers/search_helper.rb:47 +#: app/helpers/search_helper.rb:56 msgid "E-Mail: " msgstr "e-Mail: " -#: app/helpers/search_helper.rb:50 +#: app/helpers/search_helper.rb:59 msgid "Phone(s): " msgstr "Telefone(s):" -#: app/helpers/search_helper.rb:53 +#: app/helpers/search_helper.rb:62 msgid "Location: " msgstr "Localização: " -#: app/helpers/search_helper.rb:56 +#: app/helpers/search_helper.rb:65 msgid "Address: " msgstr "Endereço: " -#: app/helpers/search_helper.rb:59 +#: app/helpers/search_helper.rb:68 msgid "Products/Services: " msgstr "Produtos/Serviços: " -#: app/helpers/search_helper.rb:62 +#: app/helpers/search_helper.rb:71 msgid "Distance: " msgstr "Distância (km): " -#: app/helpers/search_helper.rb:80 +#: app/helpers/search_helper.rb:89 msgid "Provider: " msgstr "Fornecedor: " -#: app/helpers/search_helper.rb:83 +#: app/helpers/search_helper.rb:92 msgid "Category: " msgstr "Categoria: " @@ -1519,27 +1520,27 @@ msgstr "" msgid "Comment succesfully deleted" msgstr "Comentário removido com sucesso" -#: app/controllers/public/browse_controller.rb:53 +#: app/controllers/public/browse_controller.rb:51 msgid "More recent people" msgstr "Pessoas mais recentes" -#: app/controllers/public/browse_controller.rb:54 +#: app/controllers/public/browse_controller.rb:52 msgid "More active people" msgstr "Pessoas mais ativas" -#: app/controllers/public/browse_controller.rb:55 +#: app/controllers/public/browse_controller.rb:53 msgid "More popular people" msgstr "Pessoas mais populares" -#: app/controllers/public/browse_controller.rb:56 +#: app/controllers/public/browse_controller.rb:54 msgid "More recent communities" msgstr "Comunidades mais recentes" -#: app/controllers/public/browse_controller.rb:57 +#: app/controllers/public/browse_controller.rb:55 msgid "More active communities" msgstr "Comunidades mais ativas" -#: app/controllers/public/browse_controller.rb:58 +#: app/controllers/public/browse_controller.rb:56 msgid "More popular communities" msgstr "Comunidades mais populares" @@ -1575,11 +1576,11 @@ msgstr "Disponível!" msgid "Unavailable!" msgstr "Não disponível!" -#: app/controllers/public/search_controller.rb:200 +#: app/controllers/public/search_controller.rb:196 msgid "Upcoming events" msgstr "Próximos eventos" -#: app/controllers/public/search_controller.rb:202 +#: app/controllers/public/search_controller.rb:198 msgid "Most commented articles" msgstr "Artigos mais comentados" @@ -1756,9 +1757,8 @@ msgstr "" "notificados." #: app/controllers/my_profile/cms_controller.rb:364 -#, fuzzy msgid "%s could not be uploaded" -msgstr "Endereço não pôde ser salvo" +msgstr "%s não pode ser enviado" #: app/controllers/my_profile/mailconf_controller.rb:23 msgid "" @@ -1938,11 +1938,11 @@ msgstr "Blog" #: app/models/raw_html_article.rb:4 msgid "Raw HTML text article." -msgstr "" +msgstr "Artigo de texto com HTML puro" #: app/models/raw_html_article.rb:8 msgid "Allows HTML without filter (only for admins)" -msgstr "" +msgstr "Permite HTML sem filtros (somente para administradores)" #: app/models/members_block.rb:8 msgid "{#} members" @@ -2000,11 +2000,11 @@ msgstr "Nenhum(a)" msgid "box" msgstr "caixa" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner type" msgstr "Tipo de dono" -#: app/models/box.rb:- app/models/domain.rb:- +#: app/models/box.rb:- msgid "Owner" msgstr "Dono" @@ -2281,7 +2281,7 @@ msgstr "Caixa" msgid "Type" msgstr "Tipo" -#: app/models/block.rb:- app/models/environment.rb:- +#: app/models/block.rb:- msgid "Settings" msgstr "Configurações" @@ -2295,8 +2295,7 @@ msgstr "Habilitado" #: app/models/task.rb:- app/models/product_qualifier.rb:- #: app/models/certifier.rb:- app/models/external_feed.rb:- #: app/models/mailing_sent.rb:- app/models/comment.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Created at" msgstr "Criado em" @@ -2305,8 +2304,7 @@ msgstr "Criado em" #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:- #: app/models/product_qualifier.rb:- app/models/certifier.rb:- #: app/models/external_feed.rb:- app/models/mailing_sent.rb:- -#: app/models/environment.rb:- app/models/profile.rb:- -#: app/models/product_categorization.rb:- +#: app/models/profile.rb:- app/models/product_categorization.rb:- msgid "Updated at" msgstr "Atualizado em" @@ -2451,17 +2449,21 @@ msgstr "%{requestor} quer publicar o artigo: %{linked_subject}." msgid "The article was removed." msgstr "O artigo foi removido." -#: app/models/approve_article.rb:97 +#: app/models/approve_article.rb:98 msgid "%{requestor} wants to publish the article: %{article}." msgstr "%{requestor} quer publicar o artigo: %{article}." -#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63 +#: app/models/approve_article.rb:100 +msgid "%{requestor} wanted to publish an article but it was removed." +msgstr "%{requestor} queria publicar um artigo mas ele foi removido." + +#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63 msgid "" "You need to login on %{system} in order to approve or reject this article." msgstr "" "Você precisa entrar no %{system} para poder aprovar ou rejeitar este artigo." -#: app/models/approve_article.rb:108 +#: app/models/approve_article.rb:112 msgid "" "Your request for publishing the article \"%{article}\" was approved. Here is " "the comment left by the admin who approved your article:\n" @@ -2472,22 +2474,25 @@ msgstr "" "comentário enviado pelo administrador que aprovou seu artigo:\n" "\n" -#: app/models/approve_article.rb:110 +#: app/models/approve_article.rb:114 msgid "Your request for publishing the article \"%{article}\" was approved." msgstr "Seu pedido de publicação do artigo \"%{article}\" foi aprovado." -#: app/models/approve_article.rb:115 -#, fuzzy +#: app/models/approve_article.rb:119 msgid "Your request for publishing the article \"{article}\" was rejected." -msgstr "Seu pedido de publicação do artigo \"%{article}\" foi aprovado." +msgstr "Seu pedido de publicação do artigo \"%{article}\" foi rejeitado." -#: app/models/approve_article.rb:117 +#: app/models/approve_article.rb:121 msgid "" "Here is the reject explanation left by the administrator who rejected your " "article: \n" "\n" "%{reject_explanation}" msgstr "" +"Segue a explicação de rejeição deixada pelo administrador que rejeitou seu " +"artigo: \n" +"\n" +"%{reject_explanation}" #: app/models/raw_html_block.rb:4 msgid "Raw HTML" @@ -2751,10 +2756,9 @@ msgid "qualifier" msgstr "qualificador" #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:- -#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:- -#: app/models/create_enterprise.rb:4 app/models/domain.rb:- -#: app/models/contact.rb:- app/models/contact.rb:14 -#: app/views/cms/view.rhtml:24 +#: app/models/comment.rb:- app/models/profile.rb:- +#: app/models/create_enterprise.rb:4 app/models/contact.rb:- +#: app/models/contact.rb:14 app/views/cms/view.rhtml:24 #: app/views/enterprise_registration/select_validator.rhtml:12 #: app/views/contact/sender/mail.rhtml:11 #: app/views/content_viewer/_comment_form.rhtml:30 @@ -2891,10 +2895,9 @@ msgstr "Novo amigo" #: app/models/fans_block.rb:4 msgid "Displays the people who like the enterprise" -msgstr "" +msgstr "Exibe as pessoas que gostam do empreendimento" #: app/models/fans_block.rb:8 -#, fuzzy msgid "{#} fan" msgid_plural "{#} fans" msgstr[0] "{#} fã" @@ -3046,10 +3049,6 @@ msgstr "Código" msgid "Target type" msgstr "Tipo do alvo" -#: app/models/task.rb:- app/models/profile.rb:- -msgid "Bsc" -msgstr "" - #: app/models/task.rb:27 app/models/profile.rb:- #: app/views/features/_manage_community_fields.rhtml:8 #: app/views/features/_manage_person_fields.rhtml:8 @@ -3332,38 +3331,6 @@ msgstr "[%s] você recebeu um novo comentário!" msgid "This block presents the main content of your pages." msgstr "Este bloco apresenta o conteúdo principal das suas páginas." -#: app/models/environment.rb:- -msgid "environment" -msgstr "comunidade virtual" - -#: app/models/environment.rb:- app/models/organization.rb:98 -msgid "Contact email" -msgstr "Email de contato" - -#: app/models/environment.rb:- app/models/domain.rb:- -msgid "Is default" -msgstr "É padrão" - -#: app/models/environment.rb:- -msgid "Design data" -msgstr "Informações de design" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom header" -msgstr "Cabeçalho personalizado" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Custom footer" -msgstr "Rodapé personalizado" - -#: app/models/environment.rb:- app/models/profile.rb:- -msgid "Theme" -msgstr "Tema" - -#: app/models/environment.rb:- -msgid "Terms of use acceptance text" -msgstr "Texto para aceite dos termos de uso" - #: app/models/environment.rb:20 msgid "View environment admin panel" msgstr "Ver painel de administração de ambiente" @@ -3542,7 +3509,7 @@ msgstr "Bate-papo baseado em XMPP/Jabber" msgid "Show a zoom link on all article images" msgstr "Mostrar um link para ampliar em todas as imagens de artigos" -#: app/models/environment.rb:502 +#: app/models/environment.rb:514 msgid "Only one Virtual Community can be the default one" msgstr "Apenas uma comunidade virtual pode ser a padrão" @@ -3596,6 +3563,18 @@ msgstr "Precisão do georeferenciamento" msgid "Nickname" msgstr "Apelido" +#: app/models/profile.rb:- +msgid "Custom header" +msgstr "Cabeçalho personalizado" + +#: app/models/profile.rb:- +msgid "Custom footer" +msgstr "Rodapé personalizado" + +#: app/models/profile.rb:- +msgid "Theme" +msgstr "Tema" + #: app/models/profile.rb:- app/models/profile.rb:675 msgid "Public profile" msgstr "Perfil público" @@ -3612,19 +3591,6 @@ msgstr "Domínio preferido" msgid "Visible" msgstr "Visível" -#: app/models/profile.rb:- -#, fuzzy -msgid "Company name" -msgstr "Nome de exibição" - -#: app/models/profile.rb:- -msgid "Cnpj" -msgstr "" - -#: app/models/profile.rb:- app/models/organization.rb:98 -msgid "Validated" -msgstr "Validado" - #: app/models/profile.rb:36 msgid "Edit profile" msgstr "Editar perfil" @@ -3985,6 +3951,14 @@ msgstr "Limitações" msgid "Display name" msgstr "Nome de exibição" +#: app/models/organization.rb:98 +msgid "Contact email" +msgstr "Email de contato" + +#: app/models/organization.rb:98 +msgid "Validated" +msgstr "Validado" + #: app/models/organization.rb:116 msgid "Community's profile" msgstr "Perfil da comunidade" @@ -3993,14 +3967,6 @@ msgstr "Perfil da comunidade" msgid "Invite Friends" msgstr "Convidar Amigos" -#: app/models/domain.rb:- -msgid "domain" -msgstr "domínio" - -#: app/models/domain.rb:- -msgid "Google maps key" -msgstr "Chave do Google maps" - #: app/models/domain.rb:13 msgid "" "%{fn} must be composed only of lowercase latters (a to z), numbers (0 to 9), " @@ -4566,74 +4532,68 @@ msgstr[1] "%{num} validadores." #: app/views/cms/_textile_quick_reference.rhtml:3 msgid "Textile markup quick reference" -msgstr "" +msgstr "Referência rápida de marcação textile" #: app/views/cms/_textile_quick_reference.rhtml:4 -#, fuzzy msgid "(show)" -msgstr "Mostrar" +msgstr "(mostrar)" #: app/views/cms/_textile_quick_reference.rhtml:5 -#, fuzzy msgid "(hide)" -msgstr "Esconder" +msgstr "(esconder)" #: app/views/cms/_textile_quick_reference.rhtml:8 -#, fuzzy msgid "Simple formatting:" -msgstr "Informações do perfil" +msgstr "Formatação simples:" #: app/views/cms/_textile_quick_reference.rhtml:8 msgid "italics" -msgstr "" +msgstr "itálico" #: app/views/cms/_textile_quick_reference.rhtml:8 -#, fuzzy msgid "bold" -msgstr "Mundo" +msgstr "negrito" #: app/views/cms/_textile_quick_reference.rhtml:8 msgid "striked" -msgstr "" +msgstr "riscado" #: app/views/cms/_textile_quick_reference.rhtml:9 -#, fuzzy msgid "Links:" -msgstr "Links" +msgstr "Links:" #: app/views/cms/_textile_quick_reference.rhtml:10 -#, fuzzy msgid "Images:" -msgstr "Imagem:" +msgstr "Imagens:" #: app/views/cms/_textile_quick_reference.rhtml:11 msgid "Bullet lists:" -msgstr "" +msgstr "Listas de marcadores:" #: app/views/cms/_textile_quick_reference.rhtml:12 #: app/views/cms/_textile_quick_reference.rhtml:15 -#, fuzzy msgid "first item" -msgstr "Data de nascimento" +msgstr "primeiro item" #: app/views/cms/_textile_quick_reference.rhtml:13 #: app/views/cms/_textile_quick_reference.rhtml:16 -#, fuzzy msgid "second item" -msgstr "um item" +msgstr "segundo item" #: app/views/cms/_textile_quick_reference.rhtml:14 msgid "Numbered lists:" -msgstr "" +msgstr "Listas numeradas:" #: app/views/cms/_textile_quick_reference.rhtml:17 msgid "" "For code, use HTML tags 
 and , and indent the code inside them:"
 msgstr ""
+"Para código, utilize as tags HTML 
 e , e faça identação "
+"do código entre as tags:"
 
 #: app/views/cms/_textile_quick_reference.rhtml:25
 msgid "See also a more complete Textile Reference."
-msgstr ""
+msgstr "Veja também uma Referência Textile mais completa."
 
 #: app/views/cms/_enterprise_homepage.rhtml:3
 msgid "Text"
@@ -4700,11 +4660,11 @@ msgstr "Usar como página inicial"
 
 #: app/views/cms/_drag_and_drop_note.rhtml:2
 msgid "Drag images to add them to the text."
-msgstr ""
+msgstr "Arraste as imagens para adicioná-las ao texto."
 
 #: app/views/cms/_drag_and_drop_note.rhtml:3
 msgid "Drag item names to the text to add links."
-msgstr ""
+msgstr "Arraste os nomes dos itens para o texto para adicionar links."
 
 #: app/views/cms/destroy.rhtml:1
 msgid "Delete: %s"
@@ -4952,17 +4912,15 @@ msgstr "Voltar"
 
 #: app/views/cms/_text_editor_sidebar.rhtml:4
 msgid "Media upload"
-msgstr ""
+msgstr "Upload de mídia"
 
 #: app/views/cms/_text_editor_sidebar.rhtml:23
-#, fuzzy
 msgid "Upload more files ..."
-msgstr "Enviar arquivos"
+msgstr "Enviar mais arquivos ..."
 
 #: app/views/cms/_text_editor_sidebar.rhtml:27
-#, fuzzy
 msgid "Media search"
-msgstr "Busca no perfil"
+msgstr "Busca de mídia"
 
 #: app/views/cms/edit.rhtml:17
 #: app/views/tasks/_suggest_article_accept_details.rhtml:10
@@ -5702,12 +5660,11 @@ msgstr "Quero receber uma cópia da mensagem no meu e-mail."
 
 #: app/views/contact/sender/mail.rhtml:7
 msgid "This message was sent by %{sender} to %{target} on %{environment}."
-msgstr ""
+msgstr "Esta mensagem foi enviada por %{sender} para %{target} no %{environment}."
 
 #: app/views/contact/sender/mail.rhtml:9
-#, fuzzy
 msgid "Information about the user who sent this message:"
-msgstr "Informações sobre o evento:"
+msgstr "Informações sobre o usuário que enviou esta mensagem:"
 
 #: app/views/contact/sender/mail.rhtml:18
 msgid "Message:"
@@ -8342,98 +8299,85 @@ msgid "Total:"
 msgstr "Total:"
 
 #: plugins/send_email/controllers/send_email_plugin_admin_controller.rb:8
-#, fuzzy
 msgid "Configurations was saved"
-msgstr "Configuração"
+msgstr "As configurações foram salvas"
 
 #: plugins/send_email/controllers/send_email_plugin_admin_controller.rb:11
-#, fuzzy
 msgid "Configurations could not be saved"
-msgstr "As informações do perfil não puderam ser carregadas"
+msgstr "As configurações não puderam ser salvas"
 
 #: plugins/send_email/controllers/send_email_plugin_base_controller.rb:16
 #: plugins/send_email/views/send_email_plugin_base/success.rhtml:1
-#, fuzzy
 msgid "Message sent"
-msgstr "Mensagem"
+msgstr "A mensagem foi enviada"
 
 #: plugins/send_email/lib/send_email_plugin.rb:8
 msgid "A plugin that allows sending e-mails via HTML forms."
-msgstr ""
+msgstr "Um plugin que permite envio de e-mails via formulários HTML."
 
 #: plugins/send_email/lib/send_email_plugin/mail.rb:3
-#, fuzzy
 msgid "To"
-msgstr "Para: "
+msgstr "Para"
 
 #: plugins/send_email/lib/send_email_plugin/mail.rb:3
-#, fuzzy
 msgid "From"
-msgstr "Fórum"
+msgstr "De"
 
 #: plugins/send_email/lib/send_email_plugin/mail.rb:7
-#, fuzzy
 msgid "New mail"
-msgstr "email"
+msgstr "Novo email"
 
 #: plugins/send_email/lib/send_email_plugin/mail.rb:19
-#, fuzzy
 msgid "%{fn} '%s' isn't a valid e-mail address"
-msgstr "Por favor entre um endereço de e-mail válido."
+msgstr "%{fn} '%s' não é um endereço de e-mail válido."
 
 #: plugins/send_email/lib/send_email_plugin/mail.rb:26
 msgid "%{fn} '%s' address is not allowed (see SendEmailPlugin config)"
-msgstr ""
+msgstr "%{fn} '%s' endereço não permitido (veja as configurações do SendEmailPlugin)"
 
 #: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb:15
-#, fuzzy
 msgid "Project successfully registered"
-msgstr "Produto criado com sucesso"
+msgstr "O projeto foi registrado com sucesso"
 
 #: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb:29
-#, fuzzy
 msgid "Project successfully updated"
-msgstr "Produto atualizado com sucesso"
+msgstr "O projeto foi atualizado com sucesso"
 
 #: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb:47
-#, fuzzy
 msgid "Project successfully removed."
-msgstr "Produto removido com sucesso"
+msgstr "O projeto foi removido com sucesso"
 
 #: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb:49
-#, fuzzy
 msgid "Project was not successfully removed."
-msgstr "Produto removido com sucesso"
+msgstr "O projeto não foi removido com sucesso"
 
 #: plugins/mezuro/lib/mezuro_plugin.rb:8
 msgid "A metric analizer plugin."
-msgstr ""
+msgstr "Um plugin de análise de métricas"
 
 #: plugins/template/lib/template_plugin.rb:10
 msgid "A plugin that does this and that."
-msgstr ""
+msgstr "Um plugin que faz isto e aquilo."
 
 #: plugins/send_email/views/send_email_plugin_base/fail.rhtml:1
-#, fuzzy
 msgid "The message could not be sent"
-msgstr "Endereço não pôde ser salvo"
+msgstr "A mensagem não pode ser enviada"
 
 #: plugins/send_email/views/send_email_plugin_admin/index.rhtml:1
 msgid "SendEmailPlugin's config"
-msgstr ""
+msgstr "Configurações do SendEmailPlugin"
 
 #: plugins/send_email/views/send_email_plugin_admin/index.rhtml:4
 msgid "E-Mail addresses you want to allow to send"
-msgstr ""
+msgstr "Endereços de e-mail que você deseja liberar para envio"
 
 #: plugins/send_email/views/send_email_plugin_admin/index.rhtml:5
 msgid "(list of email addresses separated by comma)"
-msgstr ""
+msgstr "(lista de endereços de e-mail separadas por vírgula)"
 
 #: plugins/send_email/views/send_email_plugin/sender/mail.rhtml:1
-#, fuzzy
 msgid "Contact from %s"
-msgstr "Contactar %s"
+msgstr "Contato de %s"
 
 #: plugins/shopping_cart/views/cart.html.erb:2
 msgid "Are you sure you want to remove this item?"
@@ -8553,88 +8497,81 @@ msgstr ""
 "Se houver algum problema com esse email contacte o administrador de %s."
 
 #: plugins/mezuro/views/show.html.erb:19
-#, fuzzy
 msgid "Repository address"
-msgstr "Endereço do feed"
+msgstr "Endereço do repositório"
 
 #: plugins/mezuro/views/show.html.erb:35
 msgid "Possible causes:"
-msgstr ""
+msgstr "Causas possíveis:"
 
 #: plugins/mezuro/views/show.html.erb:38
 msgid "Server is down"
-msgstr ""
+msgstr "O servidor está fora do ar"
 
 #: plugins/mezuro/views/show.html.erb:41
 msgid ""
 "URL invalid, in this case create another project with the correct URL\n"
 "    (Sorry for the incovenience, we're working for a better solution)"
 msgstr ""
+"URL inválida, nesse caso crie outro projeto com a URL correta\n"
+"    (Desculpe pela incoveniência, estamos trabalhando para encontrar uma"
+" solução mehor)"
 
 #: plugins/mezuro/views/show.html.erb:47
-#, fuzzy
 msgid "Metric Results"
-msgstr "Resultados da Busca"
+msgstr "Resultados da Métrica"
 
 #: plugins/mezuro/views/show.html.erb:49
 msgid "Total Metrics"
-msgstr ""
+msgstr "Total das Métricas"
 
 #: plugins/mezuro/views/show.html.erb:59
-#, fuzzy
 msgid "Statistical Metrics"
-msgstr "Estatística"
+msgstr "Estatísticas das Métricas"
 
 #: plugins/mezuro/views/show.html.erb:77
 msgid ""
 "Wait a moment while the metrics are calculated.
\n"
 "      Reload the page manually in a few moment. "
 msgstr ""
+"Aguarde um momento enquanto as métricas são calculadas.
\n"
+"      Recarregue a página manualmente em alguns minutos. "
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/new.html.erb:1
-#, fuzzy
 msgid "New project"
-msgstr "Novo produto"
+msgstr "Novo projeto"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/new.html.erb:3
-#, fuzzy
 msgid "Register project"
-msgstr "Registrar empreendimento"
+msgstr "Registrar projeto"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/edit.html.erb:1
-#, fuzzy
 msgid "Edit project"
-msgstr "Editar perfil"
+msgstr "Editar projeto"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/edit.html.erb:3
-#, fuzzy
 msgid "Update project"
-msgstr "Atualizado em"
+msgstr "Atualizar projeto"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/index.html.erb:1
-#, fuzzy
 msgid "%s's Mezuro projects"
-msgstr "Empreendimentos de %s"
+msgstr "Projetos Mezuro de %s"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/index.html.erb:4
-#, fuzzy
 msgid "%s has no projects registered."
-msgstr "(nenhum produto registrado ainda)"
+msgstr "%s não tem projetos registrados"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/index.html.erb:8
-#, fuzzy
 msgid "Project"
-msgstr "Produto"
+msgstr "Projeto"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/index.html.erb:19
-#, fuzzy
 msgid "Are you sure you want to remove this project?"
-msgstr "Tem certeza que quer excluir este bloco?"
+msgstr "Tem certeza que quer excluir este projeto?"
 
 #: plugins/mezuro/views/mezuro_plugin_myprofile/index.html.erb:27
-#, fuzzy
 msgid "Register a new project"
-msgstr "Registrar um novo empreendimento"
+msgstr "Registrar um novo projeto"
 
 #: config/initializers/action_tracker.rb:8
 msgid "published 1 article: %{title}"
@@ -8760,6 +8697,28 @@ msgstr ""
 "pela %s e licenciado sob a GNU Affero General Public License versão 3 ou superior."
 
+#~ msgid "environment"
+#~ msgstr "comunidade virtual"
+
+#~ msgid "Is default"
+#~ msgstr "É padrão"
+
+#~ msgid "Design data"
+#~ msgstr "Informações de design"
+
+#~ msgid "Terms of use acceptance text"
+#~ msgstr "Texto para aceite dos termos de uso"
+
+#, fuzzy
+#~ msgid "Company name"
+#~ msgstr "Nome de exibição"
+
+#~ msgid "domain"
+#~ msgstr "domínio"
+
+#~ msgid "Google maps key"
+#~ msgstr "Chave do Google maps"
+
 #~ msgid "Could not upload all files"
 #~ msgstr "Não foi possível enviar todos os arquivos"
 
diff --git a/po/ru/noosfero.po b/po/ru/noosfero.po
index 424e848..b8459eb 100755
--- a/po/ru/noosfero.po
+++ b/po/ru/noosfero.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.31.4\n"
-"POT-Creation-Date: 2011-08-16 15:44-0300\n"
+"Project-Id-Version: noosfero 0.31.5\n"
+"POT-Creation-Date: 2011-08-22 16:07-0300\n"
 "PO-Revision-Date: 2010-10-26 09:57-0300\n"
 "Last-Translator: Anton \n"
 "Language-Team: German \n"
@@ -98,30 +98,30 @@ msgid "Edit folder"
 msgstr "Редактировать папку"
 
 #: app/helpers/assets_helper.rb:7
-#: app/controllers/public/search_controller.rb:131
-#: app/controllers/public/search_controller.rb:203
+#: app/controllers/public/search_controller.rb:130
+#: app/controllers/public/search_controller.rb:199
 #: app/views/search/articles.rhtml:1
 msgid "Articles"
 msgstr "Статьи"
 
 #: app/helpers/assets_helper.rb:8 app/helpers/application_helper.rb:1092
-#: app/controllers/public/search_controller.rb:133
-#: app/controllers/public/search_controller.rb:197
+#: app/controllers/public/search_controller.rb:132
+#: app/controllers/public/search_controller.rb:193
 #: app/models/people_block.rb:4 app/views/search/people.rhtml:1
 msgid "People"
 msgstr "Пользователи"
 
 #: app/helpers/assets_helper.rb:9 app/helpers/application_helper.rb:530
-#: app/controllers/public/search_controller.rb:135
-#: app/controllers/public/search_controller.rb:199
+#: app/controllers/public/search_controller.rb:134
+#: app/controllers/public/search_controller.rb:195
 #: app/models/enterprise.rb:130 app/models/products_block.rb:8
 #: app/models/products_block.rb:12 app/views/search/_sellers_form.rhtml:8
 msgid "Products"
 msgstr "Продукты"
 
 #: app/helpers/assets_helper.rb:10
-#: app/controllers/public/search_controller.rb:132
-#: app/controllers/public/search_controller.rb:198
+#: app/controllers/public/search_controller.rb:131
+#: app/controllers/public/search_controller.rb:194
 #: app/models/enterprises_block.rb:12 app/views/search/_sellers_form.rhtml:7
 #: app/views/search/enterprises.rhtml:5
 #: app/views/profile/_person_profile.rhtml:38
@@ -130,15 +130,15 @@ msgstr "Компании"
 
 #: app/helpers/assets_helper.rb:11 app/helpers/application_helper.rb:515
 #: app/helpers/application_helper.rb:1107
-#: app/controllers/public/search_controller.rb:134
-#: app/controllers/public/search_controller.rb:201
+#: app/controllers/public/search_controller.rb:133
+#: app/controllers/public/search_controller.rb:197
 #: app/models/communities_block.rb:4 app/views/search/communities.rhtml:1
 #: app/views/profile/_person_profile.rhtml:56
 msgid "Communities"
 msgstr "Сообщества"
 
 #: app/helpers/assets_helper.rb:12
-#: app/controllers/public/search_controller.rb:136
+#: app/controllers/public/search_controller.rb:135
 #: public/designs/themes/base/navigation.rhtml:7
 #: public/designs/themes/noosfero/navigation.rhtml:7
 msgid "Events"
@@ -1267,7 +1267,7 @@ msgstr "Вы уверены что хотите перейти на этот в
 msgid "Change category"
 msgstr "Изменить категорию"
 
-#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:77
+#: app/helpers/manage_products_helper.rb:179 app/helpers/search_helper.rb:86
 msgid "Price: "
 msgstr "Цена:"
 
@@ -1321,43 +1321,43 @@ msgid_plural "%{num} %{plural_unit}"
 msgstr[0] "1 %{singular_unit}"
 msgstr[1] "%{num} %{plural_unit}"
 
-#: app/helpers/search_helper.rb:22
+#: app/helpers/search_helper.rb:31
 msgid "Display in list"
 msgstr "Вывести список"
 
-#: app/helpers/search_helper.rb:28
+#: app/helpers/search_helper.rb:37
 msgid "Display in map"
 msgstr "Показать на карте"
 
-#: app/helpers/search_helper.rb:47
+#: app/helpers/search_helper.rb:56
 msgid "E-Mail: "
 msgstr "E-Mail:"
 
-#: app/helpers/search_helper.rb:50
+#: app/helpers/search_helper.rb:59
 msgid "Phone(s): "
 msgstr "Телефон:"
 
-#: app/helpers/search_helper.rb:53
+#: app/helpers/search_helper.rb:62
 msgid "Location: "
 msgstr "Положение"
 
-#: app/helpers/search_helper.rb:56
+#: app/helpers/search_helper.rb:65
 msgid "Address: "
 msgstr "Адрес:"
 
-#: app/helpers/search_helper.rb:59
+#: app/helpers/search_helper.rb:68
 msgid "Products/Services: "
 msgstr "Продукты/сервисы"
 
-#: app/helpers/search_helper.rb:62
+#: app/helpers/search_helper.rb:71
 msgid "Distance: "
 msgstr "Расстояние:"
 
-#: app/helpers/search_helper.rb:80
+#: app/helpers/search_helper.rb:89
 msgid "Provider: "
 msgstr "Провайдер:"
 
-#: app/helpers/search_helper.rb:83
+#: app/helpers/search_helper.rb:92
 msgid "Category: "
 msgstr "Категория:"
 
@@ -1511,27 +1511,27 @@ msgstr "Вы не можете просматривать данный конт
 msgid "Comment succesfully deleted"
 msgstr "Комментарий успешно удален"
 
-#: app/controllers/public/browse_controller.rb:53
+#: app/controllers/public/browse_controller.rb:51
 msgid "More recent people"
 msgstr "Недавние лица"
 
-#: app/controllers/public/browse_controller.rb:54
+#: app/controllers/public/browse_controller.rb:52
 msgid "More active people"
 msgstr "Больше активных людей"
 
-#: app/controllers/public/browse_controller.rb:55
+#: app/controllers/public/browse_controller.rb:53
 msgid "More popular people"
 msgstr "Популярные лица"
 
-#: app/controllers/public/browse_controller.rb:56
+#: app/controllers/public/browse_controller.rb:54
 msgid "More recent communities"
 msgstr "Больше последних сообществ"
 
-#: app/controllers/public/browse_controller.rb:57
+#: app/controllers/public/browse_controller.rb:55
 msgid "More active communities"
 msgstr "Больше активных сообществ"
 
-#: app/controllers/public/browse_controller.rb:58
+#: app/controllers/public/browse_controller.rb:56
 msgid "More popular communities"
 msgstr "Больне популярных сообществ"
 
@@ -1567,11 +1567,11 @@ msgstr "Свободно!"
 msgid "Unavailable!"
 msgstr "Занято"
 
-#: app/controllers/public/search_controller.rb:200
+#: app/controllers/public/search_controller.rb:196
 msgid "Upcoming events"
 msgstr "Предстоящие события"
 
-#: app/controllers/public/search_controller.rb:202
+#: app/controllers/public/search_controller.rb:198
 msgid "Most commented articles"
 msgstr "Наиболее комментируемые статьи"
 
@@ -1995,11 +1995,11 @@ msgstr "Нет"
 msgid "box"
 msgstr "ящик"
 
-#: app/models/box.rb:- app/models/domain.rb:-
+#: app/models/box.rb:-
 msgid "Owner type"
 msgstr "Тип владельца"
 
-#: app/models/box.rb:- app/models/domain.rb:-
+#: app/models/box.rb:-
 msgid "Owner"
 msgstr "Владелец"
 
@@ -2274,7 +2274,7 @@ msgstr "Ящик"
 msgid "Type"
 msgstr "Тип"
 
-#: app/models/block.rb:- app/models/environment.rb:-
+#: app/models/block.rb:-
 msgid "Settings"
 msgstr "Настройки"
 
@@ -2288,8 +2288,7 @@ msgstr "Разрешено"
 #: app/models/task.rb:- app/models/product_qualifier.rb:-
 #: app/models/certifier.rb:- app/models/external_feed.rb:-
 #: app/models/mailing_sent.rb:- app/models/comment.rb:-
-#: app/models/environment.rb:- app/models/profile.rb:-
-#: app/models/product_categorization.rb:-
+#: app/models/profile.rb:- app/models/product_categorization.rb:-
 msgid "Created at"
 msgstr "Создано"
 
@@ -2298,8 +2297,7 @@ msgstr "Создано"
 #: app/models/input.rb:- app/models/mailing.rb:- app/models/product.rb:-
 #: app/models/product_qualifier.rb:- app/models/certifier.rb:-
 #: app/models/external_feed.rb:- app/models/mailing_sent.rb:-
-#: app/models/environment.rb:- app/models/profile.rb:-
-#: app/models/product_categorization.rb:-
+#: app/models/profile.rb:- app/models/product_categorization.rb:-
 msgid "Updated at"
 msgstr "Обновлено"
 
@@ -2451,17 +2449,22 @@ msgstr "%{author} хочет опубликовать \"%{article}\" на %{comm
 msgid "The article was removed."
 msgstr "Текст был удален"
 
-#: app/models/approve_article.rb:97
+#: app/models/approve_article.rb:98
 #, fuzzy
 msgid "%{requestor} wants to publish the article: %{article}."
 msgstr "%{author} хочет опубликовать \"%{article}\" на %{community} "
 
-#: app/models/approve_article.rb:103 app/models/suggest_article.rb:63
+#: app/models/approve_article.rb:100
+#, fuzzy
+msgid "%{requestor} wanted to publish an article but it was removed."
+msgstr "%{author} хочет опубликовать \"%{article}\" на %{community} "
+
+#: app/models/approve_article.rb:107 app/models/suggest_article.rb:63
 msgid ""
 "You need to login on %{system} in order to approve or reject this article."
 msgstr "Необходимо войти в %{system} для утверждения статьи"
 
-#: app/models/approve_article.rb:108
+#: app/models/approve_article.rb:112
 msgid ""
 "Your request for publishing the article \"%{article}\" was approved. Here is "
 "the comment left by the admin who approved your article:\n"
@@ -2469,16 +2472,16 @@ msgid ""
 "%{comment} "
 msgstr ""
 
-#: app/models/approve_article.rb:110
+#: app/models/approve_article.rb:114
 msgid "Your request for publishing the article \"%{article}\" was approved."
 msgstr ""
 
-#: app/models/approve_article.rb:115
+#: app/models/approve_article.rb:119
 #, fuzzy
 msgid "Your request for publishing the article \"{article}\" was rejected."
 msgstr "%{author} хочет опубликовать \"%{article}\" на %{community} "
 
-#: app/models/approve_article.rb:117
+#: app/models/approve_article.rb:121
 msgid ""
 "Here is the reject explanation left by the administrator who rejected your "
 "article: \n"
@@ -2750,10 +2753,9 @@ msgid "qualifier"
 msgstr "определитель"
 
 #: app/models/qualifier.rb:- app/models/product.rb:- app/models/certifier.rb:-
-#: app/models/comment.rb:- app/models/environment.rb:- app/models/profile.rb:-
-#: app/models/create_enterprise.rb:4 app/models/domain.rb:-
-#: app/models/contact.rb:- app/models/contact.rb:14
-#: app/views/cms/view.rhtml:24
+#: app/models/comment.rb:- app/models/profile.rb:-
+#: app/models/create_enterprise.rb:4 app/models/contact.rb:-
+#: app/models/contact.rb:14 app/views/cms/view.rhtml:24
 #: app/views/enterprise_registration/select_validator.rhtml:12
 #: app/views/contact/sender/mail.rhtml:11
 #: app/views/content_viewer/_comment_form.rhtml:30
@@ -3041,10 +3043,6 @@ msgstr "Код"
 msgid "Target type"
 msgstr "Тип цели"
 
-#: app/models/task.rb:- app/models/profile.rb:-
-msgid "Bsc"
-msgstr ""
-
 #: app/models/task.rb:27 app/models/profile.rb:-
 #: app/views/features/_manage_community_fields.rhtml:8
 #: app/views/features/_manage_person_fields.rhtml:8
@@ -3331,38 +3329,6 @@ msgstr "[%s] вы получили новый комментарий"
 msgid "This block presents the main content of your pages."
 msgstr "Блок, отображающий основной контент ваших страниц"
 
-#: app/models/environment.rb:-
-msgid "environment"
-msgstr "обстановка"
-
-#: app/models/environment.rb:- app/models/organization.rb:98
-msgid "Contact email"
-msgstr "Контактный email"
-
-#: app/models/environment.rb:- app/models/domain.rb:-
-msgid "Is default"
-msgstr "стандартно"
-
-#: app/models/environment.rb:-
-msgid "Design data"
-msgstr "Данные дизайна"
-
-#: app/models/environment.rb:- app/models/profile.rb:-
-msgid "Custom header"
-msgstr "Пользовательский заголовок"
-
-#: app/models/environment.rb:- app/models/profile.rb:-
-msgid "Custom footer"
-msgstr "Пользовательская подпись"
-
-#: app/models/environment.rb:- app/models/profile.rb:-
-msgid "Theme"
-msgstr "Тема"
-
-#: app/models/environment.rb:-
-msgid "Terms of use acceptance text"
-msgstr "Текст принятия условий использования"
-
 #: app/models/environment.rb:20
 msgid "View environment admin panel"
 msgstr "Панель управления средой"
@@ -3543,7 +3509,7 @@ msgstr "Чат, основанный на XMPP/Jabber"
 msgid "Show a zoom link on all article images"
 msgstr ""
 
-#: app/models/environment.rb:502
+#: app/models/environment.rb:514
 msgid "Only one Virtual Community can be the default one"
 msgstr "Только виртуальное сообщество может быть выбранным по умолчанию"
 
@@ -3598,6 +3564,18 @@ msgstr "Точность геокодирования"
 msgid "Nickname"
 msgstr "Ник"
 
+#: app/models/profile.rb:-
+msgid "Custom header"
+msgstr "Пользовательский заголовок"
+
+#: app/models/profile.rb:-
+msgid "Custom footer"
+msgstr "Пользовательская подпись"
+
+#: app/models/profile.rb:-
+msgid "Theme"
+msgstr "Тема"
+
 #: app/models/profile.rb:- app/models/profile.rb:675
 msgid "Public profile"
 msgstr "Публичный пофиль"
@@ -3614,19 +3592,6 @@ msgstr "Предпочтительный домен"
 msgid "Visible"
 msgstr "Видимый"
 
-#: app/models/profile.rb:-
-#, fuzzy
-msgid "Company name"
-msgstr "Отображаемое имя"
-
-#: app/models/profile.rb:-
-msgid "Cnpj"
-msgstr ""
-
-#: app/models/profile.rb:- app/models/organization.rb:98
-msgid "Validated"
-msgstr "Действительность"
-
 #: app/models/profile.rb:36
 msgid "Edit profile"
 msgstr "Редактировать профиль"
@@ -3995,6 +3960,14 @@ msgstr "Ограничения"
 msgid "Display name"
 msgstr "Отображаемое имя"
 
+#: app/models/organization.rb:98
+msgid "Contact email"
+msgstr "Контактный email"
+
+#: app/models/organization.rb:98
+msgid "Validated"
+msgstr "Действительность"
+
 #: app/models/organization.rb:116
 #, fuzzy
 msgid "Community's profile"
@@ -4005,14 +3978,6 @@ msgstr "Сообщества"
 msgid "Invite Friends"
 msgstr "Пригласить друзей"
 
-#: app/models/domain.rb:-
-msgid "domain"
-msgstr "домен"
-
-#: app/models/domain.rb:-
-msgid "Google maps key"
-msgstr "Ключ карт Google"
-
 #: app/models/domain.rb:13
 #, fuzzy
 msgid ""
@@ -8742,6 +8707,28 @@ msgid ""
 "\">GNU Affero General Public License version 3 or any later version."
 msgstr ""
 
+#~ msgid "environment"
+#~ msgstr "обстановка"
+
+#~ msgid "Is default"
+#~ msgstr "стандартно"
+
+#~ msgid "Design data"
+#~ msgstr "Данные дизайна"
+
+#~ msgid "Terms of use acceptance text"
+#~ msgstr "Текст принятия условий использования"
+
+#, fuzzy
+#~ msgid "Company name"
+#~ msgstr "Отображаемое имя"
+
+#~ msgid "domain"
+#~ msgstr "домен"
+
+#~ msgid "Google maps key"
+#~ msgstr "Ключ карт Google"
+
 #~ msgid "Could not upload all files"
 #~ msgstr "Невозможно загрузить все поля"
 
--
libgit2 0.21.2