fat_free_crm 0.13.4 → 0.13.5

data/README.md

@@ -44,13 +44,14 @@ contact lists, and opportunity tracking.
   </tr>
 </table>
 
-Active development started in November 2008.
-New features, enhancements, and updates appear on regular basis.
-
 Pull requests and bug reports are always welcome!
 
 Visit our website at http://www.fatfreecrm.com/
 
+## Rails 4 support
+
+Currently, the master branch and gem releases of Fat Free CRM run on Rails 3.2 However, we are in the midst of upgrading to Rails 4.2, please see the [rails4](https://github.com/fatfreecrm/fat_free_crm/tree/rails4) branch. If you're a developer, you're welcome to check that code out, search for bugs and file them in the issue tracker using the [rails4](https://github.com/fatfreecrm/fat_free_crm/labels/rails4) label.
+
 ## Important security note
 
 Please note that several severe vulnerabilities have been fixed recently. You should upgrade to versions 0.12.3 or 0.13.2 or higher. See the [**security vulnerabilities**](https://github.com/fatfreecrm/fat_free_crm/wiki/Security) page for more details.
@@ -58,6 +59,7 @@ Please note that several severe vulnerabilities have been fixed recently. You sh
 ## System Requirements
 
 * Ruby 2.1 (or 2.0) recommended (it's much faster!)
+  * Ruby 2.2 is not officially supported, but [reported to work for MySQL users](https://github.com/fatfreecrm/fat_free_crm/issues/362)
   * Ruby 1.9.3 is also compatible
   * Ruby 1.9.2 should be compatible but is not longer supported
   * Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
@@ -150,4 +152,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/assets/javascripts/crm.js.coffee

@@ -164,7 +164,10 @@
       if value is "specific_time"
         $("#task_bucket").toggle() # Hide dropdown.
         $("#task_calendar").toggle() # Show editable date field.
-        $("#task_calendar").datepicker().focus() # Focus to invoke calendar popup.
+        $("#task_calendar").datepicker({
+          showOn: 'focus',
+          changeMonth: true,
+          dateFormat: 'yy-mm-dd'}).focus() # Focus to invoke calendar popup.
 
 
     #----------------------------------------------------------------------------

data/app/assets/javascripts/crm_select2.js.coffee

@@ -10,10 +10,12 @@
   window.crm ||= {}
 
   crm.make_select2 = ->
-    $(".select2").each ->
+    $(".select2").not(".select2-container, .select2-offscreen").each ->
+    #$(".select2").each ->
       $(this).select2 'width':'resolve'
 
-    $(".select2_tag").each ->
+    $(".select2_tag").not(".select2-container, .select2-offscreen").each ->
+    #$(".select2_tag").each ->
       $(this).select2
         'width':'resolve'
         tags: $(this).data("tags")

data/app/controllers/users_controller.rb

@@ -129,7 +129,7 @@ class UsersController < ApplicationController
   #----------------------------------------------------------------------------
   def opportunities_overview
     @users_with_opportunities = User.have_assigned_opportunities.order(:first_name)
-    @unassigned_opportunities = Opportunity.unassigned.pipeline.order(:stage)
+    @unassigned_opportunities = Opportunity.my.unassigned.pipeline.order(:stage)
   end
 
 end

data/app/helpers/application_helper.rb

@@ -404,17 +404,26 @@ module ApplicationHelper
   end
 
   # Create a column in the 'asset_attributes' table.
+  # If a block is given, render it inside the td
   #----------------------------------------------------------------------------
-  def col(title, value, last = false, email = false)
-    # Parse and format urls as links.
-    fmt_value = (value.to_s || "").gsub("\n", "<br />")
-    fmt_value = if email
+  def col(title, value = nil, last = false, email = false, &block)
+    last_class = (last ? 'last' : nil)
+    out = content_tag(:th, title, class: last_class)
+    if block_given?
+      out << content_tag(:td, class: last_class) do
+        yield
+      end
+    else
+      # Parse and format urls as links.
+      fmt_value = (value.to_s || "").gsub("\n", "<br />")
+      fmt_value = if email
         link_to_email(fmt_value)
       else
         fmt_value.gsub(/((http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:\/\+#]*[\w\-\@?^=%&amp;\/\+#])?)/, "<a href=\"\\1\">\\1</a>")
       end
-    last_class = (last ? 'last' : nil)
-    content_tag(:th, title, class: last_class) + content_tag(:td, fmt_value, class: last_class)
+      out << content_tag(:td, fmt_value, class: last_class)
+    end
+    out
   end
 
   #----------------------------------------------------------------------------

data/app/helpers/tags_helper.rb

@@ -8,7 +8,7 @@ module TagsHelper
   # Generate tag links for use on asset index pages.
   #----------------------------------------------------------------------------
   def tags_for_index(model)
-    model.tag_list.inject([]) do |arr, tag|
+    model.tag_list.inject("".html_safe) do |out, tag|
       query = controller.send(:current_query) || ""
       hashtag = "##{tag}"
       if query.empty?
@@ -16,8 +16,8 @@ module TagsHelper
       elsif !query.include?(hashtag)
         query += " #{hashtag}"
       end
-      arr << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", :title => tag)
-    end.join(" ").html_safe
+      out << link_to_function(tag, "crm.search_tagged('#{query}', '#{model.class.to_s.tableize}')", :title => tag)
+    end
   end
 
   def tags_for_dashboard(model)

data/app/mailers/user_mailer.rb

@@ -27,7 +27,7 @@ class UserMailer < ActionMailer::Base
   private
 
   def from_address
-    from = Setting.smtp[:from]
+    from = (Setting.smtp || {})[:from]
     !from.blank? ? from : "Fat Free CRM <noreply@fatfreecrm.com>"
   end
 

data/app/models/setting.rb

@@ -98,7 +98,7 @@ class Setting < ActiveRecord::Base
 
     # Loads settings from YAML files
     def load_settings_from_yaml(file)
-      settings = YAML.load_file(file)
+      settings = YAML.load(ERB.new(File.read(file)).result)
       @@yaml_settings.deep_merge!(settings)
     end
 

data/app/models/users/user.rb

@@ -67,7 +67,7 @@ class User < ActiveRecord::Base
 
   scope :text_search, ->(query) {
     query = query.gsub(/[^\w\s\-\.'\p{L}]/u, '').strip
-    where('upper(username) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "%#{query}%")
+    where('upper(username) LIKE upper(:s) OR upper(email) LIKE upper(:s) OR upper(first_name) LIKE upper(:s) OR upper(last_name) LIKE upper(:s)', :s => "%#{query}%")
   }
 
   scope :my, -> { accessible_by(User.current_ability) }

data/app/views/authentications/new.html.haml

@@ -1,15 +1,3 @@
-= content_for(:javascript_epilogue) do
-  :plain
-    document.observe("dom:loaded", function() {
-      new Effect.Move("standalone", { x:0, y:-16, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-        new Effect.Move("standalone", { x:0, y:16, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-          new Effect.Move("standalone", { x:0, y:-8, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-            new Effect.Move("standalone", { x:0, y:8, mode:"relative", fps:100, duration:0.15 });
-          }});
-        }});
-      }});
-    });
-
 .standalone#standalone
   -# The following form gets submitted to #create when @authentication is nil,
   -# or to #update when @authentication is not nil (ex. suspended).

data/app/views/contacts/_index_full.html.haml

@@ -22,7 +22,7 @@
         = contact.title if contact.title?
 
       - if (account = contact.account) and account.name?
-        == #{t :at} #{link_to_if can?(:read, account), account.name, account_path(account)}
+        = #{t :at} #{link_to_if can?(:read, account), account.name, account_path(account)}
 
       - if (lead = contact.lead) and lead.referred_by?
         –

data/app/views/contacts/_section_general.html.haml

@@ -10,11 +10,14 @@
         = col(t(:email), contact.email, false, true)
         = col(t(:phone), contact.phone)
       %tr
-        = col(t(:account), account_with_url_for(contact))
+        = col(t(:account)) do
+          = account_with_url_for(contact)
         - assigned_to_user = User.find_by_id(contact.assigned_to)
-        = col(t(:assigned_to), assigned_to_user ? link_to(assigned_to_user.name, url_for(assigned_to_user)) : "")
+        = col(t(:assigned_to)) do
+          = link_to(assigned_to_user.name, url_for(assigned_to_user)) if assigned_to_user
       %tr
-        = col(t(:tags), contact.tag_list.map{|tag| content_tag(:span, tag, :class => "fbtag")}.join(' '))
+        = col(t(:tags)) do
+          .tags= tags_for_index(contact)
 
     -# Show custom fields that are in the default field group
     - custom_field_group = contact.field_groups.select{|f| f.name == 'custom_fields'}.first

data/app/views/fields/_group_view.html.haml

@@ -3,7 +3,8 @@
   - groups.each_with_index do |group, i|
     %tr
       - group.each do |field|
-        = col(field.label, field.render_value(entity), (i == groups.size - 1) ? :last : nil)
+        = col(field.label, (i == groups.size - 1) ? :last : nil) do
+          = field.render_value(entity)
         - if group.size == 1
           %th.last
           %td.last

data/app/views/home/_activity.html.haml

@@ -28,7 +28,7 @@
       - else
         - type = t(activity.item_type.downcase)
         - if item.respond_to? :email
-          = avatar_for(item, :size => "16x16")
+          = avatar_for(item, :size => :thumb)
         = type
         = subject
         = ":"

data/app/views/layouts/500.html.haml

@@ -15,15 +15,3 @@
       %h3= link_to("Fat Free CRM", '/')
     %center
       %p.flash_exception#msg= exception
-
-  %script
-    :plain
-      document.observe("dom:loaded", function() {
-        new Effect.Move("msg", { x:0, y:-50, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-          new Effect.Move("msg", { x:0, y:50, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-            new Effect.Move("msg", { x:0, y:-25, mode:"relative", fps:100, duration:0.15, afterFinishInternal: function(effect) {
-              new Effect.Move("msg", { x:0, y:25, mode:"relative", fps:100, duration:0.15 });
-            }});
-          }});
-        }});
-      });

data/config/database.postgres.docker.yml

@@ -0,0 +1,25 @@
+development: &development
+  adapter: postgresql
+  database: fat_free_crm_development
+  username: postgres
+  password:
+  host:     db
+  port:     5432
+  schema_search_path: public
+  min_messages: warning
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  <<: *development
+  database: fat_free_crm_test
+
+production:
+  <<: *development
+  database: fat_free_crm_production
+
+staging:
+  <<: *development
+  database: fat_free_crm_staging
+

data/config/deploy.example.rb

@@ -3,50 +3,77 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-$:.unshift File.expand_path('./lib', ENV['rvm_path'])
-
-require 'rvm/capistrano'
-require 'bundler/capistrano'
-load    'deploy/assets'
-
-set :application,     'fat_free_crm'
-set :repository,      'git://github.com/fatfreecrm/fat_free_crm.git'
-set :branch,          'master'
-set :scm,             :git
-set :deploy_to,       ''
-set :user,            ''
-set :use_sudo,        false
-set :rvm_type,        :user
-set :rvm_ruby_string, '1.9.3'
-server                '', :app, :web, :db, primary: true
-
-# Use local key instead of key installed on the server.
-# If not working run "ssh-add ~/.ssh/id_rsa" on your local machine.
-ssh_options[:forward_agent] = true
+
+# config valid only for Capistrano 3.1
+lock '3.2.1'
+
+set :application, 'fat_free_crm'
+set :repo_url, 'git://github.com/fatfreecrm/fat_free_crm.git'
+
+# Default branch is :master
+# ask :branch, proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
+
+# Default deploy_to directory is /var/www/my_app
+# set :deploy_to, '/var/www/my_app'
+
+# Default value for :scm is :git
+# set :scm, :git
+
+# Default value for :format is :pretty
+# set :format, :pretty
+
+# Default value for :log_level is :debug
+# set :log_level, :debug
+
+# Default value for :pty is false
+# set :pty, true
+
+# Default value for :linked_files is []
+set :linked_files, %w{config/database.yml config/settings.yml}
+
+# Default value for linked_dirs is []
+# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
+
+# Default value for default_env is {}
+# set :default_env, { path: "/opt/ruby/bin:$PATH" }
+
+# Default value for keep_releases is 5
+# set :keep_releases, 5
+
+set :rvm_ruby_version, '2.1.5'
 
 namespace :deploy do
-  task :start, roles: :app do
-    run "touch #{current_release}/tmp/restart.txt"
-  end
-  
-  task :stop, roles: :app do
-    # Do nothing.
-  end
-  
-  desc 'Tell Passenger to restart the app.'
-  task :restart, roles: :app, except: { no_release: true } do
-    run "touch #{current_release}/tmp/restart.txt"
-    run "cd #{current_release} && passenger stop -p 3001"
-    run "cd #{current_release} && passenger start -a 127.0.0.1 -p 3001 -d -e production"
+
+  desc 'Restart application'
+  task :restart do
+    on roles(:app), in: :sequence, wait: 5 do
+      # Your restart mechanism here, for example:
+      # execute :touch, release_path.join('tmp/restart.txt')
+    end
   end
-  
-  desc 'Symlink shared configs and folders on each release.'
-  task :symlink_shared do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-    run "ln -nfs #{shared_path}/config/settings.yml #{release_path}/config/settings.yml"
-    run "rm -rf #{release_path}/vendor/ruby"
-    run "ln -nfs #{shared_path}/bundle/ruby #{release_path}/vendor/ruby"
+
+  after :publishing, :restart
+
+  after :restart, :clear_cache do
+    on roles(:web), in: :groups, limit: 3, wait: 10 do
+      # Here we can do anything such as:
+      # within release_path do
+      #   execute :rake, 'cache:clear'
+      # end
+    end
   end
+
 end
 
-after 'deploy:finalize_update', 'deploy:symlink_shared'
+# cap production invoke[db:migrate]
+# cap production invoke[db:reset]
+desc "Invoke a rake command on the remote server: cap production invoke[db:migrate]"
+task :invoke, [:command] => 'deploy:set_rails_env' do |task, args|
+  on primary(:app) do
+    within current_path do
+      with :rails_env => fetch(:rails_env) do
+        rake args[:command]
+      end
+    end
+  end
+end

data/config/initializers/custom_field_ransack_translations.rb

@@ -5,11 +5,13 @@ if Setting.database_and_table_exists?
 
     translations = {ransack: { attributes: {}}}
     CustomField.find_each do |custom_field|
-      model_key = custom_field.klass.model_name.singular
-      translations[:ransack][:attributes][model_key] ||= {}
-      translations[:ransack][:attributes][model_key][custom_field.name] = custom_field.label
+      if custom_field.field_group.present?
+        model_key = custom_field.klass.model_name.singular
+        translations[:ransack][:attributes][model_key] ||= {}
+        translations[:ransack][:attributes][model_key][custom_field.name] = custom_field.label
+      end
     end
 
     I18n.backend.store_translations(Setting.locale.to_sym, translations)
   end
-end
+end

data/config/locales/cz_fat_free_crm.yml

@@ -203,7 +203,7 @@ cz:
   commented_past_participle: okomentované
   email_past_participle: email
   show_per_page: Zobraz %{number} %{models} za stránku užívající %{fmt} format.
-  sort_by: Setřiď %{models} podle %{field}.
+  sort_by: Setřiď %{field}.
   sort_by_displaying: Setřiď %{models} podle %{field} zobrazující jméno %{position}
     příjmení.
   aim: AOL IM

data/config/locales/de_fat_free_crm.yml

@@ -523,7 +523,7 @@ de:
   expanded: Erweitert
   alt_email: Alternative Email
   create_past_participle: Zuletzt erstellte Datensätze
-  sort_by: Sortiere %{models} nach %{field}
+  sort_by: Sortiere nach %{field}
   aim: AOL IM
   update_past_participle: Aktualisierungen
   called_off: Abgesagt

data/config/locales/en-GB_fat_free_crm.yml

@@ -1,6 +1,10 @@
 ---
 en-GB:
   language: English (UK)
+
+  # Generic terms.
+  #----------------------------------------------------------------------------
+  id: Id
   all: All
   at: at
   here: here
@@ -10,6 +14,10 @@ en-GB:
   select_none: -- None --
   select_blank: -- Select --
   yes_button: 'Yes'
+
+
+  # Settings.
+  #----------------------------------------------------------------------------
   tab_dashboard: Dashboard
   tab_tasks: Tasks
   tab_campaigns: Campaigns
@@ -75,12 +83,18 @@ en-GB:
   completed_last_week: Last week
   completed_this_month: This month
   completed_last_month: Last month
+
+  # Models/Activity.
+  #----------------------------------------------------------------------------
   one_hour: One Hour
   one_day: One Day
   two_days: Two Days
   one_week: One Week
   two_weeks: Two Weeks
   one_month: One Month
+
+  # Model Validations.
+  #----------------------------------------------------------------------------
   activerecord:
     errors:
       models:
@@ -141,14 +155,41 @@ en-GB:
             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.
+    attribute_options:
+      opportunity:
+        stage:
+          prospecting: Prospecting
+          analysis: Analysis
+          presentation: Presentation
+          proposal: Proposal
+          negotiation: Negotiation
+          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_not_approved: Your account has not been approved yet.
   msg_asset_deleted: ! '%{value} has been deleted.'
   msg_asset_not_available: This %{value} is no longer available.
-  msg_asset_not_authorized: You are not authorized to view this %{value}.
+  msg_not_authorized: You are not authorized to take this action.
   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.
@@ -173,6 +214,9 @@ en-GB:
   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}.
@@ -200,9 +244,20 @@ en-GB:
   option_target_revenue: target revenue
   option_updated_at: date updated
   show_per_page: Show %{number} %{models} per page using %{fmt} format.
-  sort_by: Sort %{models} by %{field}.
+  sort_by: Sort by %{field}
   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
+  opportunities_index_normal: Normal format
+  accounts_index_normal: Normal format
+  leads_index_normal: Normal format
+  campaigns_index_normal: Normal format
+
+  # Views -> Profile.
+  #----------------------------------------------------------------------------
   aim: AOL IM
   already_signed_up: Already signed up?
   alt_email: Alternative email
@@ -241,16 +296,23 @@ en-GB:
   born_on: Born on
   reports_to: Reports to
   access: Access
-  contacts_account: Contact's account
+
+  # Views -> Authenticate.
+  #----------------------------------------------------------------------------
   forgot_password: Forgot Password
   login: Login
   no_account: Do not have an account?
   remember_me: Remember Me
   sign_up_now: Sign Up Now!
+
+  # Views -> Accounts.
+  #----------------------------------------------------------------------------
   account: Account
+  account_id: Account
   select_an_account: Select an Account
   account_small: account
   account_summary: Account Summary
+  account_categories: Account Categories
   accounts: Accounts
   accounts_options: Accounts Options
   accounts_small: accounts
@@ -275,6 +337,11 @@ en-GB:
   shipping_address: Shipping address
   total_accounts: Total Accounts
   website: Website
+  account_with_title_department: ! '%{title}, %{department} at %{account}'
+  account_with_title: ! '%{title} at %{account}'
+
+  # Views -> Campaigns.
+  #----------------------------------------------------------------------------
   actual: Actual
   actual_performance: Actual Performance
   budget: Budget
@@ -284,12 +351,14 @@ en-GB:
   campaign_small: campaign
   campaign_summary: Campaign Summary
   campaign_targets: Campaign Targets
+  campaign_statuses: Campaign Statuses
   campaigns: Campaigns
   campaigns_options: Campaigns Options
   campaigns_small: campaigns
   conversion: Conversion
   conversion_label: Conversion (%)
   conversion_number: ! '%{value} conversion'
+  target_conversion: Target conversion
   create_campaign: Create Campaign
   end_date: End date
   finished_on: completed on %{value}
@@ -314,6 +383,10 @@ en-GB:
   was_supposed_to_finish: was supposed to finish on %{value}
   was_supposed_to_start: was supposed to start %{time_ago} ago on %{start_date}
   was_supposed_to_start_in: was supposed to start in %{starts_in} on %{start_date}
+  select_a_campaign: Select a campaign
+
+  # Views -> Contacts.
+  #----------------------------------------------------------------------------
   alt_email_small: Other
   blog: Website/Blog
   contact: Contact
@@ -321,6 +394,7 @@ en-GB:
   contacts: Contacts
   contacts_options: Contacts Options
   contacts_small: contacts
+  contact_summary: Contact Summary
   create_contact: Create Contact
   department: Department
   department_small: ! '%{value} department'
@@ -344,6 +418,17 @@ en-GB:
   web_presence: Web Presence
   web_presence_small: web presence
   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'
+  show_tag_info_small: Show %{tag} information for this contact.
+  shared_with_everyone: Shared with everyone
+  title: Title
+  subscriptions: Subscriptions
+
+  # Views -> Leads.
+  #----------------------------------------------------------------------------
   convert: Convert
   convert_lead: Convert Lead
   convert_lead_permissions_intro: Contact permissions will be copied from the lead
@@ -366,6 +451,7 @@ en-GB:
   lead_small: lead
   lead_status_small: lead status
   lead_summary: Lead Summary
+  lead_statuses: Lead Statuses
   leads: Leads
   leads_options: Leads Options
   leads_small: leads
@@ -377,8 +463,14 @@ en-GB:
   source: Source
   status: Status
   total_leads: Total Leads
+  show_status_info_small: Show status information for this lead.
+  show_contact_info_small: Show contact information for this lead.
+
+  # Views -> Opportunities.
+  #----------------------------------------------------------------------------
   amount: Amount
   close_date: Close date
+  closes_on: Closes on
   closed_ago_on: closed %{time_ago} ago on %{date}
   closes_today: expected to close today!
   closing_date: closing date is %{value}
@@ -397,6 +489,7 @@ en-GB:
   opportunities_small: opportunities
   opportunity: Opportunity
   opportunity_small: opportunity
+  opportunity_stages: Opportunity Stages
   opportunity_summary: Opportunity At a Glance
   opportunity_summary_text: ! '%{amount} with %{discount} discount and %{probability}
     probability'
@@ -407,6 +500,9 @@ en-GB:
   stage: Stage
   total_opportunities: Total Opportunities
   weighted_amount: Weighted amount
+
+  # Views -> Tasks.
+  #----------------------------------------------------------------------------
   task: Task
   task_small: task
   tasks: Tasks
@@ -447,8 +543,14 @@ en-GB:
   total_tasks: Total %{value}
   view_assigned_tasks: view assigned tasks
   view_pending_tasks: view pending tasks
+
+  # Views -> Team.
+  #----------------------------------------------------------------------------
   unassigned_opportunities: Unassigned Opportunities
   no_opportunities_found: There are currently no outstanding opportunities.
+
+  # Views -> Home.
+  #----------------------------------------------------------------------------
   action_completed: completed
   action_create: created
   action_destroy: deleted
@@ -472,11 +574,13 @@ en-GB:
   subject_opportunity: opportunity
   subject_task: task
   subject_user: user
+  tag_list: Tags
   create_past_participle: Record Creations
   view_past_participle: Views
   update_past_participle: Updates
   destroy_past_participle: Deletions
   all_events_past_participle: Activities
+  action_create_comment: ! '- "%{comment}"'
   my_tasks: My Tasks
   no_task_records: You have no tasks.
   my_opportunities: My Opportunities
@@ -484,6 +588,9 @@ en-GB:
   my_accounts: My Accounts
   no_account_records: You have no accounts
   not_showing_hidden_entities: Not showing %{count} hidden %{entity}.
+
+  # Views -> Common.
+  #----------------------------------------------------------------------------
   add_note: Add Note
   save_note: Save Note
   add_note_help: Add a new note...
@@ -535,6 +642,9 @@ en-GB:
   collapse_all: Collapse all
   expanded: Expanded
   collapsed: Collapsed
+
+  # Views -> Layout.
+  #----------------------------------------------------------------------------
   about: About
   about_dev_group: Discussion group for developers
   about_features: Features and bugs
@@ -551,28 +661,17 @@ en-GB:
   logout: Logout
   quick_find: Quick find
   welcome: Welcome
+
+  # Advanced search
   accounts_advanced_search: Accounts Advanced search
   advanced_search: Advanced search
-  advanced_search_submit: Search
-  advanced_search_add_group: Add a group of filters
-  advanced_search_group_first: Show results where %{combinator} of the following match
-  advanced_search_group_rest: ! '...and where %{combinator} of the following match'
-  advanced_search_add_condition: Add a filter
-  advanced_search_remove_condition: Remove filter
-  ransack:
-    predicates:
-      eq: is
-      not_eq: is not
-      lt: is less than
-      gt: is greater than
-      matches: matches
-      does_not_match: doesn't match
-      cont: contains
-      not_cont: doesn't contain
-      blank: is blank
-      present: is present
-      'null': is null
-      not_null: is not null
+  basic_search: Basic search
+  search_results_count:
+    one: Search found %{count} result.
+    other: Search found %{count} results.
+
+  # Views -> Comments.
+  #----------------------------------------------------------------------------
   comment: Comment
   edit_comment: Editing comment
   show: Show
@@ -582,19 +681,34 @@ en-GB:
   subscribe_via_email: Subscribe via email
   disable_email_subscriptions: Disable email subscription
   added_note: added note %{value}
+
+  # Views -> Emails.
+  #----------------------------------------------------------------------------
+
+  # 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.
   reset_password: Reset Password
   update_password_and_login: Update Password and Login
+
+  # Views -> Admin
+  #----------------------------------------------------------------------------
   back_to_crm: Back to Fat Free CRM
   crm_admin_page: Fat Free CRM Administration
+
+  # Views -> Admin -> Groups
+  #----------------------------------------------------------------------------
   create_group: Create Group
   save_group: Save Group
   group_members: members
   groups: Groups
   groups_small: groups
   group_small: group
+
+  # 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
@@ -602,6 +716,7 @@ en-GB:
   last_seen: last seen %{value} ago
   last_seen2: last seen %{value}
   personal_information: Personal Information
+  group_memberships: Group Memberships
   reactivate: Reactivate
   save_user: Save User
   suspend: Suspend
@@ -618,6 +733,9 @@ en-GB:
   user_suspended_on: suspended on %{value}
   users: Users
   users_small: users
+
+  # Views -> Versions
+  #----------------------------------------------------------------------------
   versions: History
   version:
     create: ! '%{item} created by %{by}'
@@ -627,25 +745,47 @@ en-GB:
     unset_html: ! '%{attr} unset'
     change_html: ! '%{attr} changed from %{from} to %{to}'
     anonymous: anonymous
+  account_contact_id: Account id
+  account_contact_name: Account name
+  user_id: User id
+  created_at: Created at
+  updated_at: Updated at
+
+  # Export.
+  #----------------------------------------------------------------------------
   to_xls: Export to Excel
   to_csv: Export to comma-delimited file format (including deleted records)
   to_rss: RSS feed
   to_atom: Atom feed
+  to_perm: Permalink
+
+  # Dropbox.
+  #----------------------------------------------------------------------------
   dropbox_notification_subject: dropbox - Added email - %{subject}
   dropbox_notification_intro: Succesfully added the email you sent to dropbox
   dropbox_notification_to: Added to
   subject: Subject
   body: Body
+
+  # 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
-  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
+
+  # Pluralizations.
+  #----------------------------------------------------------------------------
   pluralize:
     comment:
       one: 1 comment
@@ -665,6 +805,9 @@ en-GB:
     login:
       one: 1 login
       other: ! '%{count} logins'
+
+  # Custom date/time formats.
+  #----------------------------------------------------------------------------
   date:
     formats:
       mmddyyyy: ! '%Y-%m-%d'
@@ -674,6 +817,9 @@ en-GB:
     formats:
       mmddhhss: ! '%e %b at %l:%M%p'
       mmddyyyy_hhmm: ! '%e %b %Y at %l:%M%p'
+
+  # will_paginate translations copied for 'en-US'
+  #----------------------------------------------------------------------------
   will_paginate:
     previous_label: ! '← Previous'
     next_label: Next →
@@ -684,6 +830,9 @@ en-GB:
         one: Displaying 1 %{name}
         other: Displaying all %{count} %{plural}
       multi_page: Displaying %{plural} %{from} - %{to} of %{total} in total
+
+  # Views -> Admin -> Custom Fields
+  #----------------------------------------------------------------------------
   label: Label
   custom_fields: Custom Fields
   custom_field_options: Custom Field Options
@@ -694,8 +843,8 @@ en-GB:
   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_info: Only show fields for %{assets} that are tagged with
+  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
@@ -705,12 +854,21 @@ en-GB:
     Create a new field group, or add fields to one of the groups below.
     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
+
+  # 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.
@@ -720,14 +878,23 @@ en-GB:
         author: Author
         version: Version
         description: Description
+
+  # Simple Form translations
+  #----------------------------------------------------------------------------
   simple_form:
-    'yes': 'Yes'
-    'no': 'No'
+    yes: 'Yes'
+    no: 'No'
     required:
       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:'
+
+  # Form field types
+  #----------------------------------------------------------------------------
   field_types:
     string:
       title: Short Answer
@@ -763,3 +930,9 @@ en-GB:
       title: Number (Integer)
     float:
       title: Number (Floating Point)
+  pair:
+    start: Start
+    end: End
+    from_to: From %{from} to %{to}
+    from_only: From %{from}
+    to_only: Until %{to}