fat_free_crm 0.12.3 → 0.13.0

data/config/locales/en-US.yml

@@ -1,182 +1,219 @@
-# US English translations for Ruby on Rails
-#
-# Use this as the base for the locale file of your language.
-
-"en-US":
+---
+en-US:
   date:
     formats:
-      default: "%Y-%m-%d"
-      short: "%b %d"
-      long: "%B %d, %Y"
-
-    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-
-    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
-    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
+      default: ! '%Y-%m-%d'
+      short: ! '%b %d'
+      long: ! '%B %d, %Y'
+    day_names:
+    - Sunday
+    - Monday
+    - Tuesday
+    - Wednesday
+    - Thursday
+    - Friday
+    - Saturday
+    abbr_day_names:
+    - Sun
+    - Mon
+    - Tue
+    - Wed
+    - Thu
+    - Fri
+    - Sat
+    month_names:
+    - 
+    - January
+    - February
+    - March
+    - April
+    - May
+    - June
+    - July
+    - August
+    - September
+    - October
+    - November
+    - December
+    abbr_month_names:
+    - 
+    - Jan
+    - Feb
+    - Mar
+    - Apr
+    - May
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Oct
+    - Nov
+    - Dec
     order:
-      - :year
-      - :month
-      - :day
-
+    - :year
+    - :month
+    - :day
   time:
     formats:
-      default: "%a, %d %b %Y %H:%M:%S %z"
-      short: "%d %b %H:%M"
-      long: "%B %d, %Y %H:%M"
-    am: "am"
-    pm: "pm"
-
+      default: ! '%a, %d %b %Y %H:%M:%S %z'
+      short: ! '%d %b %H:%M'
+      long: ! '%B %d, %Y %H:%M'
+    am: am
+    pm: pm
   support:
     array:
-      words_connector: ", "
-      two_words_connector: " and "
-      last_word_connector: ", and "
-
+      words_connector: ! ', '
+      two_words_connector: ! ' and '
+      last_word_connector: ! ', and '
     select:
-      prompt: "Please select"
-
+      prompt: Please select
   number:
     format:
-      separator: "."
-      delimiter: ","
+      separator: .
+      delimiter: ! ','
       precision: 3
       significant: false
       strip_insignificant_zeros: false
-
     currency:
       format:
-        format: "%u%n"
-        unit: "$"
-        separator: "."
-        delimiter: ","
+        format: ! '%u%n'
+        unit: $
+        separator: .
+        delimiter: ! ','
         precision: 2
         significant: false
         strip_insignificant_zeros: false
-
     percentage:
       format:
-        delimiter: ""
-
+        delimiter: ''
     precision:
       format:
-        delimiter: ""
-
+        delimiter: ''
     human:
       format:
-        delimiter: ""
+        delimiter: ''
         precision: 3
         significant: true
         strip_insignificant_zeros: true
       storage_units:
-        format: "%n %u"
+        format: ! '%n %u'
         units:
           byte:
-            one:   "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
+            one: Byte
+            other: Bytes
+          kb: KB
+          mb: MB
+          gb: GB
+          tb: TB
       decimal_units:
-        format: "%n %u"
+        format: ! '%n %u'
         units:
-          unit: ""
+          unit: ''
           thousand: Thousand
           million: Million
           billion: Billion
           trillion: Trillion
           quadrillion: Quadrillion
-
   datetime:
     distance_in_words:
-      half_a_minute: "half a minute"
+      half_a_minute: half a minute
       less_than_x_seconds:
-        one:   "less than 1 second"
-        other: "less than %{count} seconds"
+        one: less than 1 second
+        other: less than %{count} seconds
       x_seconds:
-        one:   "1 second"
-        other: "%{count} seconds"
+        one: 1 second
+        other: ! '%{count} seconds'
       less_than_x_minutes:
-        one:   "less than a minute"
-        other: "less than %{count} minutes"
+        one: less than a minute
+        other: less than %{count} minutes
       x_minutes:
-        one:   "1 minute"
-        other: "%{count} minutes"
+        one: 1 minute
+        other: ! '%{count} minutes'
       about_x_hours:
-        one:   "about 1 hour"
-        other: "about %{count} hours"
+        one: about 1 hour
+        other: about %{count} hours
       x_days:
-        one:   "1 day"
-        other: "%{count} days"
+        one: 1 day
+        other: ! '%{count} days'
       about_x_months:
-        one:   "about 1 month"
-        other: "about %{count} months"
+        one: about 1 month
+        other: about %{count} months
       x_months:
-        one:   "1 month"
-        other: "%{count} months"
+        one: 1 month
+        other: ! '%{count} months'
       about_x_years:
-        one:   "about 1 year"
-        other: "about %{count} years"
+        one: about 1 year
+        other: about %{count} years
       over_x_years:
