blacklight-spotlight 3.0.0.alpha.9 → 3.0.0.rc4

data/app/views/spotlight/translations/show.yaml.yamlbuilder

@@ -0,0 +1,81 @@
+json.set!(locale) do
+  json.set!(current_exhibit.slug) do
+    json.title(current_exhibit.translated_title(default: ''))
+    json.subtitle(current_exhibit.translated_subtitle(default: ''))
+    json.description(current_exhibit.translated_description(default: ''))
+  end
+
+  json.spotlight do
+    json.curation do
+      json.nav do
+        json.home(t(:'spotlight.curation.nav.home', default: ''))
+      end
+    end
+
+    json.catalog do
+      json.breadcrumb do
+        json.index(t(:'spotlight.catalog.breadcrumb.index', default: ''))
+      end
+    end
+  end
+
+  json.main_navigation do
+    current_exhibit.main_navigations.each do |navigation|
+      json.set!(navigation.nav_type) do
+        json.label(navigation.translated_label(default: navigation.default_label(default: '')))
+      end
+    end
+  end
+
+  json.blacklight do
+    json.search do
+      json.fields do
+        current_exhibit.blacklight_config.show_fields.each do |key, field_config|
+          if locale == I18n.default_locale
+            json.set!(key, field_config.label)
+          else
+            json.set!(key, t(:"blacklight.search.fields.#{key}", default: ''))
+          end
+        end
+
+        json.search do
+          current_exhibit.blacklight_config.search_fields.select { |_, config| config.if }.each do |key, search_config|
+            if locale == I18n.default_locale
+              json.set!(key, search_config.label)
+            else
+              json.set!(key, t(:"blacklight.search.fields.search.#{key}", default: ''))
+            end
+          end
+        end
+
+        json.sort do
+          current_exhibit.blacklight_config.sort_fields.each do |key, sort_config|
+            if locale == I18n.default_locale
+              json.set!(key, sort_config.label)
+            else
+              json.set!(key, t(:"blacklight.search.fields.sort.#{key}", default: ''))
+            end
+          end
+        end
+
+        json.facet do
+          current_exhibit.blacklight_config.facet_fields.each do |key, facet_config|
+            if locale == I18n.default_locale
+              json.set!(key, facet_config.label)
+            else
+              json.set!(key, t(:"blacklight.search.fields.facet.#{key}", default: ''))
+            end
+          end
+        end
+      end
+    end
+  end
+
+  current_exhibit.searches.each do |search|
+    json.set!(search.slug) do
+      json.title search.translated_title(default: '')
+      json.subtitle search.translated_subtitle(default: '')
+      json.long_description search.translated_long_description(default: '')
+    end
+  end
+end

data/config/i18n-tasks.yml

@@ -34,10 +34,13 @@ ignore_unused:
   - activerecord.attributes.spotlight/page.{display_sidebar\?,display_title} # app/views/spotlight/home_pages/_page_options.html.erb
   - activerecord.attributes.spotlight/language.locale # app/views/spotlight/exhibits/_languages.html.erb
   - activerecord.attributes.spotlight/contact.avatar # app/views/spotlight/contacts/_form.html.erb
+  - activerecord.attributes.spotlight/exhibit.contact_emails # app/views/spotlight/exhibits/_form.html.erb
   - activerecord.attributes.spotlight/exhibit.published # app/views/spotlight/sites/_exhibit.html.erb
   - activerecord.attributes.spotlight/masthead.display # app/views/spotlight/appearances/edit.html.erb
   - activerecord.attributes.spotlight/custom_field.is_multiple # app/views/spotlight/custom_fields/_form.html.erb
   - activerecord.attributes.spotlight/custom_search_field.field # app/views/spotlight/custom_search_fields/_form.html.erb
+  - activerecord.models.spotlight/group # Used in flash messages around the app to rename Group to Browse group
+  - activerecord.models.spotlight/search # Used in flash messages around the app to rename Search to Browse category
   - helpers.label.spotlight/filter.{field,value} # app/views/spotlight/filters/_form.html.erb
   - spotlight.catalog.admin.{title,header} # app/helpers/spotlight/title_helper.rb
   - spotlight.{contacts,pages,searches}.edit.{title,header} # app/helpers/spotlight/title_helper.rb
