From e45282deaa1d78d7ff3a125e9fd11e3fdc120b07 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 4 Feb 2016 13:00:03 -0500
Subject: Move license storage to database

---
 i18n/en.json | 26 +++++++++++++++++++++-----
 i18n/es.json |  6 +-----
 2 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 74a873204..ad84ec15c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -611,6 +611,10 @@
     "id": "api.license.add_license.save.app_error",
     "translation": "License did not save properly."
   },
+  {
+    "id": "api.license.add_license.save_active.app_error",
+    "translation": "Active license ID did not save properly."
+  },
   {
     "id": "api.license.add_license.unique_users.app_error",
     "translation": "This license only supports {{.Users}} users, when your system has {{.Count}} unique users. Unique users are counted distinctly by email address. You can see total user count under Site Reports -> View Statistics."
@@ -1731,6 +1735,10 @@
     "id": "manaultesting.test_autolink.unable.app_error",
     "translation": "Unable to get channels"
   },
+  {
+    "id": "mattermost.load_license.find.warn",
+    "translation": "Unable to find active license"
+  },
   {
     "id": "mattermost.bulletin.subject",
     "translation": "Mattermost Security Bulletin"
@@ -2915,6 +2923,18 @@
     "id": "store.sql_system.update.app_error",
     "translation": "We encountered an error updating the system property"
   },
+  {
+    "id": "store.sql_license.save.app_error",
+    "translation": "We encountered an error saving the license"
+  },
+  {
+    "id": "store.sql_license.get.app_error",
+    "translation": "We encountered an error getting the license"
+  },
+  {
+    "id": "store.sql_license.get.missing.app_error",
+    "translation": "A license with that ID was not found"
+  },
   {
     "id": "store.sql_team.get.find.app_error",
     "translation": "We couldn't find the existing team"
@@ -3203,10 +3223,6 @@
     "id": "utils.license.load_license.invalid.warn",
     "translation": "No valid enterprise license found"
   },
-  {
-    "id": "utils.license.load_license.open_find.warn",
-    "translation": "Unable to open/find license file"
-  },
   {
     "id": "utils.license.remove_license.unable.error",
     "translation": "Unable to remove license file, err=%v"
@@ -3531,4 +3547,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Failed to add directory to watcher %v"
   }
-]
\ No newline at end of file
+]
diff --git a/i18n/es.json b/i18n/es.json
index 2fe02b2b0..946cf424d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -3203,10 +3203,6 @@
     "id": "utils.license.load_license.invalid.warn",
     "translation": "No se encontró una licencia enterprise válida"
   },
-  {
-    "id": "utils.license.load_license.open_find.warn",
-    "translation": "No pudimos encontrar/abrir el achivo de licencia"
-  },
   {
     "id": "utils.license.remove_license.unable.error",
     "translation": "No se pudo remover el archivo de la licencia, err=%v"
@@ -3531,4 +3527,4 @@
     "id": "web.watcher_fail.error",
     "translation": "Falla al agregar el directorio a ser vigilado %v"
   }
-]
\ No newline at end of file
+]
-- 
cgit v1.2.3-1-g7c22