diff --git a/app/models/image.rb b/app/models/image.rb index 46018c6..fd7cea4 100644 --- a/app/models/image.rb +++ b/app/models/image.rb @@ -7,13 +7,13 @@ class Image < ActiveRecord::Base has_attachment :content_type => :image, :storage => :file_system, - :max_size => 500.kilobytes, :resize_to => '320x200>', :thumbnails => { :big => '150x150', :thumb => '100x100', :portrait => '64x64', :minor => '50x50', - :icon => '20x20!' } + :icon => '20x20!' }, + :max_size => 500.kilobytes # remember to update validate message below - validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % Image.max_size.to_humanreadable + validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 500.0 KB") end diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index 7cf2af2..cc5bfec 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -4,6 +4,10 @@ # of the file itself is kept. (FIXME?) class UploadedFile < Article + def self.max_size + UploadedFile.attachment_options[:max_size] + end + # FIXME need to define min/max file size # # default max_size is 1.megabyte to redefine it set options: @@ -12,13 +16,9 @@ class UploadedFile < Article has_attachment :storage => :file_system, :thumbnails => { :icon => [24,24], :thumb => '130x130>', :display => '640X480>' }, :thumbnail_class => Thumbnail, - :max_size => 5.megabytes - - def self.max_size - UploadedFile.attachment_options[:max_size] - end + :max_size => 5.megabytes # remember to update validate message below - validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of %s") % UploadedFile.max_size.to_humanreadable + validates_attachment :size => N_("%{fn} of uploaded file was larger than the maximum size of 5.0 MB") def icon_name self.image? ? public_filename(:icon) : self.content_type.gsub('/', '-') diff --git a/po/bg/noosfero.po b/po/bg/noosfero.po index ca6a885..680d03b 100644 --- a/po/bg/noosfero.po +++ b/po/bg/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/de/noosfero.po b/po/de/noosfero.po index ca6a885..680d03b 100644 --- a/po/de/noosfero.po +++ b/po/de/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/es/noosfero.po b/po/es/noosfero.po index ca6a885..680d03b 100644 --- a/po/es/noosfero.po +++ b/po/es/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/fr/noosfero.po b/po/fr/noosfero.po index db647e3..d4e6d88 100644 --- a/po/fr/noosfero.po +++ b/po/fr/noosfero.po @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" +"Project-Id-Version: noosfero 0.18.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2008-06-13 16:15-0300\n" "Last-Translator: Raphael Rousseau \n" "Language-Team: LANGUAGE \n" @@ -1254,8 +1254,8 @@ msgstr "Cible" msgid "Code" msgstr "Code" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "Type" @@ -1304,7 +1304,7 @@ msgstr "Nouveau %s" msgid "Save" msgstr "Enregistrer" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "Envoyer" @@ -1588,12 +1588,12 @@ msgstr "Souscrire à des flux RSS" msgid "profile" msgstr "profil" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1605,7 +1605,7 @@ msgstr "Nom" msgid "Identifier" msgstr "Identifiant" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "Environnement" @@ -1622,11 +1622,11 @@ msgstr "Accueil" msgid "User" msgstr "Utilisateur" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "Latitude" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "Longitude" @@ -1742,35 +1742,6 @@ msgstr "%s ne peut pas avoir de membres" msgid "%s can't has moderators" msgstr "%s ne peut pas avoir de modérateur" -#: app/models/category.rb:- -msgid "category" -msgstr "catégorie" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "Chemin" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "Afficher la couleur" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -#, fuzzy -msgid "Parent" -msgstr "Parent" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "Afficher dans le menu" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "Nombre d'enfants" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "%{fn} ne peut pas être comme ça." @@ -1910,7 +1881,7 @@ msgstr "Mémoriser le token" msgid "Remember token expires at" msgstr "Le token mémorisé expire le" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 #, fuzzy msgid "Terms of use" msgstr "Conditions d'utilisation" @@ -2072,6 +2043,11 @@ msgstr "image" #: app/models/image.rb:- app/models/thumbnail.rb:- #, fuzzy +msgid "Parent" +msgstr "Parent" + +#: app/models/image.rb:- app/models/thumbnail.rb:- +#, fuzzy msgid "Content type" msgstr "Type de contenu" @@ -2098,9 +2074,9 @@ msgstr "Largeur" msgid "Height" msgstr "Hauteur" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 +#: app/models/image.rb:18 #, fuzzy -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" "Le fichier que vous avez téléversé était plus gros que la taille maximale de " "%s" @@ -2440,6 +2416,10 @@ msgstr "Référence à un autre article" msgid "A reference to another article published in another profile" msgstr "Une référence à un autre article publié sur un autre profil" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2458,7 +2438,7 @@ msgstr "Message" msgid "Receive a copy" msgstr "Recevoir une copie" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "Pays et état" @@ -2686,6 +2666,13 @@ msgstr "Les membres de %s" msgid "This block presents the members of a collective." msgstr "Ce bloc présente les membres d'un collectif." +#: app/models/uploaded_file.rb:21 +#, fuzzy +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" +"Le fichier que vous avez téléversé était plus gros que la taille maximale de " +"%s" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "Fichier téléversé" @@ -2909,16 +2896,16 @@ msgstr "Événements à venir" msgid "Most commented articles" msgstr "Articles les plus commentés" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "Manquant" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "Le contact a bien été envoyé" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "Le contact n'a pas été envoyé" @@ -3686,7 +3673,7 @@ msgstr "(vide)" msgid "Post a comment" msgstr "Poster un commentaire" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "courrier électronique" @@ -4309,7 +4296,7 @@ msgstr "Les entreprises préférées de %s" msgid "Contact %s" msgstr "Contactez %s" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "Recevoir une copie du message par mél" @@ -5697,40 +5684,40 @@ msgstr "" "oublié votre mot de passe, ne créez pas un nouveau compte, cliquez sur le " "lien «J'ai oublié mon mot de passe»." -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 #, fuzzy msgid "Insert your login" msgstr "Entrez votre commentaire" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 #, fuzzy msgid "To confirm, repeat your password." msgstr "Confirmer votre nouveau mot de passe" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "J'accepte les conditions d'utilisation" # Je ne suis pas sûr de la distinction "sign up" / "register" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 #, fuzzy msgid "Sign up" msgstr "S'enregistrer" @@ -6775,6 +6762,21 @@ msgstr "info organisation" msgid "Organization Info and settings" msgstr "Région" +#~ msgid "category" +#~ msgstr "catégorie" + +#~ msgid "Path" +#~ msgstr "Chemin" + +#~ msgid "Display color" +#~ msgstr "Afficher la couleur" + +#~ msgid "Display in menu" +#~ msgstr "Afficher dans le menu" + +#~ msgid "Children count" +#~ msgstr "Nombre d'enfants" + #, fuzzy #~ msgid "Last updated" #~ msgstr "Dernière mise à jour" diff --git a/po/hy/noosfero.po b/po/hy/noosfero.po index f0c46da..cfc4489 100644 --- a/po/hy/noosfero.po +++ b/po/hy/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1227,8 +1227,8 @@ msgstr "Թիրախ" msgid "Code" msgstr "Կոդ" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "Տեսակ" @@ -1276,7 +1276,7 @@ msgstr "Նորություններ" msgid "Save" msgstr "Պահպանել" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1551,12 +1551,12 @@ msgstr "" msgid "profile" msgstr "անհատական էջ" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1568,7 +1568,7 @@ msgstr "Անվանում" msgid "Identifier" msgstr "Որոշիչ" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "Արտաքին տեսք" @@ -1584,11 +1584,11 @@ msgstr "Գլխավոր էջ" msgid "User" msgstr "Օգտվող" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1699,34 +1699,6 @@ msgstr "%s - ը անդամներ ունենալ չի կարող" msgid "%s can't has moderators" msgstr "մոդերատորներ ունենալ չի կարող" -#: app/models/category.rb:- -msgid "category" -msgstr "կատեգորիա" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "Խորագիր" - -#: app/models/category.rb:- -msgid "Path" -msgstr "Ճանապարհ" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "Ցուցադրել գույնը" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "Ծնող" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "Ցուցադրել մենյուի մեջ" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "Երեխաների հաշվում" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "%{fn} չի կարող այդպես լինել" @@ -1860,7 +1832,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "Օգտագործման կանոններն ու պայմանները" @@ -2014,6 +1986,10 @@ msgid "image" msgstr "պատկեր" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "Ծնող" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "Բովանդակության տեսակ" @@ -2037,9 +2013,9 @@ msgstr "Լայնություն" msgid "Height" msgstr "Բարձրություն" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 +#: app/models/image.rb:18 #, fuzzy -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "Ձեր բեռնած ֆայլի չափսն անցնում է առավելագույն սահմանված %s չափսից" #: app/models/image_gallery.rb:8 @@ -2362,6 +2338,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2380,7 +2360,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2603,6 +2583,11 @@ msgstr "%s-ի անդամները" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +#, fuzzy +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "Ձեր բեռնած ֆայլի չափսն անցնում է առավելագույն սահմանված %s չափսից" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "Վերբեռնած ֆայլ" @@ -2817,16 +2802,16 @@ msgstr "Գալիք իրադարձություններ" msgid "Most commented articles" msgstr "Ամենից հաճախ մեկնաբանվող հոդվածները" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3580,7 +3565,7 @@ msgstr "" msgid "Post a comment" msgstr "Մեկնաբանություն թողնել" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "էլ. հասցե" @@ -4173,7 +4158,7 @@ msgstr "%s-ի նախընտրած ձեռնարկությունները" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5498,38 +5483,38 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 #, fuzzy msgid "Insert your login" msgstr "Գրեք Ձեր մեկնաբանությունը" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "Ես ընդունում եմ օգտագործման կանոնները" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "Գրանցվել" @@ -6519,6 +6504,24 @@ msgstr "Կազնակերպությունները «%s»:" msgid "Organization Info and settings" msgstr "Անհանատական էջի տվյալների բաժին" +#~ msgid "category" +#~ msgstr "կատեգորիա" + +#~ msgid "Slug" +#~ msgstr "Խորագիր" + +#~ msgid "Path" +#~ msgstr "Ճանապարհ" + +#~ msgid "Display color" +#~ msgstr "Ցուցադրել գույնը" + +#~ msgid "Display in menu" +#~ msgstr "Ցուցադրել մենյուի մեջ" + +#~ msgid "Children count" +#~ msgstr "Երեխաների հաշվում" + #, fuzzy #~ msgid "Last updated" #~ msgstr "Վերջինը թարմացվել է %s" diff --git a/po/it/noosfero.po b/po/it/noosfero.po index ca6a885..680d03b 100644 --- a/po/it/noosfero.po +++ b/po/it/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/nl/noosfero.po b/po/nl/noosfero.po index ca6a885..680d03b 100644 --- a/po/nl/noosfero.po +++ b/po/nl/noosfero.po @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/noosfero.pot b/po/noosfero.pot index ca6a885..680d03b 100644 --- a/po/noosfero.pot +++ b/po/noosfero.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" "PO-Revision-Date: 2007-08-30 18:47-0300\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1211,8 +1211,8 @@ msgstr "" msgid "Code" msgstr "" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "" @@ -1259,7 +1259,7 @@ msgstr "" msgid "Save" msgstr "" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "" @@ -1525,12 +1525,12 @@ msgstr "" msgid "profile" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1542,7 +1542,7 @@ msgstr "" msgid "Identifier" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "" @@ -1558,11 +1558,11 @@ msgstr "" msgid "User" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "" @@ -1672,34 +1672,6 @@ msgstr "" msgid "%s can't has moderators" msgstr "" -#: app/models/category.rb:- -msgid "category" -msgstr "" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "" - -#: app/models/category.rb:- -msgid "Path" -msgstr "" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "" @@ -1830,7 +1802,7 @@ msgstr "" msgid "Remember token expires at" msgstr "" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "" @@ -1982,6 +1954,10 @@ msgid "image" msgstr "" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "" @@ -2005,8 +1981,8 @@ msgstr "" msgid "Height" msgstr "" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" msgstr "" #: app/models/image_gallery.rb:8 @@ -2313,6 +2289,10 @@ msgstr "" msgid "A reference to another article published in another profile" msgstr "" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2331,7 +2311,7 @@ msgstr "" msgid "Receive a copy" msgstr "" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "" @@ -2547,6 +2527,10 @@ msgstr "" msgid "This block presents the members of a collective." msgstr "" +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "" @@ -2758,16 +2742,16 @@ msgstr "" msgid "Most commented articles" msgstr "" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "" @@ -3500,7 +3484,7 @@ msgstr "" msgid "Post a comment" msgstr "" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "" @@ -4077,7 +4061,7 @@ msgstr "" msgid "Contact %s" msgstr "" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "" @@ -5339,37 +5323,37 @@ msgid "" "password!\" link. ;-)" msgstr "" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "" -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "" -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "" -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "" diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po index 2c20787..c4bca2e 100644 --- a/po/pt_BR/noosfero.po +++ b/po/pt_BR/noosfero.po @@ -11,9 +11,9 @@ # msgid "" msgstr "" -"Project-Id-Version: noosfero 0.18.2\n" -"POT-Creation-Date: 2009-06-20 02:04-0300\n" -"PO-Revision-Date: 2009-07-10 18:03-0300\n" +"Project-Id-Version: noosfero 0.18.4\n" +"POT-Creation-Date: 2009-07-20 11:40-0300\n" +"PO-Revision-Date: 2009-07-20 11:43-0300\n" "Last-Translator: Joenio Costa \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -1223,8 +1223,8 @@ msgstr "Alvo" msgid "Code" msgstr "Código" -#: app/models/task.rb:- app/models/profile.rb:- app/models/category.rb:- -#: app/models/block.rb:- app/views/cms/view.rhtml:29 +#: app/models/task.rb:- app/models/profile.rb:- app/models/block.rb:- +#: app/views/cms/view.rhtml:29 msgid "Type" msgstr "Tipo" @@ -1271,7 +1271,7 @@ msgstr "Novo" msgid "Save" msgstr "Salvar" -#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:21 +#: app/models/link_list_block.rb:7 app/views/contact/new.rhtml:20 #: app/views/tasks/new.rhtml:15 msgid "Send" msgstr "Enviar" @@ -1546,12 +1546,12 @@ msgstr "Assinar feed RSS" msgid "profile" msgstr "perfil" -#: app/models/profile.rb:- app/models/category.rb:- app/models/comment.rb:- +#: app/models/profile.rb:- app/models/comment.rb:- #: app/models/create_enterprise.rb:4 app/models/product.rb:- #: app/models/domain.rb:- app/models/contact.rb:- app/models/contact.rb:13 #: app/models/environment.rb:- #: app/views/box_organizer/_link_list_block.rhtml:4 -#: app/views/content_viewer/_comment_form.rhtml:26 +#: app/views/content_viewer/_comment_form.rhtml:27 #: app/views/enterprise_editor/_form.rhtml:1 #: app/views/enterprise_validation/_details.rhtml:3 #: app/views/cms/view.rhtml:28 @@ -1563,7 +1563,7 @@ msgstr "Nome" msgid "Identifier" msgstr "Identificador" -#: app/models/profile.rb:- app/models/category.rb:- app/models/user.rb:- +#: app/models/profile.rb:- app/models/user.rb:- msgid "Environment" msgstr "Ambiente" @@ -1579,11 +1579,11 @@ msgstr "Página inicial" msgid "User" msgstr "usuário" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lat" msgstr "Lat" -#: app/models/profile.rb:- app/models/category.rb:- app/models/product.rb:- +#: app/models/profile.rb:- app/models/product.rb:- msgid "Lng" msgstr "Lng" @@ -1695,34 +1695,6 @@ msgstr "%s não pode ter integrantes" msgid "%s can't has moderators" msgstr "%s não pode ter moderadores" -#: app/models/category.rb:- -msgid "category" -msgstr "categoria" - -#: app/models/category.rb:- -msgid "Slug" -msgstr "Atalho" - -#: app/models/category.rb:- -msgid "Path" -msgstr "Caminho" - -#: app/models/category.rb:- -msgid "Display color" -msgstr "Cor de exibição" - -#: app/models/category.rb:- app/models/image.rb:- app/models/thumbnail.rb:- -msgid "Parent" -msgstr "Pai" - -#: app/models/category.rb:- -msgid "Display in menu" -msgstr "Mostrar no menu" - -#: app/models/category.rb:- -msgid "Children count" -msgstr "Quantidade de filhos" - #: app/models/category.rb:3 msgid "%{fn} cannot be like that." msgstr "%{fn} não pode ser assim." @@ -1858,7 +1830,7 @@ msgstr "Lembrar token" msgid "Remember token expires at" msgstr "Lembre do token que expira em" -#: app/models/user.rb:- app/views/account/_signup_form.rhtml:55 +#: app/models/user.rb:- app/views/account/_signup_form.rhtml:54 msgid "Terms of use" msgstr "Termos de Uso" @@ -2011,6 +1983,10 @@ msgid "image" msgstr "imagem" #: app/models/image.rb:- app/models/thumbnail.rb:- +msgid "Parent" +msgstr "Pai" + +#: app/models/image.rb:- app/models/thumbnail.rb:- msgid "Content type" msgstr "Tipo de conteúdo" @@ -2034,9 +2010,9 @@ msgstr "Largura" msgid "Height" msgstr "Altura" -#: app/models/image.rb:18 app/models/uploaded_file.rb:21 -msgid "%{fn} of uploaded file was larger than the maximum size of %s" -msgstr "%{fn} do arquivo enviado é maior que o máximo permitido de %s" +#: app/models/image.rb:18 +msgid "%{fn} of uploaded file was larger than the maximum size of 500.0 KB" +msgstr "%{fn} do arquivo enviado é maior que o máximo permitido de 500.0 KB" #: app/models/image_gallery.rb:8 msgid "A collection of photos, logos or other kinds of images." @@ -2362,6 +2338,10 @@ msgstr "Referência a outro artigo" msgid "A reference to another article published in another profile" msgstr "Uma referência a outro artigo publico em outro perfil" +#: app/models/published_article.rb:31 +msgid "The original text was removed." +msgstr "" + #: app/models/contact.rb:- app/views/friends/index.rhtml:32 #: app/views/friends/index.rhtml:35 msgid "contact" @@ -2380,7 +2360,7 @@ msgstr "Mensagem" msgid "Receive a copy" msgstr "Receber uma cópia" -#: app/models/contact.rb:13 app/views/contact/new.rhtml:13 +#: app/models/contact.rb:13 app/views/contact/new.rhtml:14 msgid "City and state" msgstr "Cidade e Estado" @@ -2600,6 +2580,10 @@ msgstr "{#} integrantes" msgid "This block presents the members of a collective." msgstr "Este bloco apresenta os integrantes de um coletivo." +#: app/models/uploaded_file.rb:21 +msgid "%{fn} of uploaded file was larger than the maximum size of 5.0 MB" +msgstr "%{fn} do arquivo enviado é maior que o máximo permitido de 5.0 MB" + #: app/models/uploaded_file.rb:32 msgid "Uploaded file" msgstr "Arquivo enviado" @@ -2817,16 +2801,16 @@ msgstr "Próximos eventos" msgid "Most commented articles" msgstr "Artigos mais comentados" -#: app/controllers/public/contact_controller.rb:11 -#: app/controllers/public/contact_controller.rb:12 +#: app/controllers/public/contact_controller.rb:13 +#: app/controllers/public/contact_controller.rb:14 msgid "Missing" msgstr "Faltando" -#: app/controllers/public/contact_controller.rb:14 +#: app/controllers/public/contact_controller.rb:16 msgid "Contact successfully sent" msgstr "Contato enviado com sucesso" -#: app/controllers/public/contact_controller.rb:17 +#: app/controllers/public/contact_controller.rb:19 msgid "Contact not sent" msgstr "Contato não enviado" @@ -3570,7 +3554,7 @@ msgstr "(sem posts)" msgid "Post a comment" msgstr "Enviar um comentário" -#: app/views/content_viewer/_comment_form.rhtml:27 +#: app/views/content_viewer/_comment_form.rhtml:28 msgid "e-mail" msgstr "e-mail" @@ -4171,7 +4155,7 @@ msgstr "Empreendimentos favoritos de %s" msgid "Contact %s" msgstr "Contactar %s" -#: app/views/contact/new.rhtml:17 +#: app/views/contact/new.rhtml:18 msgid "I want to receive a copy of the message in my e-mail." msgstr "Quero receber uma cópia da mensagem no meu e-mail." @@ -5512,39 +5496,39 @@ msgstr "" "sua senha, não crie uma nova conta, clique no link \"Eu esqueci minha " "senha!\". ;-)" -#: app/views/account/_signup_form.rhtml:24 +#: app/views/account/_signup_form.rhtml:25 msgid "This e-mail address will be used to contact you." msgstr "Este endereço de e-mail será usado para contactar você." -#: app/views/account/_signup_form.rhtml:29 +#: app/views/account/_signup_form.rhtml:30 msgid "Insert your login" msgstr "Insira seu login" -#: app/views/account/_signup_form.rhtml:39 +#: app/views/account/_signup_form.rhtml:40 msgid "Choose a password that you can remember easily." msgstr "Escolha uma senha fácil de ser lembrada por você." -#: app/views/account/_signup_form.rhtml:44 +#: app/views/account/_signup_form.rhtml:45 msgid "To confirm, repeat your password." msgstr "Para confirmar, repita sua senha." -#: app/views/account/_signup_form.rhtml:54 +#: app/views/account/_signup_form.rhtml:53 msgid "" "By clicking on 'I accept the terms of use' below you are agreeing to the %s" msgstr "" "Ao clicar em 'Eu aceito os termos de uso' abaixo você está concordando com " "os %s" -#: app/views/account/_signup_form.rhtml:61 +#: app/views/account/_signup_form.rhtml:60 msgid "Hide" msgstr "Esconder" -#: app/views/account/_signup_form.rhtml:65 +#: app/views/account/_signup_form.rhtml:64 msgid "I accept the terms of use" msgstr "Eu aceito os termos de uso" -#: app/views/account/_signup_form.rhtml:77 -#: app/views/account/_signup_form.rhtml:79 +#: app/views/account/_signup_form.rhtml:76 +#: app/views/account/_signup_form.rhtml:78 msgid "Sign up" msgstr "Registre-se" @@ -6536,6 +6520,24 @@ msgstr "Validação de Organização" msgid "Organization Info and settings" msgstr "Informações e Configurações da Comunidade" +#~ msgid "category" +#~ msgstr "categoria" + +#~ msgid "Slug" +#~ msgstr "Atalho" + +#~ msgid "Path" +#~ msgstr "Caminho" + +#~ msgid "Display color" +#~ msgstr "Cor de exibição" + +#~ msgid "Display in menu" +#~ msgstr "Mostrar no menu" + +#~ msgid "Children count" +#~ msgstr "Quantidade de filhos" + #~ msgid "Last updated" #~ msgstr "Última atualização" diff --git a/test/unit/image_test.rb b/test/unit/image_test.rb index 15442c5..9f1838d 100644 --- a/test/unit/image_test.rb +++ b/test/unit/image_test.rb @@ -9,4 +9,11 @@ class ImageTest < Test::Unit::TestCase end end + should 'match max_size in validates message of size field' do + image = Image.new(:filename => 'fake_filename.png') + image.valid? + + assert_match /#{Image.max_size.to_humanreadable}/, image.errors[:size] + end + end diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb index f094bed..6db7553 100644 --- a/test/unit/uploaded_file_test.rb +++ b/test/unit/uploaded_file_test.rb @@ -102,4 +102,11 @@ class UploadedFileTest < Test::Unit::TestCase file.destroy end + should 'match max_size in validates message of size field' do + up = UploadedFile.new(:filename => 'fake_filename.png') + up.valid? + + assert_match /#{UploadedFile.max_size.to_humanreadable}/, up.errors[:size] + end + end -- libgit2 0.21.2