@@ -48,14 +51,17 @@ ignore_unused:
   - spotlight.featured_images.upload_form.{non_iiif_alert_html,source.exhibit.help,source.exhibit.label} # app/views/spotlight/featured_images/_form.html.erb
   - spotlight.feature_pages.page_options.published # app/views/spotlight/feature_pages/_page_options.html.erb
   - spotlight.{exhibits,custom_fields,custom_search_fields}.{new,edit}.header # configuration_page_title
+  - spotlight.{searches}.{group}.{view}
   - helpers.submit.custom_field.{batch_error,batch_updated,create,submit,update} # Generic repeated template
   - helpers.submit.custom_search_field.{batch_error,batch_updated,create,submit,update} # Generic repeated template
   - helpers.submit.exhibit.{batch_error,batch_updated,create,submit,update} # Generic repeated template
+  - helpers.submit.group.{destroyed,updated} # Generic helper that is used
   - helpers.submit.search.{create,submit,update} # Generic repeated template
   - helpers.submit.site.{batch_error,batch_updated,create,created,destroyed,submit,update} # Generic repeated template
   - helpers.submit.filter.{batch_error,batch_updated,create,created,destroyed,submit,update} # Generic repeated template
   - helpers.action.destroy_are_you_sure # app/helpers/spotlight/crud_link_helpers.rb
   - helpers.action.spotlight/role.{create,destroy} # app/views/spotlight/roles/index.html.erb
+  - helpers.action.spotlight/group.destroy # app/views/spotlight/searches/_group.html.erb
   - helpers.action.{edit,edit_long,new,view} # app/helpers/spotlight/crud_link_helpers.rb
   - helpers.action.spotlight/search.edit_long # app/views/spotlight/searches/_search.html.erb
   - spotlight.about_pages.page_options.published # app/views/spotlight/about_pages/_page_options.html.erb
@@ -66,6 +72,7 @@ ignore_unused:
   - helpers.submit.{submit,update} # Generically used set defaults
   - helpers.submit.contact.create # app/views/spotlight/contacts/_form.html.erb
   - helpers.action.exhibit.contact.submit # helpers.action.exhibit.contact.submit
+  - helpers.label.contact_form.{email,name} # app/views/spotlight/shared/_report_a_problem.html.erb
 
   # TODO Look into these as its unclear
   - activerecord.models.spotlight.page

data/config/locales/spotlight.ar.yml

@@ -1,40 +1,73 @@
+---
 ar:
-  activemodel:
-    attributes:
-      spotlight/contact_form:
-        email: البريد الإلكتروني
-        message: الرسالة
-        name: الاسم
   helpers:
     action:
       cancel: إلغاء
     submit:
       contact_form:
-        create: إرسال
-        created: .نشكرك على رسالتك. لقد تم إرسال ملاحظاتك واقتراحاتك
+        create: ارسل
+        created: شكراً. لقد تم إرسال ملاحظاتك واقتراحاتك.
   spotlight:
     about_pages:
       contacts:
-        header: عنوان فرعي
-    header_links:
-      contact: ملاحظات واقتراحات
-    shared:
-      report_a_problem:
-        honeypot_field_explanation: .تجاهل هذا المربع النصي، فهو يُستخدم فقط لكشف المحتالين. إذا كتبت أي شيء في هذا المربع النصي، فلن يتم إرسال رسالتك
-        title: عنوان
+        header: جهات الاتصال
+    breadcrumb:
+      label: مسار التنقل
     browse:
       search:
         item_count:
-          one: "%{count} مادة"
-          other: "%{count} مواد"
+          zero: "%{count} عنصر"
+          one: "%{count} عنصر"
+          two: "%{count} عنصرين"
+          few: "%{count} عناصر"
+          many: "%{count} عنصراً"
+          other: "%{count} عنصراً"
+
       search_box:
-        label: البحث في فئة التصفح الحالية
-        placeholder: ...بحث
+        label: ابحث في فئة التصفح الحالية
+        placeholder: بحث...
         reset: مسح استعلام البحث
-        submit: البحث في فئة التصفح
+        submit: ابحث في فئة التصفح
         success:
-          expand_html: يمكنك <a href="%{expand_search_url}">البحث في كل مواد المعرض عن "%{browse_query}"</a>.
-          result_number_html: طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} مادة</strong> .في هذه الفئة
+          expand_html: "يمكنك ايضاً <a href=\"%{expand_search_url}\">البحث في كل مواد المعرض عن \"%{browse_query}\"</a>."
+          result_number_html: "طابق استعلام البحث <strong> %{search_size} من %{parent_search_count} عنصر</strong> في هذه الفئة."
         zero_results:
-          expand_html: <a href="%{clear_search_url}"> امسح استعلام المسح </a> أو حاول <a href="%{expand_search_url}">.البحث في كل المواد المعروضة لاستعلام البحث "%{browse_query}"</a>
-          result_number: .لم يتطابق بحثك مع أي مادة في هذه الفئة
+          expand_html: "تستطيع أن <a href=\"%{clear_search_url}\"> تمسح استعلام البحث </a> أو محاولة <a href=\"%{expand_search_url}\"> البحث في كل المواد المعروضة لاستعلام البحث ل\"%{browse_query}\"</a>"
+          result_number: لم يتطابق بحثك مع أي عنصر في هذه الفئة.
+    exhibits:
+      groups:
+        all: الكل
+    header_links:
+      contact: ملاحظات واقتراحات
+      login: تسجيل الدخول
+      logout: تسجيل الخروج
+    shared:
+      report_a_problem:
+        honeypot_field_explanation: تجاهل هذا المربع النصي، فهو يُستخدم فقط لكشف المحتالين. إذا كتبت أي شيء في هذا المربع النصي، فلن يتم إرسال رسالتك.
+        title: تواصل معنا
+    sir_trevor:
+      blocks:
+        browse_block:
+          items:
+            zero: "%{count} عنصر"
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
+            few: "%{count} عناصر"
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"
+        browse_group_categories_block:
+          items:
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
+            few: "%{count} عناصر"
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"
+          view_all: مشاهدة الكل
+        link_to_search_block:
+          items:
+            zero: "%{count} عنصر"
+            one: "%{count} عنصر"
+            two: "%{count} عنصرين"
+            few: "%{count} عناصر"
+            many: "%{count} عنصراً"
+            other: "%{count} عنصراً"

data/config/locales/spotlight.en.yml

@@ -9,6 +9,7 @@ en:
       spotlight/custom_search_field:
         field: Solr specification
       spotlight/exhibit:
+        contact_emails: Feedback recipients
         published: Published?
       spotlight/language:
         locale: Language
@@ -23,6 +24,8 @@ en:
     models:
       spotlight:
         page: Page
+      spotlight/group: Browse group
+      spotlight/search: Browse category
   cancel: Cancel
   drag: Drag
   helpers:
@@ -43,6 +46,8 @@ en:
         create: Add new field
       spotlight/custom_search_field:
         create: Add new field
+      spotlight/group:
+        destroy: Delete group
       spotlight/role:
         create: Add a new user
         destroy: Remove from site
@@ -52,6 +57,9 @@ en:
       update_all: Save changes
       view: View
     label:
+      contact_form:
+        email: Your email
+        name: Your name
       solr_document:
         exhibit_tag_list: Tags
       spotlight/filter:
@@ -97,6 +105,12 @@ en:
         created: The %{model} was created.
         destroyed: The %{model} was deleted.
         updated: The %{model} was successfully updated.
+      group:
+        batch_error: There was an error updating the requested %{model}.
+        batch_updated: "%{model} were successfully updated."
+        created: The %{model} was created.
+        destroyed: The %{model} was deleted.
+        updated: The %{model} was successfully updated.
       language:
         create: Add language
         created: The %{model} was created.
@@ -153,10 +167,10 @@ en:
     zh: Chinese
   reindexing_log:
     status:
+      completed: Successful
+      enqueued: Not yet started
       failed: Failed
-      in_progress: In Progress
-      succeeded: Successful
-      unstarted: Not Yet Started
+      in_progress: In progress
   shared:
     site_sidebar:
       documentation: Curator documentation
@@ -167,7 +181,7 @@ en:
         header: Contacts
       contacts_form:
         header: Contacts
-        instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the About Pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
+        instructions: Enter details for each librarian, curator or other contact person for this exhibit. Select the contacts you want to be show in the sidebar of the about pages. Drag and drop contacts to specify the order in which they are shown in the sidebar.
       page_options:
         published: Publish
     admin_users:
@@ -192,7 +206,7 @@ en:
       edit:
         header: Appearance
         main_navigation:
-          help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Click a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
+          help: Select the menu items you want to be displayed in the main navigation menu (menu items are only displayed when published pages exist for that item). Select a menu item to change its display label. Drag and drop a menu item to change their order in the menu.
           menu: Main menu
         site_masthead:
           heading: Exhibit masthead
@@ -226,20 +240,20 @@ en:
     catalog:
       admin:
         header: Items
-        title: Curation - Items
+        title: Curation - items
       admin_header:
         new_resource: Add items
         reindex: Reindex items
       breadcrumb:
-        index: Search Results
+        index: Search results
       document_visibility_control:
         inprogress:
           label: ''
         make_private:
-          button: Make Private
+          button: Make private
           label: ''
         make_public:
-          button: Make Public
+          button: Make public
           label: ''
       edit_default:
         url-field:
@@ -248,10 +262,10 @@ en:
         blank_field_warning_html: This field is currently hidden on all pages. You can make it visible on the Curation > %{link} page.
       facets:
         exhibit_visibility:
-          label: Item Visibility
+          label: Item visibility
           private: Private
       fields:
-        date_added: Date Added
+        date_added: Date added
         title: Title
         visibility: Public
       reindex_progress_panel:
@@ -277,7 +291,7 @@ en:
       subject: "%{application_name} exhibit feedback"
     contacts:
       edit:
-        header: Edit Contact
+        header: Edit contact
       form:
         avatar:
           header: Avatar
@@ -296,7 +310,7 @@ en:
         title:
           placeholder: Job title most relevant to this exhibit
       new:
-        header: Add Exhibit Contact
+        header: Add exhibit contact
     curation:
       header: Curation
       nav:
@@ -313,7 +327,7 @@ en:
         translations: Translations
     custom_fields:
       edit:
-        header: Edit Exhibit-Specific Field
+        header: Edit exhibit-specific field
       form:
         field_type:
           label: Type
@@ -322,19 +336,19 @@ en:
         is_multiple:
           label: Multi-valued?
       new:
-        header: Add Exhibit-Specific Field
+        header: Add exhibit-specific field
     custom_search_fields:
       edit:
-        header: Edit Exhibit-Specific Field
+        header: Edit exhibit-specific field
       form:
         field:
           help: Specify fields to be searched and their boost values (e.g., full_title_tesim^100 personal_name_tesim^50).
       new:
-        header: Add Exhibit-Specific Field
+        header: Add exhibit-specific field
     dashboards:
       analytics:
         header: Analytics
-        monthly_header: User Activity Over the Past Month
+        monthly_header: User activity over the past month
         pages:
           header: Most popular pages
         pagetitle: page title
@@ -345,21 +359,21 @@ en:
         field:
           last_edited_by: User
           title: Title
-          updated_at: Last Edited
-        header: Recent Site Building Activity
+          updated_at: Last edited
+        header: Recent site building activity
       reindexing_activity:
         field:
           date: Date
-          duration: Elapsed Time
-          items_reindexed_count: Items Indexed
+          duration: Elapsed time
+          items_reindexed_count: Items indexed
           job_status: Status
-          user: Requested By
-        header: Recent Item Indexing Activity
+          user: Requested by
+        header: Recent item indexing activity
         no_reindexing_activity: There has been no reindexing activity
       show:
         header: Dashboard
       solr_document_activity:
-        header: Recently Updated Items
+        header: Recently updated items
         no_documents: There are no documents in this exhibit
     exhibitnavbar:
       label: Exhibit navigation
@@ -371,10 +385,10 @@ en:
         not_validated: Not validated.
         resend: Resend confirmation?
       contact:
-        email_delete_button: Delete contact
-        email_delete_confirmation: Delete contact email address?
-        email_delete_error: 'Problem deleting contact email:'
-        email_input_aria_label: Contact email %{index}
+        email_delete_button: Delete recipient
+        email_delete_confirmation: Delete recipient email address?
+        email_delete_error: 'Problem deleting recipient:'
+        email_input_aria_label: Recipient email %{index}
       delete:
         heading: Delete exhibit
         warning_html: This action is irreversible. Be sure to back up the exhibit settings and content using the %{export_link} feature before proceeding.