-        one:   "over 1 year"
-        other: "over %{count} years"
+        one: over 1 year
+        other: over %{count} years
       almost_x_years:
-        one:   "almost 1 year"
-        other: "almost %{count} years"
+        one: almost 1 year
+        other: almost %{count} years
     prompts:
-      year:   "Year"
-      month:  "Month"
-      day:    "Day"
-      hour:   "Hour"
-      minute: "Minute"
-      second: "Seconds"
-
+      year: Year
+      month: Month
+      day: Day
+      hour: Hour
+      minute: Minute
+      second: Seconds
   helpers:
     select:
-      prompt: "Please select"
-
+      prompt: Please select
     submit:
-      create: 'Create %{model}'
-      update: 'Update %{model}'
-      submit: 'Save %{model}'
-
+      create: Create %{model}
+      update: Update %{model}
+      submit: Save %{model}
   errors:
-    format: "%{attribute} %{message}"
-
-    messages: &errors_messages
-      inclusion: "is not included in the list"
-      exclusion: "is reserved"
-      invalid: "is invalid"
-      confirmation: "doesn't match confirmation"
-      accepted: "must be accepted"
-      empty: "can't be empty"
-      blank: "can't be blank"
-      too_long: "is too long (maximum is %{count} characters)"
-      too_short: "is too short (minimum is %{count} characters)"
-      wrong_length: "is the wrong length (should be %{count} characters)"
-      not_a_number: "is not a number"
-      not_an_integer: "must be an integer"
-      greater_than: "must be greater than %{count}"
-      greater_than_or_equal_to: "must be greater than or equal to %{count}"
-      equal_to: "must be equal to %{count}"
-      less_than: "must be less than %{count}"
-      less_than_or_equal_to: "must be less than or equal to %{count}"
-      odd: "must be odd"
-      even: "must be even"
-
+    format: ! '%{attribute} %{message}'
+    messages:
+      inclusion: is not included in the list
+      exclusion: is reserved
+      invalid: is invalid
+      confirmation: doesn't match confirmation
+      accepted: must be accepted
+      empty: can't be empty
+      blank: can't be blank
+      too_long: is too long (maximum is %{count} characters)
+      too_short: is too short (minimum is %{count} characters)
+      wrong_length: is the wrong length (should be %{count} characters)
+      not_a_number: is not a number
+      not_an_integer: must be an integer
+      greater_than: must be greater than %{count}
+      greater_than_or_equal_to: must be greater than or equal to %{count}
+      equal_to: must be equal to %{count}
+      less_than: must be less than %{count}
+      less_than_or_equal_to: must be less than or equal to %{count}
+      odd: must be odd
+      even: must be even
   activerecord:
     errors:
       template:
         header:
-          one:    "1 error prohibited this %{model} from being saved"
-          other:  "%{count} errors prohibited this %{model} from being saved"
-        body: "There were problems with the following fields:"
-
+          one: 1 error prohibited this %{model} from being saved
+          other: ! '%{count} errors prohibited this %{model} from being saved'
+        body: ! 'There were problems with the following fields:'
       messages:
-        taken: "has already been taken"
-        record_invalid: "Validation failed: %{errors}"
-        <<: *errors_messages
-
+        inclusion: is not included in the list
+        exclusion: is reserved
+        invalid: is invalid
+        confirmation: doesn't match confirmation
+        accepted: must be accepted
+        empty: can't be empty
+        blank: can't be blank
+        too_long: is too long (maximum is %{count} characters)
+        too_short: is too short (minimum is %{count} characters)
+        wrong_length: is the wrong length (should be %{count} characters)
+        not_a_number: is not a number
+        not_an_integer: must be an integer
+        greater_than: must be greater than %{count}
+        greater_than_or_equal_to: must be greater than or equal to %{count}
+        equal_to: must be equal to %{count}
+        less_than: must be less than %{count}
+        less_than_or_equal_to: must be less than or equal to %{count}
+        odd: must be odd
+        even: must be even
+        taken: has already been taken
+        record_invalid: ! 'Validation failed: %{errors}'
       full_messages:
-        format: "%{attribute} %{message}"
+        format: ! '%{attribute} %{message}'

data/config/locales/en-US_fat_free_crm.yml

@@ -1,16 +1,18 @@
+---
 en-US:
   language: English
 
   # Generic terms.
   #----------------------------------------------------------------------------
+  id: Id
   all: All
   at: at
   here: here
   no_button: 'No'
   not_implemented: Not implemented yet.
   or: or
-  select_none: '-- None --'
-  select_blank: '-- Select --'
+  select_none: -- None --
+  select_blank: -- Select --
   yes_button: 'Yes'
 
 
