Merge branch 'master' into i18n

lang/en-US.js

@@ -27,7 +27,6 @@ export default {
   method: "Method",
   path: "Path",
   label: "Label",
-  again: "Again",
   content_type: "Content Type",
   raw_input: "Raw input",
   parameter_list: "Parameter List",
@@ -46,6 +45,14 @@ export default {
   preview_html: "Preview HTML",
   history: "History",
   collections: "Collections",
+  environment: "Environment",
+  new_environment: "New Environment",
+  my_new_environment: "My New Environment",
+  edit_environment: "Edit Environment",
+  env_variable_list: "Variable List",
+  invalid_environment_name: "Please provide a valid name for the environment",
+  use_environment: "Use Environment",
+  add_one_variable: "(add at least one variable)",
   import_curl: "Import cURL",
   import: "Import",
   generate_code: "Generate code",
@@ -111,7 +118,7 @@ export default {
   no_label: "No label",
   prerequest_script: "Pre-Request Script",
   no_prerequest_script: "No pre-request script",
-  search_history: "search history",
+  search: "Search",
   history_empty: "History is empty",
   history_deleted: "History Deleted",
   clear: "Clear",
@@ -141,6 +148,7 @@ export default {
   deleted: "Deleted",
   undo: "Undo",
   collection_empty: "Collection is empty",
+  invalid_collection_name: "Please provide a valid name for the collection",
   new_collection: "New Collection",
   my_new_collection: "My New Collection",
   edit_collection: "Edit Collection",
@@ -163,7 +171,7 @@ export default {
   kinda_dark: "Kinda Dark",
   clearly_white: "Clearly White",
   just_black: "Just Black",
-  auto_system: "Auth (system)",
+  auto_system: "Auto (system)",
   green: "Green",
   yellow: "Yellow",
   pink: "Pink",
@@ -222,6 +230,7 @@ export default {
   payload: "Payload",
   choose_file: "Choose a file",
   file_imported: "File imported",
+  import_failed: "Import failed",
   f12_details: "(F12 for details)",
   we_use_cookies: "We use cookies",
   copied_to_clipboard: "Copied to clipboard",
@@ -247,6 +256,8 @@ export default {
   enter_curl: "Enter cURL",
   empty: "Empty",
   extensions: "Extensions",
+  extensions_use_toggle:
+    "Use the browser extension to send requests (if present)",
   extensions_info1: "Browser extension that simplifies access to Postwoman",
   extensions_info2: "Get Postwoman browser extension!",
   installed: "Installed",
@@ -254,11 +265,14 @@ export default {
   logged_out: "Logged out",
   logout: "Logout",
   account: "Account",
+  scrollInto_use_toggle: "Auto scroll",
   sync: "Sync",
   syncHistory: "History",
   syncCollections: "Collections",
+  syncEnvironments: "Environments",
   turn_on: "Turn on",
   login_first: "Login first",
-  paste_a_collection: "Paste a Collection",
-  import_from_sync: "Import from Sync"
+  paste_a_note: "Paste a note",
+  import_from_sync: "Import from Sync",
+  notes: "Notes"
 };

lang/es-ES.js

@@ -111,7 +111,7 @@ export default {
   no_label: "Sin etiqueta",
   prerequest_script: "Pre-Request Script",
   no_prerequest_script: "Script sin pre-requisito",
-  search_history: "buscar historial",
+  search: "buscar historial",
   history_empty: "Historial vacío",
   history_deleted: "Historial borrado",
   clear: "Limpiar",

lang/fr-FR.js

@@ -111,7 +111,7 @@ export default {
   no_label: "Aucun label",
   prerequest_script: "Pre-Request Script",
   no_prerequest_script: "No pre-request script",
-  search_history: "Historique de la recherche",
+  search: "Historique de la recherche",
   history_empty: "L'historique est vide",
   history_deleted: "Historique supprimé",
   clear: "Nettoyer",

lang/ja-JP.js

@@ -111,7 +111,7 @@ export default {
   no_label: "ラベル無し",
   prerequest_script: "プレリクエストスクリプト",
   no_prerequest_script: "プレリクエストスクリプト無し",
-  search_history: "検索履歴",
+  search: "検索履歴",
   history_empty: "履歴が空です",
   history_deleted: "履歴が削除された",
   clear: "クリア",