@@ -392,13 +406,15 @@ en:
         heading: Filter items
         instructions: You can limit the items included in this exhibit by applying a filter to your Solr index. When you apply a filter, only items with values that match the filter will be included in your exhibit. To apply a filter, enter both a field and a value that match the names used in your Solr index.
       form:
-        add_contact_email_button: Add new contact
+        add_contact_email_button: Add new recipient
         fields:
           contact_emails:
-            help_block: Each contact email will receive feedback submissions
+            help_block: Each recipient will receive submissions made through the feedback form
           published:
             help_block: ''
         uneditable_non_default_language: This field is not editable in the current language. Switch to the default language to edit it.
+      groups:
+        all: All
       import:
         button: Import data
         heading: Import data
@@ -408,7 +424,7 @@ en:
         unpublished: Unpublished exhibits
         user: Your exhibits
       languages:
-        current_header: Current Languages
+        current_header: Current languages
         current_instructions: Each language listed below is available for translations on the Curation > Translations page. To enable exhibit visitors to change the language of the exhibit, enable the Public checkbox. To hide translations from an available language from the exhibit, disable the Public checkbox.
         heading: Languages
         modal:
@@ -433,63 +449,10 @@ en:
             label: Title
       tags:
         all: All
-      translations:
-        browse_categories:
-          default_language_column_label: English language title
-          description_label: Description
-          label: Browse categories
-          translation_column_label: "%{language} translation"
-        general:
-          basic_settings:
-            description: Description
-            label: Basic Settings
-            subtitle: Subtitle
-            title: Title
-          label: General
-          main_menu:
-            about: About
-            browse: Browse
-            curated_features: Curated Features
-            home: Home
-            label: Main Menu
-        metadata:
-          exhibit_specific_fields:
-            label: Exhibit-Specific Fields
-          label: Metadata field labels
-        pages:
-          about_pages:
-            label: About Pages
-          destroy: Delete
-          destroy_are_you_sure: Are you sure you want to delete this page? If you delete this page all content, including any existing translations you have made in it, will be lost.
-          edit: Edit
-          feature_pages:
-            label: Feature Pages
-          help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <i>Recreate</i> action.
-          home_page:
-            label: Home Page
-          label: Pages
-          new: Create one now.
-          no_translated_page: No translated page.
-          recreate: Recreate
-          recreate_are_you_sure: Are you sure you want to recreate this page? If you recreate this page all content, including any existing translations you have made, will be replaced with the content of the English version of the page.
-          table_header:
-            actions: Actions
-            default_published: Published
-            language_published: Published
-            last_updated: "%{language} title / Last update"
-        search_fields:
-          facet_fields:
-            label: Facet Fields
-          field_based_search_fields:
-            label: Field-Based Search Fields
-          label: Search field labels
-          sort_fields:
-            label: Sort Fields
-        title: Translations
     exhibits_admin_invitation_mailer:
       invitation_instructions:
         accept: Accept invitation
-        accept_invitation: " You can accept this invitation by clicking the link below."
+        accept_invitation: You can accept this invitation by selecting the link below.
         hello: Hello!
         ignore: If you don't want to accept the invitation, please ignore this email. Your exhibits administrator account won't be created until you access the link above.
         someone_invited_you: The Exhibits Administrator has invited you to help manage exhibits.
@@ -500,7 +463,7 @@ en:
     featured_images:
       form:
         crop_area:
-          help: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Click "Save changes" to save the cropped area.
+          help_html: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Select <b>Save changes</b> to save the cropped area.
         non_iiif_alert_html: The image source must be a IIIF image. Contact your exhibits adminstrator or see the <a href="http://iiif.io">IIIF website</a> for more information about IIIF.
         source:
           exhibit:
@@ -513,7 +476,7 @@ en:
             label: Upload an image
       upload_form:
         crop_area:
-          help: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Click "Save changes" to save the cropped area.
+          help_html: Adjust the image so that the rectangle contains the area you want to use as the %{thing}. Select <b>Save changes</b> to save the cropped area.
         non_iiif_alert_html: The image source must be a IIIF image. Contact your exhibits adminstrator or see the <a href="http://iiif.io">IIIF website</a> for more information about IIIF.
         source:
           exhibit:
@@ -538,10 +501,12 @@ en:
         body:
           one: "%{count} document has been indexed from the CSV file and added to the exhibit %{title}."
           other: "%{count} documents have been indexed from the CSV file and added to the exhibit %{title}."
+        error: 'Row %{index}: %{message}'
+        errors: Errors
         title: Your CSV file has just finished being processed.
     invitation_mailer:
       invitation_instructions:
-        accept_invitation: You can accept this invitation by clicking the link below.
+        accept_invitation: You can accept this invitation by selecting the link below.
         hello: Hello!
         ignore: If you don't want to accept the invitation, please ignore this email. Your account won't be created until you access the link above.
         someone_invited_you: The Exhibits Administrator has invited you to help work on the "%{exhibit_name}" exhibit.
@@ -550,21 +515,21 @@ en:
     main_navigation:
       about: About
       browse: Browse
-      curated_features: Curated Features
+      curated_features: Curated features
     metadata_configurations:
       edit:
         deselect_all: Deselect all
         exhibit_specific:
-          header: Exhibit-Specific Fields
+          header: Exhibit-specific fields
           instructions: You can add metadata fields to supplement the metadata fields that are part of the repository item record.
         field:
           label: Field name
         header: Metadata
-        instructions: Select metadata fields to display on each type of page. Click a field name to edit its display label. Drag and drop fields to specify the order in which they are displayed.
-        order_header: Display and Order Metadata Fields
+        instructions: Select metadata fields to display on each type of page. Select a field name to edit its display label. Drag and drop fields to specify the order in which they are displayed.
+        order_header: Display and order metadata fields
         select_all: Select all
         view:
-          show: Item Details
+          show: Item details
     pages:
       edit:
         header: Edit page
@@ -574,30 +539,30 @@ en:
         page_options: Options
         page_thumbnail: Thumbnail
         thumbnail:
-          help: You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page using the 'Highlight Featured Pages' widget.
+          help: You can select and crop an image to visually represent this page. It will be used as the thumbnail image if you include this page in the Pages widget.
         title_placeholder: Title
       index:
         about_pages:
-          header: About Pages
+          header: About pages
         feature_pages:
-          header: Feature Pages
+          header: Feature pages
           home_pages_header: Homepage
         home_pages:
-          header: Exhibit Home
-          title: Exhibit Home
+          header: Exhibit home
+          title: Exhibit home
       new:
         header: New page
       order_pages:
         cancel: Cancel
         instructions: Add new pages below. Drag and drop pages to change the order in which they are displayed in the sidebar.
         new_page: Add new page
-        pages_header: Custom Pages
+        pages_header: Custom pages
         save: Save
     resources:
       csv_upload:
         form:
           add_item: Add item
-          file_label: CSV File
+          file_label: CSV file
           help_html: "%{link}"
           template: Download template
           title: Upload multiple items
@@ -615,7 +580,7 @@ en:
       json_upload:
         form:
           add_item: Add item
-          file_label: JSON File
+          file_label: JSON file
           title: Upload raw documents
       new:
         header: Add items
@@ -640,11 +605,11 @@ en:
         help: Enter a valid email address
       index:
         actions: Actions
-        email: Email Address
+        email: Email address
         header: Users
         invite_pending: pending
         role: Role
-        title: Site Configuration - Users
+        title: Site configuration - users
     saved_search:
       id: Select a title to update a previously saved search
       label: Save this search
@@ -652,41 +617,41 @@ en:
     search:
       fields:
         abstract_tesim: Abstract
-        corporate_name_ssm: Corporate Names
+        corporate_name_ssm: Corporate names
         facet:
-          corporate_name_ssm: Corporate Names
-          exhibit_tags: Exhibit Tags
+          corporate_name_ssm: Corporate names
+          exhibit_tags: Exhibit tags
           genre_ssim: Genre
           language_ssim: Language
-          personal_name_ssm: Personal Names
+          personal_name_ssm: Personal names
           subject_geographic_ssim: Geographic
           subject_temporal_ssim: Era
         full_title_tesim: Title
         language_ssm: Language
         note_desc_note_tesim: Note
         note_mapuse_tesim: Type
-        note_page_num_tesim: Page Number
+        note_page_num_tesim: Page number
         note_phys_desc_tesim: Note
         note_provenance_tesim: Provenance
         note_references_tesim: References
         note_source_tesim: Source
