en.yml in community_engine-3.0.0

- old
+ new

@@ -49,16 +49,12 @@
 
   greeting: "Hello %{name}"
 
   #en: a_few_seconds_ago:  a few seconds ago
   a_few_seconds_ago:  a few seconds ago
-  #en: about: About
-  about: About
   #en: about_me: About Me
   about_me: About Me
-  #en: about_site: About %{site}
-  about_site: "About %{site}"
   #en: about_you: About You
   about_you: About You
   #en: admin_pages: Pages
   admin_pages: Pages
   #en: accept: Accept
@@ -161,10 +157,12 @@
   are_you_sure_you_want_to_delete_this_post: "Are you sure you want to delete this post?"
   #en: are_you_sure_you_want_to_permanently_delete_this_comment: "Are you sure you want to permanently delete this comment?"
   are_you_sure_you_want_to_permanently_delete_this_comment: "Are you sure you want to permanently delete this comment?"
   #en: are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user?
   are_you_sure_you_want_to_permanently_delete_this_user: Are you sure you want to permanently delete this user?
+  #en: are_you_sure_you_want_to_permanently_delete_this_user_and_mark_as_spam: Are you sure you want to permanently delete this user and mark it as spam!?
+  are_you_sure_you_want_to_permanently_delete_this_user_and_mark_as_spam: Are you sure you want to permanently delete this user and mark it as spam!?
   #en: assume_id: Assume ID
   assume_id: Assume ID
   #en: assume_user_id: "Assume this user's ID"
   assume_user_id: "Assume this user's ID"
   #en: assign_role: Assign role
@@ -476,13 +474,13 @@
   #en: end_time: End time
   end_time: End time
   #en: enter_a_message: Enter a message
   enter_a_message: Enter a message
   #en: enter_e_mail_addresses: Enter e-mail addresses
-  enter_e_mail_addresses: Enter e-mail addresses
+  enter_e_mail_addresses: Enter email addresses
   #en: enter_e_mail_addresses_comma_sep: Enter e-mail addresses (comma-separated)
-  enter_e_mail_addresses_comma_sep: Enter e-mail addresses (comma-separated)
+  enter_e_mail_addresses_comma_sep: Enter email addresses (comma-separated)
   #en: enter_your_email_address: "Enter your email address"
   enter_your_email_address: "Enter your email address"
   #en: error: Error!
   error: Error!
   #en: estimated_total_for_this_month: Estimated total for this month
@@ -505,14 +503,10 @@
   expert_in: expert in
   #en: explore_site: Explore %{site}
   explore_site: "Explore %{site}"
   #en: failed: failed
   failed: failed
-  #en: faq: FAQ
-  faq: FAQ
-  #en: faq_section: FAQ section
-  faq_section: FAQ section
   #en: favorited: favorited
   favorited: favorited
   #en: favorites: Favorites
   favorites: Favorites
   #en: favorite_this: Favorite this
@@ -591,12 +585,10 @@
   tell_us_about_yourself: "Tell us about yourself"
   #en: upload_a_profile_photo: "Upload a profile photo"
   upload_a_profile_photo: "Upload a profile photo"
   #en: go: Go
   go: Go
-  #en: go2: Go
-  go2: Go
   #en: go_check_your_e_mail: Go check your e-mail!
   go_check_your_e_mail: Go check your e-mail!
   #en: go_to_the_forums: go to the forums
   go_to_the_forums: go to the forums
   #en: go_to_your_clippings_page_to_get_started: Go to your clippings page to get started.
@@ -745,14 +737,12 @@
   make_my_profile_public: Make my profile public
   #en: make_this_my_profile_photo: Make this my profile photo
   make_this_my_profile_photo: Make this my profile photo
   #en: male: Male
   male: Male
-  #en: manage: "Manage:"
-  manage: "Manage:"
-  #en: manage_my: "Manage my:"
-  manage_my: "Manage my:"
+  #en: manage: "Manage"
+  manage: "Manage"
   #en: manage_pages: Manage Pages
   manage_pages: Manage Pages
   #en: manage_posts: Manage Posts
   manage_posts: Manage Posts
   #en: medium: Medium
@@ -807,12 +797,10 @@
   monitored_topics: Monitored Topics
   #en: month: Month
   month: Month
   #en: more: More
   more: More
-  #en: more_about_you: More about you
-  more_about_you: More about you
   #en: most_active_1_month: Most active (1 month)
   most_active_1_month: Most active (1 month)
   #en: my_account: My Account
   my_account: My Account
   #en: my_blog: My Blog
@@ -839,10 +827,12 @@
   navigation_menu_text: Navigation menu text
   #en: need_some_help_contact_our: Need some help?  Check out our
   need_some_help_contact_our: Need some help?  Check out our
   #en: need_to_contact_us: Need to contact us?
   need_to_contact_us: Need to contact us?
+  #en: new: New1
+  new: New!
   #en: new_ad: New Ad
   new_ad: New Ad
   #en: new_category: New category
   new_category: New category
   #en: new_clipping: New clipping
@@ -859,12 +849,12 @@
   new_invitation_from: New Invitation from
   #en: new_metro_area: New Metro Area
   new_metro_area: New Metro Area
   #en: new_page: New Page
   new_page: New Page