@@ -20,37 +22,31 @@ en-US:
   tab_tasks: Tasks
   tab_campaigns: Campaigns
   tab_leads: Leads
-
   tab_accounts: Accounts
   tab_contacts: Contacts
   tab_opportunities: Opportunities
   tab_team: Team
-
   admin_tab_groups: Groups
   admin_tab_users: Users
   admin_tab_fields: Custom Fields
   admin_tab_tags: Tags
   admin_tab_settings: Settings
   admin_tab_plugins: Plugins
-
   affiliate: Affiliate
   competitor: Competitor
   customer: Customer
   partner: Partner
   reseller: Reseller
   vendor: Vendor
-
   planned: Planned
   started: Started
   on_hold: On Hold
   completed: Completed
   called_off: Called Off
-
   new: New
   contacted: Contacted
   converted: Converted
   rejected: Rejected
-
   cold_call: Cold Call
   conference: Conference
   online: Online Marketing
@@ -59,7 +55,6 @@ en-US:
   web: Website
   word_of_mouth: Word of Mouth
   other: Other
-
   prospecting: Prospecting
   analysis: Analysis
   presentation: Presentation
@@ -68,16 +63,13 @@ en-US:
   final_review: Final Review
   won: Closed/Won
   lost: Closed/Lost
-
   call: Call
   email: Email
   follow_up: Follow-up
   lunch: Lunch
   meeting: Meeting
   money: Money
-  presentation: Presentation
   trip: Trip
-
   overdue: Overdue
   due_asap: As Soon As Possible
   due_today: Today
@@ -86,7 +78,6 @@ en-US:
   due_next_week: Next Week
   due_later: Sometime Later
   due_specific_date: On Specific Date...
-
   completed_today: Today
   completed_yesterday: Yesterday
   completed_last_week: Last week
@@ -116,58 +107,58 @@ en-US:
         account:
           attributes:
             name:
-              missing_account_name: "^Please specify account name."
+              missing_account_name: ^Please specify account name.
             access:
-              share_account: "^Please specify users to share the account with."
+              share_account: ^Please specify users to share the account with.
         campaign:
           attributes:
             name:
-              missing_campaign_name: "^Please specify campaign name."
+              missing_campaign_name: ^Please specify campaign name.
             ends_on:
-              dates_not_in_sequence: "^Please make sure the campaign end date is after the start date."
+              dates_not_in_sequence: ^Please make sure the campaign end date is after
+                the start date.
             access:
-              share_campaign: "^Please specify users to share the campaign with."
+              share_campaign: ^Please specify users to share the campaign with.
         contact:
           attributes:
             first_name:
-              missing_first_name: "^Please specify first name."
+              missing_first_name: ^Please specify first name.
             last_name:
-              missing_last_name: "^Please specify last name."
+              missing_last_name: ^Please specify last name.
             access:
-              share_contact: "^Please specify users to share the contact with."
+              share_contact: ^Please specify users to share the contact with.
         lead:
           attributes:
             first_name:
-              missing_first_name: "^Please specify first name."
+              missing_first_name: ^Please specify first name.
             last_name:
-              missing_last_name: "^Please specify last name."
+              missing_last_name: ^Please specify last name.
             access:
-              share_lead: "^Please specify users to share the lead with."
+              share_lead: ^Please specify users to share the lead with.
         opportunity:
           attributes:
             name:
-              missing_opportunity_name: "^Please specify opportunity name."
+              missing_opportunity_name: ^Please specify opportunity name.
             access:
-              share_opportunity: "^Please specify users to share the opportunity with."
+              share_opportunity: ^Please specify users to share the opportunity with.
         task:
           attributes:
             name:
-              missing_task_name: "^Please specify task name."
+              missing_task_name: ^Please specify task name.
             calendar:
-              invalid_date: "^Please specify valid date."
+              invalid_date: ^Please specify valid date.
         user:
           attributes:
             username:
-              missing_username: "^Please specify username."
-              username_taken: "^This username is already taken."
+              missing_username: ^Please specify username.
+              username_taken: ^This username is already taken.
             email:
-              missing_email: "^Please specify email address."
-              email_in_use: "^There is another user with the same email."
+              missing_email: ^Please specify email address.
+              email_in_use: ^There is another user with the same email.
         custom_field:
-          required: "^%{field} is required."
-          maxlength: "^%{field} is too long."
-          endbeforestart: "^%{field} cannot end before it begins."
-
+          required: ^%{field} is required.
+          maxlength: ^%{field} is too long.
+          endbeforestart: ^%{field} cannot end before it begins.
     attribute_options:
       opportunity:
         stage:
@@ -179,27 +170,38 @@ en-US:
           final_review: Final Review
           won: Closed/Won
           lost: Closed/Lost
