summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorMarko Pušnik <marko.pusnik@guru.si>2015-11-06 15:21:30 +0100
committerMarko Pušnik <marko.pusnik@guru.si>2015-11-06 15:21:30 +0100
commitb81864469dc5f72c87f2765f82f28101c9bcf34c (patch)
treeea2ec3fb41e340c3ba84317c38d20d26eb1c3d50 /res
parent6dfd1ecab43c512197cc0c2a62f3ad5cbeef5e19 (diff)
Gui support for SAML account merge/upgrade upon first SAML-type login of an existing user.
Diffstat (limited to 'res')
-rw-r--r--res/en.json7
-rw-r--r--res/sl.json7
2 files changed, 12 insertions, 2 deletions
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"
}