Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rbd4fa408454e7389b4e60bc68f2488de88eff663 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision bd4fa408454e7389b4e60bc68f2488de88eff663)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -70,7 +70,6 @@
 title.error.window  =LAMS :: Error
 authoring.msg.save.success  =Congratulations, your content saved successfully!
 label.authoring.close  =Close
-label.authoring.re.edit  =Re-edit
 index.welcome  =Welcome
 index.logout  =Logout
 index.refresh  =Refresh
Index: lams_central/conf/language/lams/ApplicationResources_ar_JO.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_ar_JO.properties	(.../ApplicationResources_ar_JO.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_ar_JO.properties	(.../ApplicationResources_ar_JO.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -80,7 +80,6 @@
 title.error.window  =\u062e\u0637\u0623
 authoring.msg.save.success  =\u0645\u0628\u0631\u0648\u0643\u060c\u062a\u0645 \u062d\u0641\u0638 \u0645\u062d\u062a\u0648\u0627\u0643 \u0628\u0646\u062c\u0627\u062d
 label.authoring.close  =\u063a\u0644\u0642
-label.authoring.re.edit  =\u0623\u0639\u062f \u0627\u0644\u062a\u0639\u062f\u064a\u0644
 index.welcome  =\u0623\u0647\u0644\u0627 \u0648 \u0633\u0647\u0644\u0627
 index.refresh  =\u064a\u0646\u0639\u0634
 index.myprofile  =\u0645\u0639\u0644\u0648\u0645\u0644\u062a\u064a \u0627\u0644\u0634\u062e\u0635\u064a\u0629
Index: lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties	(.../ApplicationResources_cs_CZ.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties	(.../ApplicationResources_cs_CZ.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: chyba
 authoring.msg.save.success  =Gratulujeme, v\u00e1\u0161 obsah byl \u00fasp\u011b\u0161n\u011b ulo\u017een!
 label.authoring.close  =Zav\u0159\u00edt
-label.authoring.re.edit  =Znovu upravit
 index.welcome  =V\u00edtejte
 index.logout  =Odhl\u00e1sit
 index.refresh  =Obnovit
Index: lams_central/conf/language/lams/ApplicationResources_cy_GB.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_cy_GB.properties	(.../ApplicationResources_cy_GB.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_cy_GB.properties	(.../ApplicationResources_cy_GB.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Gwall
 authoring.msg.save.success  =Llongyfarchiadau, mae eich cynnwys wedi cael ei gadw'n llwyddiannus!
 label.authoring.close  =Cau
-label.authoring.re.edit  =Ail-olygu
 index.welcome  =Croeso
 index.logout  =Allgofnodi
 index.refresh  =Adnewyddu
Index: lams_central/conf/language/lams/ApplicationResources_da_DK.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_da_DK.properties	(.../ApplicationResources_da_DK.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_da_DK.properties	(.../ApplicationResources_da_DK.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -58,7 +58,6 @@
 title.error.window  =LAMS :: Fejl
 authoring.msg.save.success  =Tillykke, dit indhold er blevet gemt!
 label.authoring.close  =Luk
-label.authoring.re.edit  =Redig\u00e9r igen
 index.welcome  =Velkommen
 index.logout  =Logout
 index.refresh  =Genindl\u00e6s
Index: lams_central/conf/language/lams/ApplicationResources_de_DE.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_de_DE.properties	(.../ApplicationResources_de_DE.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Fehler
 authoring.msg.save.success  =Der Inhalt wurde erfolgreich gespeichert!
 label.authoring.close  =Schlie\u00dfen
-label.authoring.re.edit  =\u00dcberarbeiten
 index.welcome  =Willkommen
 index.logout  =Logout
 index.refresh  =Aktualisieren
Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -rd6b9d0a1f35f9bbbae35528716a2dbe84b33269b -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision d6b9d0a1f35f9bbbae35528716a2dbe84b33269b)
+++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -70,7 +70,6 @@
 title.error.window  =\u03bb\u03ac\u03b8\u03bf\u03c2
 authoring.msg.save.success  =\u03a3\u03c5\u03b3\u03c7\u03b1\u03c1\u03b7\u03c4\u03ae\u03c1\u03b9\u03b1, \u03c4\u03bf \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03cc \u03c3\u03b1\u03c2 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03cd\u03b8\u03b7\u03ba\u03b5 \u03b5\u03c0\u03b9\u03c4\u03c5\u03c7\u03ce\u03c2
 label.authoring.close  =K\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf
-label.authoring.re.edit  =\u0395\u03c0\u03b1\u03bd\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1
 index.welcome  =\u039a\u03b1\u03bb\u03c9\u03c3\u03ae\u03c1\u03b8\u03b5\u03c2
 index.logout  =\u0391\u03c0\u03bf\u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7
 index.refresh  =\u0391\u03bd\u03b1\u03bd\u03ad\u03c9\u03c3\u03b7
Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r427b1699f540858bcf2d07288f0f5be431e8881b -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 427b1699f540858bcf2d07288f0f5be431e8881b)
+++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -70,7 +70,6 @@
 title.error.window  =LAMS :: Error
 authoring.msg.save.success  =Congratulations, your content saved successfully!
 label.authoring.close  =Close
-label.authoring.re.edit  =Re-edit
 index.welcome  =Welcome
 index.logout  =Logout
 index.refresh  =Refresh
Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
diff -u -rc8b342affb7f3b3341015bca26f379824df87da2 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision c8b342affb7f3b3341015bca26f379824df87da2)
+++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties	(.../ApplicationResources_es_ES.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -70,7 +70,6 @@
 title.error.window  =LAMS:: Error
 authoring.msg.save.success  =Su contenido ha sido guardado
 label.authoring.close  =Cerrar
-label.authoring.re.edit  =Re-editar
 index.welcome  =Bienvenido
 index.logout  =Cerrar sesi\u00f3n
 index.refresh  =Actualizar
Index: lams_central/conf/language/lams/ApplicationResources_es_MX.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_es_MX.properties	(.../ApplicationResources_es_MX.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_es_MX.properties	(.../ApplicationResources_es_MX.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS:: Error
 authoring.msg.save.success  =Su contenido ha sido guardado
 label.authoring.close  =Cerrar
-label.authoring.re.edit  =Re-Editar
 index.welcome  =Hola
 index.logout  =Salir
 index.refresh  =Refrescar
Index: lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_fr_FR.properties	(.../ApplicationResources_fr_FR.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Erreur
 authoring.msg.save.success  =Bravo, l'enregistrement de votre contenu a r\u00e9ussi!
 label.authoring.close  =Fermer
-label.authoring.re.edit  =Re-modifier
 index.welcome  =Bienvenue
 index.logout  =D\u00e9connexion
 index.refresh  =Rafra\u00eechir
Index: lams_central/conf/language/lams/ApplicationResources_id_ID.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_id_ID.properties	(.../ApplicationResources_id_ID.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_id_ID.properties	(.../ApplicationResources_id_ID.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Kesalahan
 authoring.msg.save.success  =Selamat, konten Anda berhasil disimpan!
 label.authoring.close  =Tutup
-label.authoring.re.edit  =Ubah kembali
 index.welcome  =Selamat datang
 index.logout  =Keluar
 index.refresh  =Menyegarkan
Index: lams_central/conf/language/lams/ApplicationResources_it_IT.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_it_IT.properties	(.../ApplicationResources_it_IT.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_it_IT.properties	(.../ApplicationResources_it_IT.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Errore
 authoring.msg.save.success  =Congratulazioni, il tuo contenuto \u00e8 stato salvato con successo!
 label.authoring.close  =Chiudi
-label.authoring.re.edit  =Ri-edita
 index.welcome  =Benvenuto
 index.logout  =Logout
 index.refresh  =Aggiorna
Index: lams_central/conf/language/lams/ApplicationResources_ja_JP.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_ja_JP.properties	(.../ApplicationResources_ja_JP.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_ja_JP.properties	(.../ApplicationResources_ja_JP.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -125,7 +125,6 @@
 msg.loading.learner.window  =\u5b66\u7fd2\u8005\u74b0\u5883\u3092\u30ed\u30fc\u30c9\u4e2d\u3067\u3059\u3002
 authoring.msg.save.success  =\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u6b63\u5e38\u306b\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002
 label.authoring.close  =\u9589\u3058\u308b
-label.authoring.re.edit  =\u518d\u7de8\u96c6
 index.welcome  =\u3088\u3046\u3053\u305d
 index.logout  =\u30ed\u30b0\u30a2\u30a6\u30c8
 index.refresh  =\u66f4\u65b0
Index: lams_central/conf/language/lams/ApplicationResources_ko_KR.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_ko_KR.properties	(.../ApplicationResources_ko_KR.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_ko_KR.properties	(.../ApplicationResources_ko_KR.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -54,7 +54,6 @@
 title.error.window  =\ub78c\uc2a4::\uc624\ub958
 authoring.msg.save.success  =\ucd95\ud558\ud569\ub2c8\ub2e4. \ub2f9\uc2e0\uc758 \ucee8\ud150\uce20\uac00 \uc131\uacf5\uc801\uc73c\ub85c \uc800\uc7a5\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 label.authoring.close  =\ub2eb\uae30
-label.authoring.re.edit  =\uc7ac\ud3b8\uc9d1
 index.welcome  =\ud658\uc601
 index.logout  =\ub85c\uadf8\uc544\uc6c3
 index.refresh  =\uc0c8\ub85c\uace0\uce68
Index: lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS:: He Hapa
 authoring.msg.save.success  =Ng\u0101 mihi, kua tiakina tikahia \u014d ihirangi!
 label.authoring.close  =Katia
-label.authoring.re.edit  =Whakatikatika an\u014d
 index.welcome  =Nau mai
 index.logout  =Takiputa
 index.refresh  =T\u0101mata
Index: lams_central/conf/language/lams/ApplicationResources_nl_BE.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_nl_BE.properties	(.../ApplicationResources_nl_BE.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_nl_BE.properties	(.../ApplicationResources_nl_BE.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -78,7 +78,6 @@
 title.error.window  =LAMS :: fout
 authoring.msg.save.success  =Gefeliciteerd, uw inhoud is succesvol opgeslagen!
 label.authoring.close  =Sluiten
-label.authoring.re.edit  =Opnieuw wijzigen
 index.welcome  =Welkom
 index.logout  =Uitloggen
 index.refresh  =Verversen
Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -76,7 +76,6 @@
 title.error.window  =LAMS :: Feil
 authoring.msg.save.success  =Gratulerer, ditt innhold er lagret !
 label.authoring.close  =Lukk
-label.authoring.re.edit  =Rediger igjen
 index.welcome  =Velkommen
 index.logout  =Logg ut
 index.refresh  =Frisk opp
Index: lams_central/conf/language/lams/ApplicationResources_pl_PL.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_pl_PL.properties	(.../ApplicationResources_pl_PL.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_pl_PL.properties	(.../ApplicationResources_pl_PL.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -31,7 +31,6 @@
 title.error.window  =LAMS :: b\u0142\u0105d
 authoring.msg.save.success  =Gratulacje, zawarto\u015b\u0107 zosta\u0142a zapisana!
 label.authoring.close  =Zamknij
-label.authoring.re.edit  =Edycja
 index.logout  =Wyloguj
 index.refresh  =Od\u015bwie\u017c
 index.refresh.hint  =Kliknij mnie po dodaniu/usuni\u0119ciu grupy/podgrupy/lekcji
Index: lams_central/conf/language/lams/ApplicationResources_pt_BR.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_pt_BR.properties	(.../ApplicationResources_pt_BR.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_pt_BR.properties	(.../ApplicationResources_pt_BR.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Erro
 authoring.msg.save.success  =Parab\u00e9ns, seu conte\u00fado foi salvo com sucesso!
 label.authoring.close  =Fechar
-label.authoring.re.edit  =Re-editar
 index.welcome  =Bem vindo
 index.logout  =Sair
 index.refresh  =Atualizar
Index: lams_central/conf/language/lams/ApplicationResources_sv_SE.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_sv_SE.properties	(.../ApplicationResources_sv_SE.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_sv_SE.properties	(.../ApplicationResources_sv_SE.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS :: Fel
 authoring.msg.save.success  =Gratulerar, ditt inneh\u00e5ll har sparats framg\u00e5ngsrikt!
 label.authoring.close  =St\u00e4ng
-label.authoring.re.edit  =G\u00f6r om redigering
 index.welcome  =V\u00e4lkommen
 index.logout  =Logga ut
 index.refresh  =\u00c5terst\u00e4ll
Index: lams_central/conf/language/lams/ApplicationResources_tr_TR.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_tr_TR.properties	(.../ApplicationResources_tr_TR.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_tr_TR.properties	(.../ApplicationResources_tr_TR.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -65,7 +65,6 @@
 title.password.changed.window  =LAMS: \u015eifre de\u011fi\u015ftirildi
 title.error.window  =LAMS: Hata
 authoring.msg.save.success  =Tebrikler, i\u00e7eri\u011finiz ba\u015far\u0131yla kaydedildi!
-label.authoring.re.edit  =Tekrar d\u00fczenle
 index.welcome  =Ho\u015fgeldiniz.
 index.logout  =\u00c7\u0131k\u0131\u015f
 index.refresh  =Yenile
Index: lams_central/conf/language/lams/ApplicationResources_vi_VN.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_vi_VN.properties	(.../ApplicationResources_vi_VN.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_vi_VN.properties	(.../ApplicationResources_vi_VN.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -77,7 +77,6 @@
 title.error.window  =LAMS: l\u1ed7i
 authoring.msg.save.success  =Ch\u00fac m\u1eebng , n\u1ed9i dung c\u1ee7a b\u1ea1n \u0111\u00e3 l\u01b0u th\u00e0nh c\u00f4ng!
 label.authoring.close  =\u0110\u00f3ng
-label.authoring.re.edit  =S\u1eeda l\u1ea1i
 index.welcome  =Ch\u00e0o m\u1eebng
 index.logout  =Tho\u00e1t
 index.refresh  =H\u1ed3i ph\u1ee5c
Index: lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/conf/language/lams/ApplicationResources_zh_CN.properties	(.../ApplicationResources_zh_CN.properties)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -114,7 +114,6 @@
 title.error.window  =\u5b66\u4e60\u6d3b\u52a8\u7ba1\u7406\u7cfb\u7edf :: \u9519\u8bef
 authoring.msg.save.success  =\u606d\u559c, \u60a8\u7684\u5b66\u4e60\u5185\u5bb9\u4fdd\u5b58\u6210\u529f!
 label.authoring.close  =\u5173\u95ed
-label.authoring.re.edit  =\u91cd\u65b0\u4fee\u6539
 index.welcome  =\u6b22\u8fce\u5149\u4e34
 index.logout  =\u9000\u51fa
 index.refresh  =\u5237\u65b0
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r5943e05705f7614c7c1c29d13ce50deacdc46cc0 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 5943e05705f7614c7c1c29d13ce50deacdc46cc0)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -1,8 +1,6 @@
 <%@ page language="java" pageEncoding="UTF-8"
 	contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> 
 <%@ taglib uri="tags-core" prefix="c" %>
 
 <!DOCTYPE html>
@@ -11,51 +9,37 @@
 <lams:head>
 	<c:remove var="notifyCloseURL" scope="session" />
 	       	
-	<lams:css />
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function closeWindow() {
+			if (window.parent.ActivityLib) {
+				window.parent.ActivityLib.closeActivityAuthoring();
+				return;
+			}
+
 			var notifyCloseURL = "${param.notifyCloseURL}";
-			if (notifyCloseURL == ""){
+			if (notifyCloseURL == "") {
 				refreshParentMonitoringWindow();
 			} else {
-				if (window.parent.opener == null || '${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){
+				if (window.parent.opener == null
+						|| '${param.noopener}' == 'true'
+						|| notifyCloseURL.indexOf('noopener=true') >= 0) {
 					window.location.href = notifyCloseURL + '&action=save';
 				} else {
 					window.parent.opener.location.href = notifyCloseURL;
 				}
 			}
-			
 
 			//just for depress alert window when call window.close()
 			//only available for IE browser			  
-			var userAgent=navigator.userAgent;
-			if(userAgent.indexOf('MSIE') != -1)
-				window.opener = "authoring"
+			var userAgent = navigator.userAgent;
+			if (userAgent.indexOf('MSIE') != -1) {
+				window.opener = "authoring";
+			}
 			window.close();
-		}  				
-		</script>
-</lams:head>
-<body class="stripes">
+		}
 
-	<c:set var="title">
-		<fmt:message key="authoring.msg.save.success" />
-	</c:set>
-	
-	<lams:Page type="admin" title="${title}">
-
-		<div class="voffset10 text-center">
-			<a href="javascript:;" onclick="javascript:location.href='${param.reEditUrl}'"
-				name="reedit" class="btn btn-primary roffset10">
-				<fmt:message key="label.authoring.re.edit" />&nbsp;<i class="fa fa-pencil-square-o"></i>
-			</a>
-			<a href="javascript:;" onclick="javascript:closeWindow();" name="close"
-				class="btn btn-primary">
-				<fmt:message key="label.authoring.close" />&nbsp;<i class="fa fa-times-circle-o"></i>
-			</a>
-		</div>
-
-	<div id="footer"></div>
-</lams:Page>
-</body>
-</lams:html>
+		closeWindow();
+	</script>
+</lams:head>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/includes/javascript/authoring/authoringActivity.js
===================================================================
diff -u -rbd4fa408454e7389b4e60bc68f2488de88eff663 -r59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3
--- lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision bd4fa408454e7389b4e60bc68f2488de88eff663)
+++ lams_central/web/includes/javascript/authoring/authoringActivity.js	(.../authoringActivity.js)	(revision 59a40ee1efb40ed1f0859adaedaaf2cdb372fcf3)
@@ -1,4 +1,4 @@
-/**
+/**
  * This file contains methods for Activity definition and manipulation on canvas.
  */
 
@@ -1140,7 +1140,17 @@
 		return transition;
 	},
 	
+	/**
+	 * It is run from authoringConfirm.jsp
+	 * It closes the dialog with activity authoring 
+	 */
+	closeActivityAuthoring : function(){
+		$("#dialogActivity").off('hide.bs.modal').on('hide.bs.modal', function(){
+			$('iframe', this).attr('src', null);
+		}).modal('hide');
+	},
 	
+	
 	/**
 	 * Drop the dragged activity on the canvas.
 	 */
@@ -1377,7 +1387,7 @@
 		}
 		
 		if (activity.authorURL) {
-			showDialog("dialogActivity" + activity.toolContentID, {
+			showDialog("dialogActivity", {
 				'height' : Math.max(300, $(window).height() - 30),
 				'width' :  Math.max(380, Math.min(1024, $(window).width() - 60)),
 				'draggable' : true,
@@ -1398,16 +1408,10 @@
 					PropertyLib.validateConditionMappings(activity);
 				},
 				'open' : function() {
-					var dialog = $(this);
 					// load contents after opening the dialog
-					$('iframe', dialog).attr('src', activity.authorURL).load(function(){
+					$('iframe', this).attr('src', activity.authorURL).load(function(){
 						// override the close function so it works with the dialog, not window
-						this.contentWindow.closeWindow = function(){
-							// detach the 'beforeClose' handler above, attach the standard one and close the dialog
-							dialog.off('hide.bs.modal').on('hide.bs.modal', function(){
-								$('iframe', this).attr('src', null);
-							}).modal('hide');
-						}
+						this.contentWindow.closeWindow = ActivityLib.closeActivityAuthoring;
 					});
 				}
 			}, true);