+      account:
+        rating:
+          "0": "-"
+          "1": "★"
+          "2": "★★"
+          "3": "★★★"
+          "4": "★★★★"
+          "5": "★★★★★"
 
   msg_account_suspended: User account has been suspended.
   password_reset_instruction: password reset instructions
 
   # Controllers.
   #----------------------------------------------------------------------------
-  msg_account_created: Your account has been created and is awaiting approval by the system administrator.
+  msg_account_created: Your account has been created and is awaiting approval by the
+    system administrator.
   msg_account_not_approved: Your account has not been approved yet.
-  msg_asset_deleted: "%{value} has been deleted."
+  msg_asset_deleted: ! '%{value} has been deleted.'
   msg_asset_not_available: This %{value} is no longer available.
-  msg_not_authorized: You are not authorized to take this action.
+  msg_asset_not_authorized: You are not authorized to view this %{value}.
   msg_assets_not_available: The %{value} are not available.
-  msg_asset_rejected: "%{value} has been rejected."
-  msg_bad_image_file: "^Could't upload or resize the image file you specified."
-  msg_cant_create_related: "Can't create the %{asset} since the %{related} is no longer available."
-  msg_cant_delete_user: "^Couldn't delete the user since %{value} has related assets present."
-  msg_cant_do: "Can't %{action} the %{asset} since it's no longer available."
+  msg_asset_rejected: ! '%{value} has been rejected.'
+  msg_bad_image_file: ^Could't upload or resize the image file you specified.
+  msg_cant_create_related: Can't create the %{asset} since the %{related} is no longer
+    available.
+  msg_cant_delete_user: ^Couldn't delete the user since %{value} has related assets
+    present.
+  msg_cant_do: Can't %{action} the %{asset} since it's no longer available.
   msg_email_not_found: No user was found with that email address.
   msg_enter_new_password: Please enter your new password.
   msg_goodbye: You have been logged out. Thank you for using Fat Free CRM!
-  msg_invalid_password: "^Please specify valid current password"
+  msg_invalid_password: ^Please specify valid current password
   msg_invalig_login: Invalid username or password.
   msg_last_login: Your last login was on %{value}.
   msg_login_needed: You must be logged in to access this page.
@@ -207,15 +209,17 @@ en-US:
   msg_password_changed: Your password has been changed.
   msg_password_not_changed: Your password has not been changed.
   msg_password_updated: Password was successfully updated.
-  msg_pwd_instructions_sent: Instructions to reset your password have been sent to you. Please check your email.
+  msg_pwd_instructions_sent: Instructions to reset your password have been sent to
+    you. Please check your email.
   msg_require_admin: You must be Administrator to access this page.
   msg_successful_signup: Successful signup, welcome to Fat Free CRM!
   msg_welcome: Welcome to Fat Free CRM!
 
   # Options.
   #----------------------------------------------------------------------------
-  "option_amount*probability": weighted amount
-  activity_options: Show %{models} %{action_type} performed by %{user} in the past %{period}.
+  option_amount*probability: weighted amount
+  activity_options: Show %{models} %{action_type} performed by %{user} in the past
+    %{period}.
   all_users: all users
   option_after: after
   option_all: all
@@ -241,10 +245,9 @@ en-US:
   option_updated_at: date updated
   show_per_page: Show %{number} %{models} per page using %{fmt} format.
   sort_by: Sort by %{field}
-  sort_by_displaying: Sort %{models} by %{field} displaying first name %{position} last name.
-  entities_per_page: "%{entity} per page:"
-
-  # Views -> Switcher
+  sort_by_displaying: Sort %{models} by %{field} displaying first name %{position}
+    last name.
+  entities_per_page: ! '%{entity} per page:'
   contacts_index_long: Long format
   contacts_index_brief: Brief format
   contacts_index_full: Full format
@@ -264,12 +267,12 @@ en-US:
   contact_info: Contact Information
   current_password: Current password
   edit_profile: Edit Profile
-  # email: Email # <-- Already defined as the task type if Settings.
   first_name: First name
   google: Google IM
   gravatar_help: Not familiar with Gravatars? Learn about Gravatars
   image_file: Image file
-  image_help: The image file you upload will be automatically resized to 75 x 75 pixels. Supported formats are GIF, JPG, and PNG.
+  image_help: The image file you upload will be automatically resized to 75 x 75 pixels.
+    Supported formats are GIF, JPG, and PNG.
   job_title: Title
   last_name: Last name
   login_now_link: Login Now!
@@ -334,8 +337,8 @@ en-US:
   shipping_address: Shipping address
   total_accounts: Total Accounts
   website: Website