-        personal_name_ssm: Personal Names
+        personal_name_ssm: Personal names
         search:
           all_fields: Everything
           author: Author
           title: Title
         sort:
-          date: Date (new to old)
-          identifier: Identifier
-          relevance: Relevance
-          source: Source
-          title: Title
-          type: Type
+          date: date (new to old)
+          identifier: identifier
+          relevance: relevance
+          source: source
+          title: title
+          type: type
         spotlight_upload_attribution_tesim: Attribution
         spotlight_upload_date_tesim: Date
         spotlight_upload_description_tesim: Description
-        subject_geographic_tesim: Geographic Subject
-        subject_temporal_tesim: Temporal Subject
+        subject_geographic_tesim: Geographic subject
+        subject_temporal_tesim: Temporal subject
     search_configurations:
       default_per_page:
         label: Default per page
@@ -707,7 +672,7 @@ en:
           one: "%{count} unique value"
           other: "%{count} unique values"
       facets:
-        help: If the sidebar is visible, users can use the facets shown in the sidebar to limit a search.  You can select the facets that are available for searching below. Click a facet field name to edit its display label. Drag and drop facets to specify the order they are displayed in the sidebar.
+        help: If the sidebar is visible, users can use the facets shown in the sidebar to limit a search.  You can select the facets that are available for searching below. Select a facet field name to edit its display label. Drag and drop facets to specify the order they are displayed in the sidebar.
         sort_by:
           count: Frequency
           index: Value
@@ -719,10 +684,10 @@ en:
           instructions: You can add custom search fields to supplement the search fields that are part of the default configuration.
         header: Field-based search
         help: If the search box is displayed, you can also enable field-based search. Field-based search adds a dropdown menu to your exhibit site's search box that provides the user with an option to restrict a search query to a single metadata field.
-        instructions: If enabled, you can select below the metadata fields that are available for searching. Click a field name to edit its display label.  Drag and drop fields to specify the order they are displayed in the search box dropdown menu.
+        instructions: If enabled, you can select below the metadata fields that are available for searching. Select a field name to edit its display label.  Drag and drop fields to specify the order they are displayed in the search box dropdown menu.
       sort:
         header: Sort fields
-        help: Select the fields you want to be available to users for sorting results. Click a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field.
+        help: Select the fields you want to be available to users for sorting results. Select a field title to change its display label. Drag and drop fields to change their order in the sort dropdown menu. The field listed first is the default sort field.
         keys:
           asc: ascending
           desc: descending
@@ -734,10 +699,13 @@ en:
           sort_type_ssi: type
     searches:
       edit:
-        header: Edit Browse Category
-        title: Curation - Browse
+        header: Edit browse category
+        title: Curation - browse
       form:
         default_index_view_type: Default view
+        group:
+          help: You can add this browse category to any number of browse groups. When you add a browse category to a group it will be displayed when an exhibit visitor selects that browse group’s filter button on the Browse landing page.
+          help_no_groups: You cannot add this browse category to a browse group because no browse groups have been created. To create a browse group, use the Browse groups tab on the Curation > Browse page.
         masthead:
           help: You can select and crop an image to use as a browse category-specific masthead, instead of the default site masthead, for this browse category's detail page.
           help_secondary: To create a browse category-specific masthead, you should use an image that is at least 120 pixels tall and 1200 pixels wide. For best results use an image at least 1800 pixels wide. You can crop larger images using the cropping tool below.
@@ -747,17 +715,32 @@ en:
           help_block: Displays a search box that enables users to search within the browse category results
           label: Search box
         search_description: Description
+        search_group: Group
         search_masthead: Masthead
         search_thumbnail: Thumbnail
         thumbnail:
           help: You can select and crop an image to visually represent this search.
+      group:
+        category_count:
+          one: "%{count} category"
+          other: "%{count} categories"
+        unpublished_count:
+          one: "(%{count} unpublished)"
+          other: "(%{count} unpublished)"
+          zero: ''
+        view: View
       index:
-        categories_header: Browse Categories
+        add_new_group: Add new group
+        cancel: Cancel
+        categories_header: Browse categories
+        categories_instructions: Use the Save search button on a search results page to create a new browse category. Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page.
+        groups_header: Browse groups
+        groups_instructions_html: "<p>Optionally, you can create groups to organize your exhibits’ browse categories and enable exhibit visitors to filter browse categories by group. Drag and drop browse groups to change the order in which their filter buttons are displayed.</p><p>To add a browse category to a browse group, edit the browse category from the Browse categories tab.</p>"
         header: Browse
