From 5c29d4f64935d0516e9d72d1d8cc734bcf295a87 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 8 Mar 2016 12:27:27 -0500
Subject: Deleting posts with files now renames the file so that public links
 to those files no longer work

---
 i18n/en.json | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 5b261a770..244de5d56 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -456,8 +456,24 @@
     "translation": "S3 is not supported for local storage export."
   },
   {
-    "id": "api.export.write_file.app_error",
-    "translation": "Unable to write to export file"
+    "id": "api.file.move_file.get_from_s3.app_error",
+    "translation": "Unable to get file from S3."
+  },
+  {
+    "id": "api.file.move_file.delete_from_s3.app_error",
+    "translation": "Unable to delete file from S3."
+  },
+  {
+    "id": "api.file.move_file.rename.app_error",
+    "translation": "Unable to move file locally."
+  },
+  {
+    "id": "api.file.move_file.configured.app_error",
+    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+  },
+  {
+    "id": "api.file.file_upload.exceeds",
+    "translation": "File exceeds max image size."
   },
   {
     "id": "api.file.file_upload.exceeds",
-- 
cgit v1.2.3-1-g7c22


From b77a04009e8b670d704b8f1b862d6ed5bb42d4e8 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 8 Mar 2016 21:16:46 -0300
Subject: Add missing server spanish locs

---
 i18n/en.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 6ac5ce5c2..bc33fc019 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -455,22 +455,6 @@
     "id": "api.export.s3.app_error",
     "translation": "S3 is not supported for local storage export."
   },
-  {
-    "id": "api.file.move_file.get_from_s3.app_error",
-    "translation": "Unable to get file from S3."
-  },
-  {
-    "id": "api.file.move_file.delete_from_s3.app_error",
-    "translation": "Unable to delete file from S3."
-  },
-  {
-    "id": "api.file.move_file.rename.app_error",
-    "translation": "Unable to move file locally."
-  },
-  {
-    "id": "api.file.move_file.configured.app_error",
-    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
-  },
   {
     "id": "api.file.file_upload.exceeds",
     "translation": "File exceeds max image size."
@@ -523,6 +507,22 @@
     "id": "api.file.init.debug",
     "translation": "Initializing file api routes"
   },
+  {
+    "id": "api.file.move_file.configured.app_error",
+    "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
+  },
+  {
+    "id": "api.file.move_file.delete_from_s3.app_error",
+    "translation": "Unable to delete file from S3."
+  },
+  {
+    "id": "api.file.move_file.get_from_s3.app_error",
+    "translation": "Unable to get file from S3."
+  },
+  {
+    "id": "api.file.move_file.rename.app_error",
+    "translation": "Unable to move file locally."
+  },
   {
     "id": "api.file.open_file_write_stream.configured.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
-- 
cgit v1.2.3-1-g7c22


From d7cdcf082fab6c0cb7c2fe4bed821bd1a8000e69 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 8 Feb 2016 07:26:10 -0500
Subject: Convering client to react-router.

---
 i18n/en.json | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index bc33fc019..d16de7dbb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1623,6 +1623,10 @@
     "id": "api.user.upload_profile_user.upload_profile.app_error",
     "translation": "Couldn't upload profile image"
   },
+  {
+    "id": "api.user.verify_email.bad_link.app_error",
+    "translation": "Bad verify email link."
+  },
   {
     "id": "api.web_conn.new_web_conn.last_activity.error",
     "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v"
@@ -3399,22 +3403,6 @@
     "id": "web.find_team.title",
     "translation": "Find Team"
   },
-  {
-    "id": "web.footer.about",
-    "translation": "About"
-  },
-  {
-    "id": "web.footer.help",
-    "translation": "Help"
-  },
-  {
-    "id": "web.footer.privacy",
-    "translation": "Privacy"
-  },
-  {
-    "id": "web.footer.terms",
-    "translation": "Terms"
-  },
   {
     "id": "web.get_access_token.bad_client_id.app_error",
     "translation": "invalid_request: Bad client_id"
@@ -3547,10 +3535,6 @@
     "id": "web.root.home_title",
     "translation": "Home"
   },
-  {
-    "id": "web.root.singup_info",
-    "translation": "All team communication in one place, searchable and accessible anywhere"
-  },
   {
     "id": "web.root.singup_title",
     "translation": "Signup"
@@ -3606,5 +3590,9 @@
   {
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
+  },
+  {
+    "id": "api.team.get_invite_info.not_open_team",
+    "translation": "Invite is invalid because this is not an open team."
   }
 ]
-- 
cgit v1.2.3-1-g7c22