-  account_with_title_department: %{title}, %{department} at %{account}
-  account_with_title: %{title} at %{account}
+  account_with_title_department: ! '%{title}, %{department} at %{account}'
+  account_with_title: ! '%{title} at %{account}'
 
   # Views -> Campaigns.
   #----------------------------------------------------------------------------
@@ -354,7 +357,7 @@ en-US:
   campaigns_small: campaigns
   conversion: Conversion
   conversion_label: Conversion (%)
-  conversion_number: "%{value} conversion"
+  conversion_number: ! '%{value} conversion'
   target_conversion: Targe conversion
   create_campaign: Create Campaign
   end_date: End date
@@ -363,11 +366,13 @@ en-US:
   no_start_date: no start date specified
   number_of_leads: Number of leads
   objectives: Objectives
-  objectives_help: Please specify target number of leads, expected leads-to-opportunities conversion ratio, target revenue, and campaign budget. These numbers will let you track actual campaign performance.
+  objectives_help: Please specify target number of leads, expected leads-to-opportunities
+    conversion ratio, target revenue, and campaign budget. These numbers will let
+    you track actual campaign performance.
   objectives_small: campaign objectives
   revenue: Revenue
   revenue_label: Revenue ($)
-  revenue_number: "%{value} in revenue"
+  revenue_number: ! '%{value} in revenue'
   save_campaign: Save Campaign
   start_date: Start date
   started_ago: started %{value} ago
@@ -391,29 +396,31 @@ en-US:
   contact_summary: Contact Summary
   create_contact: Create Contact
   department: Department
-  department_small: '%{value} department'
+  department_small: ! '%{value} department'
   do_not_call: Do not call
   extra_info: Extra Information
   extra_info_small: extra contact
   facebook: Facebook
   linked_in: LinkedIn
   myself: Myself
-  permissions_intro_private: By default only you will have access to the %{value}. You can change permissions later.
-  permissions_intro_public: By default all users will have access to the %{value}. You can change permissions later.
-  permissions_intro_shared: By default only the selected users will have access to the %{value}. You can change permissions later.
+  permissions_intro_private: By default only you will have access to the %{value}.
+    You can change permissions later.
+  permissions_intro_public: By default all users will have access to the %{value}.
+    You can change permissions later.
+  permissions_intro_shared: By default only the selected users will have access to
+    the %{value}. You can change permissions later.
   referred_by: Referred by
   referred_by_small: referred by
   save_contact: Save Contact
-  skype: Skype
   twitter: Twitter
   unassigned: Unassigned
   web_presence: Web Presence
   web_presence_small: web presence
-  works_at: "%{job_title} at %{company}"
+  works_at: ! '%{job_title} at %{company}'
   general_info: General Information
   show_general_info_small: Show general information for this contact.
   show_extra_info_small: Show extra information for this contact.
-  tag_details: %{tag} Details
+  tag_details: ! '%{tag} Details'
   show_tag_info_small: Show %{tag} information for this contact.
   shared_with_everyone: Shared with everyone
   title: Title
@@ -423,15 +430,23 @@ en-US:
   #----------------------------------------------------------------------------
   convert: Convert
   convert_lead: Convert Lead
-  convert_lead_permissions_intro: Contact permissions will be copied from the lead being converted. You can change contact permissions later.
-  convert_lead_text: By converting the lead %{value} will become a contact associated with the existing or newly created account. Lead status will be automatically set to converted.
+  convert_lead_permissions_intro: Contact permissions will be copied from the lead
+    being converted. You can change contact permissions later.
+  convert_lead_text: By converting the lead %{value} will become a contact associated
+    with the existing or newly created account. Lead status will be automatically
+    set to converted.
   create_lead: Create Lead
-  create_opp_for_contact: You can optionally create an opportunity for the %{value} contact by specifying the name, current stage, estimated closing date, sale probability, amount of the deal, and the discount offered.
+  create_opp_for_contact: You can optionally create an opportunity for the %{value}
+    contact by specifying the name, current stage, estimated closing date, sale probability,
+    amount of the deal, and the discount offered.
   lead: Lead
   lead_info_small: lead contact
-  lead_permissions_intro_private: By default permissions will be copied from the campaign or set to private. You can change lead permissions later.
-  lead_permissions_intro_public: By default permissions will be copied from the campaign or set to public. You can change lead permissions later.
-  lead_permissions_intro_shared: By default permissions will be copied from the campaign or shared with the specified users. You can change lead permissions later.
+  lead_permissions_intro_private: By default permissions will be copied from the campaign
+    or set to private. You can change lead permissions later.
+  lead_permissions_intro_public: By default permissions will be copied from the campaign
+    or set to public. You can change lead permissions later.
+  lead_permissions_intro_shared: By default permissions will be copied from the campaign
+    or shared with the specified users. You can change lead permissions later.
   lead_small: lead
   lead_status_small: lead status
   lead_summary: Lead Summary