-        instructions: Use the Save search button on a search results page to create a new browse category. Select the categories you want to be displayed on the browse landing page. Drag and drop categories to change the order in which they appear on that page.
         no_saved_searches: You can save search results while in curation mode to create browse categories, which will be displayed here.
         not_searchable_html: This exhibit is not currently searchable. To perform searches that can be saved as additional browse categories, temporarily turn on the Display search box option in the Options section of the Configuration > %{href} page.
-        title: Curation - Browse
+        save: Save
+        title: Curation - browse
       search:
         item_count:
           one: "%{count} item"
@@ -770,13 +753,19 @@ en:
         header: Administration menu
       report_a_problem:
         honeypot_field_explanation: Ignore this text box. It is used to detect spammers. If you enter anything into this text box, your message will not be sent.
-        title: Contact Us
+        reporting_from: 'Reporting from: %{url}'
+        title: Contact us
     sir_trevor:
       blocks:
         browse_block:
           items:
             one: "%{count} item"
             other: "%{count} items"
+        browse_group_categories_block:
+          items:
+            one: "%{count} item"
+            other: "%{count} items"
+          view_all: View all
         link_to_search_block:
           items:
             one: "%{count} item"
@@ -803,11 +792,78 @@ en:
         actions: Actions
         header: Tags
         name: Tag name
-        no_tags: No items in this exhibit have been tagged. You can add tags to an item on the Item Details page while in curation mode.
+        no_tags: No items in this exhibit have been tagged. You can add tags to an item on the item details page while in curation mode.
         taggings:
           count: Items tagged
     topbar:
       label: Utilities
+    translations:
+      browse_categories:
+        default_language_column_label: English language title
+        description_label: Description
+        label: Browse categories
+        subtitle_label: Subtitle
+        translation_column_label: "%{language} translation"
+      edit:
+        title: Translations
+      general:
+        basic_settings:
+          description: Description
+          label: Basic settings
+          subtitle: Subtitle
+          title: Title
+        label: General
+        main_menu:
+          about: About
+          browse: Browse
+          curated_features: Curated features
+          home: Home
+          label: Main menu
+      groups:
+        label: Browse groups
+      import:
+        description: You can import and export Rails-based YAML files containing the translated label values for the currently selected language for use in internationalization tools such as Transifex and i18n-tools. This feature does not include importing or exporting translations for Pages.
+        export_current_locale: Export %{language}
+        export_default_locale: Export %{language}
+        export_label: Export a YAML file
+        header: Import and export translations
+        import_label: Import a YAML file
+        import_submit: Import translations
+      metadata:
+        exhibit_specific_fields:
+          label: Exhibit-specific fields
+        label: Metadata field labels
+      page:
+        destroy: Delete
+        destroy_are_you_sure: Are you sure you want to delete this page? If you delete this page all content, including any existing translations you have made in it, will be lost.
+        edit: Edit
+        new: Create one now.
+        no_translated_page: No translated page.
+        recreate: Recreate
+        recreate_are_you_sure: Are you sure you want to recreate this page? If you recreate this page all content, including any existing translations you have made, will be replaced with the content of the English version of the page.
+      pages:
+        about_pages:
+          label: About pages
+        feature_pages:
+          label: Feature pages
+        help_html: Before exhibit visitors can view translated pages you must create, edit, and publish each page translation. When you create a translated page, a copy of the default language version of the page is made to serve as the initial translated page. You can then edit that translated page to replace the page title and any text fields with translated text. A translated page will not be visible to exhibit visitors until you publish it.  To replace a translated page with a current copy of the default language version of the page, use the <b>Recreate</b> action.
+        home_page:
+          label: Home page
+        label: Pages
+      pages_table:
+        header:
+          actions: Actions
+          default_published: Published
+          language_published: Published
+          last_updated: "%{language} title / Last update"
+      search_fields:
+        facet_fields:
+          label: Facet fields
+        field_based_search_fields:
+          label: Field-based search fields
+        label: Search field labels
+        sort_fields:
+          label: Sort fields
     versions:
       redo: Redo changes
       undo: Undo changes