Merge branch '1' into 2.1

client/lang/src/en.json

@@ -1,31 +1,73 @@
 {
+    "Admin.ACTIONS": "View actions",
+    "Admin.ADD_TO_CAMPAIGN": "Add to campaign",
+    "Admin.ADVANCED": "Advanced",
     "Admin.ANY": "Any",
     "Admin.ARCHIVECONFIRMMESSAGE": "Are you sure you want to archive this record?",
     "Admin.ARCHIVE_CONFIRM_MESSAGE": "Archived",
+    "Admin.BACK": "Back",
     "Admin.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.",
     "Admin.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?",
     "Admin.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to delete these pages?\n\nThese pages and all of their children pages will be deleted and sent to the archive.",
     "Admin.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?",
     "Admin.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.",
     "Admin.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish",
+    "Admin.CLEAR": "Clear",
     "Admin.CLOSE": "Close",
+    "Admin.CMS_LOGIN_TITLE": "Login",
     "Admin.COLLAPSEPANEL": "Collapse panel",
     "Admin.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.",
     "Admin.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.",
     "Admin.DELETECONFIRMMESSAGE": "Are you sure you want to delete this record?",
     "Admin.DELETE_CONFIRM_MESSAGE": "Deleted",
+    "Admin.DISABLESPLITVIEW": "Screen too small to show site preview in split mode",
+    "Admin.DISMISS": "Dismiss",
     "Admin.EDIT": "Edit",
     "Admin.EDIT_LINK": "Edit link",
+    "Admin.EDIT_MODE": "Edit mode",
+    "Admin.ENTER": "Enter",
     "Admin.ENTER_PASSWORD": "Enter your password",
-    "Admin.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.",
+    "Admin.ERRORINTRANSACTION": "An error occurred while fetching data from the server\n Please try again later.",
     "Admin.EXPANDPANEL": "Expand panel",
     "Admin.FormatExample": "Example: {format}",
+    "Admin.IMPORTANT_TIP": "Important tip",
+    "Admin.INSERT_LINK": "Insert link",
+    "Admin.INSERT_LINK_WITH_SHORTCUT": "Insert link {shortcut}",
+    "Admin.LINK_EMAIL": "Insert email link",
+    "Admin.LINK_EXTERNAL": "Insert external link",
+    "Admin.LINKLABEL_EMAIL": "Link to email address",
+    "Admin.LINKLABEL_EXTERNALURL": "Link to external URL",
+    "Admin.LOADING_ERROR": "As error occurred when loading the data: {message}",
     "Admin.NONE": "None",
+    "Admin.NORMAL_TIP": "Tip",
+    "Admin.NOT_AVAILABLE_USED_DATA": "The usage data is currently unavailable.",
+    "Admin.NOT_FOUND_COMPONENT": "The component here ({component}) failed to load, there is a chance that you may lose data when saving due to this.",
+    "Admin.NOT_USED": "This file is currently not in use.",
+    "Admin.NO_ITEM_PREVIEW": "There is no preview available for this item.",
     "Admin.NO_OPTIONS": "No options",
+    "Admin.NO_PREVIEW": "No preview available.",
     "Admin.NO_SIZE": "N/A",
+    "Admin.OWNED_WARNING_1": "You are unpublishing content that is being used in {count} other published section(s).",
+    "Admin.OWNED_WARNING_2": "This could cause a published page to have missing components on the live site.",
+    "Admin.OWNED_WARNING_3": "Do you want to unpublish anyway?",
+    "Admin.PREVIEW_MODE": "Preview mode",
     "Admin.REMOVE_LINK": "Remove link",
+    "Admin.REMOVE_TAG": "Remove Tag",
+    "Admin.SCREEN_TOO_SMALL": "Screen size too small",
+    "Admin.SEARCH": "Search",
+    "Admin.SEARCH_OPTIONS": "Search options",
     "Admin.SELECTONEPAGE": "Please select at least one page",
+    "Admin.SHOW_SEARCH": "Show search",
+    "Admin.SPLIT_MODE": "Split mode",
+    "Admin.SUMMARY_TAG_LABEL": "filters",
+    "Admin.TIP_LABEL": "{description} for {fieldTitle}",
+    "Admin.TREEDROPDOWN_FAILED": "Failed to load",
+    "Admin.TREEDROPDOWN_LOADING": "Loading...",
+    "Admin.TREEDROPDOWN_NO_CHILDREN": "No children",
     "Admin.TYPE_TO_SEARCH": "Type to search",
+    "Admin.UNKNOWN_ERROR": "An unknown error has occurred.",
+    "Admin.USED_ON": "Used on",
+    "Admin.USED_ON_NUM": "#",
     "Admin.VALIDATIONERROR": "Validation Error",
     "Admin.VALIDATION_ERRORS_IN_TAB": "This tab contains validation errors.",
     "Admin.VALIDATION_ERRORS_IN_TAB_SCREEN_READER": "(Has validation errors)",
@@ -40,5 +82,23 @@
     "Admin.VERIFY": "Verify",
     "Admin.VERIFY_ITS_YOU": "Verify it's you first.",
     "Admin.VERIFY_TO_CONTINUE": "Verify to continue",
-    "Admin.WHATS_THIS": "What is this?"
+    "Admin.WHATS_THIS": "What is this?",
+    "Admin.WRITTEN_NUMBER_EIGHT": "eight",
+    "Admin.WRITTEN_NUMBER_FIVE": "five",
+    "Admin.WRITTEN_NUMBER_FOUR": "four",
+    "Admin.WRITTEN_NUMBER_NINE": "nine",
+    "Admin.WRITTEN_NUMBER_ONE": "one",
+    "Admin.WRITTEN_NUMBER_SEVEN": "seven",
+    "Admin.WRITTEN_NUMBER_SIX": "six",
+    "Admin.WRITTEN_NUMBER_THREE": "three",
+    "Admin.WRITTEN_NUMBER_TWO": "two",
+    "Admin.WRITTEN_NUMBER_ZERO": "zero",
+    "Boolean.ANY": "Any",
+    "PopoverOptionSet.CLEAR": "Clear",
+    "PopoverOptionSet.NO_RESULTS": "No results found",
+    "PopoverOptionSet.SEARCH_PLACEHOLDER": "Search",
+    "PopoverOptionSetToggle.TOGGLE": "Toggle",
+    "SilverStripe\\Admin\\FileStatusIcon.TRACKED_FORM_UPLOAD_RESTRICTED": "Form submission",
+    "SilverStripe\\Admin\\FileStatusIcon.TRACKED_FORM_UPLOAD_UNRESTRICTED": "Form submission, unrestricted access",
+    "SilverStripe\\Admin\\FileStatusIcon.ACCESS_RESTRICTED": "Restricted access"
 }

client/src/components/Search/SearchBox.js

@@ -289,7 +289,7 @@ class SearchBox extends Component {
       className={classes}
       title={i18n._t('Admin.ADVANCED', 'Advanced')}
     >
-      <span className={spanClass}>Search options</span>
+      <span className={spanClass}>{i18n._t('Admin.SEARCH_OPTIONS', 'Search options')}</span>
     </Button>);
   }