@@ -475,7 +490,8 @@ en-US:
   opportunity_small: opportunity
   opportunity_stages: Opportunity Stages
   opportunity_summary: Opportunity At a Glance
-  opportunity_summary_text: "%{amount} with %{discount} discount and %{probability} probability"
+  opportunity_summary_text: ! '%{amount} with %{discount} discount and %{probability}
+    probability'
   past_due: past due, was expected to close %{value} ago
   probability: Probability
   probability_number: and %{value} probability
@@ -501,13 +517,13 @@ en-US:
   due: Due
   feel_free: Feel free to
   move_to: move to
-  no_tasks: "You don't have any %{value} tasks"
+  no_tasks: You don't have any %{value} tasks
   no_tasks_pending: pending
   no_tasks_assigned: assigned
   no_tasks_completed: completed
   pending_tab: Pending
   pending_tasks: Pending Tasks
-  related: 're:'
+  related: ! 're:'
   save_task: Save Task
   task_assigned: The task has been assigned to %{value}
   task_assigned_to: and assigned to %{value}
@@ -562,8 +578,7 @@ en-US:
   update_past_participle: Updates
   destroy_past_participle: Deletions
   all_events_past_participle: Activities
-  action_create_comment: "- &quot;%{comment}&quot;"
-
+  action_create_comment: ! '- &quot;%{comment}&quot;'
   my_tasks: My Tasks
   no_task_records: You have no tasks.
   my_opportunities: My Opportunities
@@ -578,23 +593,23 @@ en-US:
   save_note: Save Note
   add_note_help: Add a new note...
   edit_note: Edit Note
-  added_ago: added %{value} ago
-  added_by: added %{time_ago} ago by %{user}
+  added_ago: added %{value}
+  added_by: added %{time_ago} by %{user}
   back: Back
   cancel: Cancel
   close_form: Close form
   comment_intro: You can add comments later.
   confirm_delete: Are you sure you want to delete this %{value}?
   copy_permissions: Copy %{value} permissions
-  could_not_find: "Couldn't find any %{value}. Feel free to"
-  could_not_find_matching: "Couldn't find any %{value} matching"
+  could_not_find: Couldn't find any %{value}. Feel free to
+  could_not_find_matching: Couldn't find any %{value} matching
   create_new: create new
   create_a_new: create a new
   select_existing: select existing
   delete: Delete
   discard: Discard
   edit: Edit
-  items_total: '%{count} total.'
+  items_total: ! '%{count} total.'
   less: Less...
   me: me
   more: More...
@@ -611,11 +626,11 @@ en-US:
   select_task: Select Task
   select_opportunity: Select Opportunity
   search_assets: Search %{value}
-  time_ago: "%{value} ago"
+  time_ago: ! '%{value} ago'
   background_info: Background
   address: Address
-  street1: Street 1 # NEW
-  street2: Street 2 # NEW
+  street1: Street 1
+  street2: Street 2
   city: City
   zipcode: Zip Code
   state: State
@@ -636,7 +651,8 @@ en-US:
   about_ffc_version: Fat Free CRM version
   about_home_page: Home page
   about_project_page: Project page
-  about_thank_you: Thank you for using Fat Free CRM! We appreciate your business and hope you enjoy using the software.
+  about_thank_you: Thank you for using Fat Free CRM! We appreciate your business and
+    hope you enjoy using the software.
   about_twitter: Twitter commit updates
   about_user_group: Discussion group for users
   admin: Admin
@@ -662,15 +678,16 @@ en-US:
   notifications_tooltip: Subscribers will receive new comments via email
   subscribe_via_email: Subscribe via email
   disable_email_subscriptions: Disable email subscription
+  added_note: added note %{value}
 
   # Views -> Emails.
   #----------------------------------------------------------------------------
-  email: Email
 
   # Views -> Passwords.
   #----------------------------------------------------------------------------
   confirm_password_intro: Please type your new password and then confirm it.
-  password_intro: Please specify your email address, and the instructions to reset your password will be sent to you.
+  password_intro: Please specify your email address, and the instructions to reset
+    your password will be sent to you.
   reset_password: Reset Password
   update_password_and_login: Update Password and Login
 
@@ -687,13 +704,15 @@ en-US:
   groups: Groups
   groups_small: groups
   group_small: group
-  confirm_group_delete: Are you sure you wish to delete this group? There are %{count} items that still reference it.
 
   # Views -> Admin -> Users
   #----------------------------------------------------------------------------
+  confirm_group_delete: Are you sure you wish to delete this group? There are %{count}
+    items that still reference it.
   approve: Approve
   create_user: Create User
   last_seen: last seen %{value} ago