-  #en: new_photo: New photo.
-  new_photo: New photo.
+  #en: new_photo: New photo
+  new_photo: New photo
   #en: new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader"
   new_photos_multiple_uploader: "New Photos &raquo; Multiple Uploader"
   #en: new_post: New post
   new_post: New post
   #en: new_post_for_category: New %{category}
@@ -975,12 +965,12 @@
   photos: Photos
   #en: plural_photos: %{count} Photos
   plural_photos:
     one: 1 Photo
     other: "%{count} Photos"
-  #en: photos_should_be_x_pixels: Photos should be 300x300 pixels.
-  photos_should_be_x_pixels: Photos should be 300x300 pixels.
+  #en: photos_should_be_x_pixels: Photos should be 300x200 pixels.
+  photos_should_be_x_pixels: Photos should be 300x200 pixels.
   #en: photos_tagged: Photos tagged
   photos_tagged: "Photos tagged"
   #en: photo_tip_1: Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions.
   photo_tip_1: "Photos show the world your creativity. Pick your best pics, and give them good titles and descriptions."
   #en: photo_tip_2: Use tags to organize your photos. Separate tags with commas.
@@ -1111,10 +1101,12 @@
   requested: requested
   #en: requested_friendship_with: Requested friendship with
   requested_friendship_with: Requested friendship with
   #en: requesting_friendship: Requesting friendship
   requesting_friendship: Requesting friendship
+  #en: friendship_request_failed
+  friendship_request_failed: Friendship request failed
   #en: required: required
   required: required
   #en: required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
   required_we_will_send_a_confirmation_e_mail_to_the_address_you_enter: "(Required: We will send a confirmation e-mail to the address you enter.)"
   #en: required_you_must_be_at_least_years_old_to_sign_up: "(Required: You must be at least %{min_age} years old to sign up.)"
@@ -1393,10 +1385,12 @@
   unactivated_users: Unactivated users
   #en: uncategorized: Uncategorized
   uncategorized: Uncategorized
   #en: update: Update
   update: Update
+  #en: update_comment: Update Comment
+  update_comment: Update Comment
   #en: update_rsvp: Update RSVP
   update_rsvp: Update RSVP
   #en: update_profile_and_tag_yourself: Update your profile and tag yourself
   update_profile_and_tag_yourself: Update your profile and tag yourself
   #en: update_your_profile: update your profile
@@ -1413,12 +1407,10 @@
   uploaded_a_photo: "uploaded a photo:"
   #en: uploaded_by: uploaded by
   uploaded_by: uploaded by
   #en: url: Url
   url: Url
-  #en: user_e_mail: "User e-mail:"
-  user_e_mail: "User e-mail:"
   #en: username: Username
   username: Username
   #en: user: User
   user: User
   #en: user_information: %{site} User information
@@ -1539,10 +1531,12 @@
   you_are_editing_your_profile: "You're editing your profile."
   #en: you_can_browse_all_content_and_users_on: You can browse all content and users on
   you_can_browse_all_content_and_users_on: You can browse all content and users on
   #en: you_cant_delete_that_user: You can't delete that user.
   you_cant_delete_that_user: You can't delete that user.
+  #en: you_cannot_make_an_administrator_a_moderator
+  you_cannot_make_an_administrator_a_moderator: You cannot make an administrator_a_moderator
   #en: you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
   you_can_select_up_to_5_files_at_a_time: You can select up to 5 files at a time.
   #en: you_could_tag_yourself: You could tag yourself
   you_could_tag_yourself: You could tag yourself
   #en: you_have_friends: You have %{count} friends
@@ -1585,12 +1579,10 @@
   you_must_vote_to_see_the_results: You must vote to see the resuts.
   #en: your_about_text_goes_here: Your About Text Goes Here
   your_about_text_goes_here: Your About Text Goes Here
   #en: your_account_has_been_activated: Your %{site} account has been activated!
   your_account_has_been_activated: "Your %{site} account has been activated!"
-  #en: your_faq_text_goes_here: Your FAQ text goes here.
-  your_faq_text_goes_here: Your FAQ text goes here.
   #en: your_changes_were_saved: Your changes were saved.
   your_changes_were_saved: Your changes were saved.
   #en:   your_password_reset_instructions_have_been_emailed_to_you: Instructions to reset your password have been emailed to you.
   your_password_reset_instructions_have_been_emailed_to_you: Instructions to reset your password have been emailed to you.
   #en: your_post_was_deleted: Your post was deleted.
@@ -1658,11 +1650,5 @@
   edit_album: "Edit album"
   #en; cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
   cancel_and_go_back_to_photo_manager: "Cancel and go back to photo manager"
   #en: back_to_photo_manager: "Back to photo manager"
   back_to_photo_manager: "Back to photo manager"
-  #en: photo_presence_error: "is not present."
-  photo_presence_error: "is not present."
-  #en: photo_content_type_error: "is not a supported image type."
-  photo_content_type_error: "is not a supported image type."
-  #en: photo_size_limit_error: "must be less than %{count}MB."
-  photo_size_limit_error: "must be less than %{count}MB."