From b81864469dc5f72c87f2765f82f28101c9bcf34c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Pu=C5=A1nik?= <marko.pusnik@guru.si>
Date: Fri, 6 Nov 2015 15:21:30 +0100
Subject: Gui support for SAML account merge/upgrade upon first SAML-type login
 of an existing user.

---
 res/en.json | 7 ++++++-
 res/sl.json | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/en.json b/res/en.json
index f560b15..a14b522 100644
--- a/res/en.json
+++ b/res/en.json
@@ -56,5 +56,10 @@
   "layout_select": "Layout",
   "line_layout": "Line",
   "square_layout": "Square",
-  "settings_cancel_btn": "Close"
+  "settings_cancel_btn": "Close",
+  "upgrade_to_aai_header": "Upgrade to AAI?",
+  "upgrade_to_aai_body_text_1": "<p>User with this email address already exists.</p><p>Enter its password and select <span class=\"badge\">Yes</span> to upgrade it to AAI.</p>",
+  "upgrade_to_aai_body_text_2": "<p>Select <span class=\"badge\">No</span> to do a separate account.</p>",
+  "upgrade_to_aai_no_button": "No, make new",
+  "upgrade_to_aai_yes_button": "Yes, upgrade to AAI"
 }
diff --git a/res/sl.json b/res/sl.json
index d99721a..54ca079 100644
--- a/res/sl.json
+++ b/res/sl.json
@@ -56,5 +56,10 @@
   "layout_select": "Razporeditev",
   "line_layout": "Vrstična",
   "square_layout": "Štirikotna",
-  "settings_cancel_btn": "Zapri"
+  "settings_cancel_btn": "Zapri",
+  "upgrade_to_aai_header": "Nadgradnja na AAI?",
+  "upgrade_to_aai_body_text_1": "<p>Uporabnik s tem e-poštnim naslovom že obstaja.</p><p> Vnesite geslo in izberite <span class=\"badge\">Da</span>, da ga nadgradite na AAI.</p>",
+  "upgrade_to_aai_body_text_2": "<p>Izberite <span class=\"badge\">Ne</span>, če želite narediti poseben račun.</p>",
+  "upgrade_to_aai_no_button": "Ne, naredite novega",
+  "upgrade_to_aai_yes_button": "Da, nadgradite na AAI"
 }
-- 
cgit v1.2.1