+  last_seen2: last seen %{value}
   personal_information: Personal Information
   group_memberships: Group Memberships
   reactivate: Reactivate
@@ -704,7 +723,7 @@ en-US:
   user_awaits_approval: awaits your approval
   user_confirm_delete: A user can only be deleted if no related assets are left behind.
   user_is_admin: The user is Administrator
-  user_never_logged_in: "hasn't logged in yet"
+  user_never_logged_in: hasn't logged in yet
   user_signed_up: Signed Up
   user_signed_up_on: signed up on %{value}
   user_since: user since %{value}
@@ -717,12 +736,12 @@ en-US:
   #----------------------------------------------------------------------------
   versions: History
   version:
-    create: %{item} created by %{by}
-    update: %{item} modified by %{by}
-    destroy: %{item} destroyed by %{by}
-    set_html: %{attr} set to %{to}
-    unset_html: %{attr} unset
-    change_html: %{attr} changed from %{from} to %{to}
+    create: ! '%{item} created by %{by}'
+    update: ! '%{item} modified by %{by}'
+    destroy: ! '%{item} destroyed by %{by}'
+    set_html: ! '%{attr} set to %{to}'
+    unset_html: ! '%{attr} unset'
+    change_html: ! '%{attr} changed from %{from} to %{to}'
     anonymous: anonymous
   account_contact_id: Account id
   account_contact_name: Account name
@@ -749,67 +768,66 @@ en-US:
   # Comment Inbox
   #----------------------------------------------------------------------------
   comment_notification:
-    intro: "%{user_full_name} commented on %{entity_type}: %{entity_name}"
-    reply_instructions: "Reply to this email directly to add a new comment, or view the %{entity} online"
+    intro: ! '%{user_full_name} commented on %{entity_type}: %{entity_name}'
+    reply_instructions: Reply to this email directly to add a new comment, or view
+      the %{entity} online
 
   # Lists
   #----------------------------------------------------------------------------
-  lists: Lists
+  global_lists: Global lists
+  personal_lists: My lists
   list: List
   no_saved_lists: No saved lists
   make_current_view_list: Make current view a list
-  list_name_info: If you use the name of an existing list, you will overwrite that list with your current settings
+  list_name_info: If you use the name of an existing list, you will overwrite that
+    list with your current settings
 
   # Pluralizations.
   #----------------------------------------------------------------------------
   pluralize:
     comment:
-      one: '1 comment'
-      other: '%{count} comments'
+      one: 1 comment
+      other: ! '%{count} comments'
     contact:
-      one: '1 contact'
-      other: '%{count} contacts'
+      one: 1 contact
+      other: ! '%{count} contacts'
     opportunity:
-      one: '1 opportunity'
-      other: '%{count} opportunities'
+      one: 1 opportunity
+      other: ! '%{count} opportunities'
     lead:
-      one: '1 lead'
-      other: '%{count} leads'
+      one: 1 lead
+      other: ! '%{count} leads'
     day:
-      one: '1 day'
-      other: '%{count} days'
+      one: 1 day
+      other: ! '%{count} days'
     login:
-      one: '1 login'
-      other: '%{count} logins'
+      one: 1 login
+      other: ! '%{count} logins'
 
   # Custom date/time formats.
   #----------------------------------------------------------------------------
   date:
     formats:
-      mmddyyyy: "%m/%d/%Y"
-      mmdd: "%b %e"
-      mmddyy: "%b %e, %Y"
-
+      mmddyyyy: ! '%m/%d/%Y'
+      mmdd: ! '%b %e'
+      mmddyy: ! '%b %e, %Y'
   time:
     formats:
-      mmddhhss: "%b %e at %l:%M%p"
-      mmddyyyy_hhmm: "%e %b %Y at %l:%M%p"
+      mmddhhss: ! '%b %e at %l:%M%p'
+      mmddyyyy_hhmm: ! '%e %b %Y at %l:%M%p'
 
   # will_paginate translations copied for 'en-US'
   #----------------------------------------------------------------------------
   will_paginate:
-    previous_label: "&#8592; Previous"
-    next_label: "Next &#8594;"
-    page_gap: "&hellip;"
-
+    previous_label: ! '&#8592; Previous'
+    next_label: Next &#8594;
+    page_gap: ! '&hellip;'
     page_entries_info:
       single_page:
-        zero: "No %{plural} found"
-        one: "Displaying 1 %{name}"
-        other: "Displaying all %{count} %{plural}"
-
-      multi_page: "Displaying %{plural} %{from} - %{to} of %{total} in total"
-
+        zero: No %{plural} found
+        one: Displaying 1 %{name}
+        other: Displaying all %{count} %{plural}
+      multi_page: Displaying %{plural} %{from} - %{to} of %{total} in total
 
   # Views -> Admin -> Custom Fields
   #----------------------------------------------------------------------------
@@ -821,40 +839,41 @@ en-US:
   create_field_group: Create field group
   edit_field_group: Edit field group
   save_field_group: Save field group
-
   field_group_empty: There are no fields in this group.
-
   select_or_create_tags: Select some tags, or create a new tag by pressing 'enter'.
-
-  restrict_by_tag: 'Restrict by Tag:'
+  restrict_by_tag: ! 'Restrict by Tag:'
   restrict_by_tag_info: (Only show fields for %{assets} that are tagged with the following)
   field_group_tag_restriction: This field group applies to %{assets} tagged with "%{tag}"
   field_group_unrestricted: This field group applies to all %{assets}
-  field_group_confirm_delete: If a field group is deleted, any fields will be moved to the default field group.
+  field_group_confirm_delete: If a field group is deleted, any fields will be moved
+    to the default field group.
   msg_cant_delete_field_group: Field Group could not be deleted.
+  admin_fields_info: ! 'Custom fields are displayed in groups.
 
-  admin_fields_info: |
-    Custom fields are displayed in groups.
     Create a new field group, or add fields to one of the groups below.<br />
-    You can drag and drop fields to change their display order or move them between field groups.
 
-  admin_fields_info2: |
-    It is strongly recommended you restart your server after adding or removing any custom field.
+    You can drag and drop fields to change their display order or move them between
+    field groups.
 
+'
   # Views -> Admin -> Tags
   #----------------------------------------------------------------------------
+  admin_fields_info2: ! 'It is strongly recommended you restart your server after
+    adding or removing any custom field.
+
+'
   tags: Tags
   tag_small: tag
   tagged: Tagged
   create_tag: Create Tag
   save_tag: Save Tag
   field_group_tags: Field Groups shown for this Tag
-  tag_with_taggings_confirm_delete: "If this tag is deleted, it will be removed from %{value} records."
-  msg_cant_delete_tag: "Couldn't delete '%{value}' since it has associated Field Groups."
-
 
   # Views -> Admin -> Plugins
   #----------------------------------------------------------------------------
+  tag_with_taggings_confirm_delete: If this tag is deleted, it will be removed from
+    %{value} records.
+  msg_cant_delete_tag: Couldn't delete '%{value}' since it has associated Field Groups.
   views:
     admin:
       plugins:
@@ -868,67 +887,54 @@ en-US:
     yes: 'Yes'
     no: 'No'
     required:
-      text: 'required'
-      mark: '*'
+      text: required
+      mark: ! '*'
       # You can uncomment the line below if you need to overwrite the whole required html.
       # When using html, text and mark won't be used.
       # html: '<abbr title="required">*</abbr>'
     error_notification:
-      default_message: "Some errors were found, please take a look:"
-    # Labels and hints examples
-    # labels:
-    #   password: 'Password'
-    #   user:
-    #     new:
-    #       email: 'E-mail para efetuar o sign in.'
-    #     edit:
-    #       email: 'E-mail.'
-    # hints:
-    #   username: 'User name to sign in.'
-    #   password: 'No special characters, please.'
-
+      default_message: ! 'Some errors were found, please take a look:'
 
   # Form field types
   #----------------------------------------------------------------------------
   field_types:
     string:
-      title:     Short Answer
+      title: Short Answer
     text:
-      title:     Long Answer
+      title: Long Answer
     select:
-      title:     Select List
+      title: Select List
     multiselect:
-      title:     Multi Select
+      title: Multi Select
     radio:
-      title:     Radio Buttons
+      title: Radio Buttons
     boolean:
-      title:     Checkbox
+      title: Checkbox
     check_boxes:
-      title:     Checkbox List
+      title: Checkbox List
     date:
-      title:     Date
+      title: Date
     date_pair:
-      title:     Date Pair
+      title: Date Pair
     datetime:
-      title:     Date & Time
+      title: Date & Time
     datetime_pair:
-      title:     Date & Time Pair
+      title: Date & Time Pair
     email:
-      title:     Email Address
+      title: Email Address
     url:
-      title:     URL
+      title: URL
     tel:
-      title:     Phone Number
+      title: Phone Number
     decimal:
-      title:     Number (Decimal)
+      title: Number (Decimal)
     integer:
-      title:     Number (Integer)
+      title: Number (Integer)
     float:
-      title:     Number (Floating Point)
-
+      title: Number (Floating Point)
   pair:
-    start:       Start
-    end:         End
-    from_to:     From %{from} to %{to}
-    from_only:   From %{from}
-    to_only:     Until %{to}
+    start: Start
+    end: End
+    from_to: From %{from} to %{to}
+    from_only: From %{from}
+    to_only: Until %{to}