Index: lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: el 
 #locale code: GR 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:22 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:53:15 CST 2012 
  
 #=================== labels for Image Gallery =================# 
 
@@ -179,6 +179,7 @@
 label.default.user.name  =\u0394\u03b9\u03b4\u03ac\u03c3\u03ba\u03c9\u03bd
 event.imagesubmit.subject  =LAMS: \u0395\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c2 \u03c5\u03c0\u03ad\u03b2\u03b1\u03bb\u03bb\u03b5\u03b9 \u03c3\u03b5 \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0388\u03ba\u03b8\u03b5\u03c3\u03b7\u03c2 \u0395\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd
 event.imagesubmit.body  =\u039f \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c2{0} \u03c5\u03c0\u03ad\u03b2\u03b1\u03bb\u03b5 \u03bc\u03b9\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03c3\u03b5 \u03ad\u03bd\u03b1 \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03bf \u0388\u03ba\u03b8\u03b5\u03c3\u03b7\u03c2 \u0395\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd.  \n\n \u0391\u03c5\u03c4\u03cc \u03c4\u03bf \u03bc\u03ae\u03bd\u03c5\u03bc\u03b1 \u03b1\u03c5\u03c4\u03cc \u03b1\u03c0\u03bf\u03c3\u03c4\u03ad\u03bb\u03bb\u03b5\u03c4\u03b1\u03b9 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b1, \u03bc\u03b5 \u03b2\u03ac\u03c3\u03b7 \u03cc\u03c4\u03b9 \u03ad\u03c7\u03b5\u03c4\u03b5 \u03bf\u03c1\u03af\u03c3\u03b5\u03b9 \u03c3\u03c4\u03b9\u03c2 \u03c0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03b5\u03c2 \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2.
+output.desc.uploaded.images.urls  =\u0388\u03ba\u03b8\u03b5\u03c3\u03b7 \u0395\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd: \u039f\u03b9 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b5\u03c2 \u03c0\u03bf\u03c5 \u03ad\u03c7\u03bf\u03c5\u03bd \u03b1\u03bd\u03b1\u03c1\u03c4\u03b7\u03b8\u03b5\u03af \u03b1\u03c0\u03cc \u03c4\u03bf\u03c5\u03c2 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c5\u03c2
 
 
-#======= End labels: Exported 173 labels for el GR =====
+#======= End labels: Exported 174 labels for el GR =====
Index: lams_tool_images/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_images/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_images/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:27 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:53:16 CST 2012 
  
 #=================== labels for Image Gallery =================# 
 
@@ -179,6 +179,7 @@
 label.default.user.name  =Kaiako
 event.imagesubmit.subject  =LAMS: I tuku whakaahua mai t\u0113tehi \u0101konga m\u0101 te taputapu taiwhanga whakaahua
 event.imagesubmit.body  =I tuku te \u0101konga {0} i t\u0113tehi whakaahua m\u0101 te taputapu taiwhanga whakaahua.\n\nHe p\u0101nui aunoa t\u0113nei p\u0101nui, i runga an\u014d i ng\u0101 tautuhinga whatutoto o te taputapu.
+output.desc.uploaded.images.urls  =Taiwhanga Atahanga:ng\u0101 atahanga n\u0101 ng\u0101 \u0101konga i tuku atu
 
 
-#======= End labels: Exported 173 labels for mi NZ =====
+#======= End labels: Exported 174 labels for mi NZ =====
Index: lams_tool_images/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -rdd018698401d49d8d774ba77dba499bf641ebccc -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_images/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision dd018698401d49d8d774ba77dba499bf641ebccc)
+++ lams_tool_images/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: no 
 #locale code: NO 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 30 09:05:44 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:53:15 CST 2012 
  
 #=================== labels for Image Gallery =================# 
 
@@ -179,6 +179,7 @@
 label.default.user.name  =Foreleser
 event.imagesubmit.subject  =LAMS: Studenten har sendt inn et bilde til verkt\u00f8yet for bilde galleriet
 event.imagesubmit.body  =Studenten {0} har sendt inn et bilde gjennom bilde galleri verkt\u00f8yet.\n\n Denne meldingen blir sendt automatisk, pga systeminnstillingene.
+output.desc.uploaded.images.urls  =Billed Galleri: Bilder lastet opp av studenter
 
 
-#======= End labels: Exported 173 labels for no NO =====
+#======= End labels: Exported 174 labels for no NO =====
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: el 
 #locale code: GR 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:20 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:52:29 CST 2012 
  
 #=================== labels for Pixlr Tool =================# 
 
@@ -60,7 +60,7 @@
 heading.notebookEntry  =\u0395\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae \u03a3\u03b7\u03bc\u03b5\u03b9\u03c9\u03bc\u03b1\u03c4\u03b1\u03c1\u03af\u03bf\u03c5
 button.cancel  =\u0386\u03ba\u03c5\u03c1\u03bf
 button.ok  =\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9
-button.done  =\u0388\u03b3\u03b9\u03bd\u03b5
+button.done  =\u039f\u03bb\u03bf\u03ba\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7
 button.save  =\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
 button.next  =\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03b7
 label.save  =\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
@@ -122,6 +122,7 @@
 monitor.summary.td.addNotebook  =\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u03a3\u03b7\u03bc\u03b5\u03b9\u03c9\u03bc\u03b1\u03c4\u03b1\u03c1\u03af\u03bf\u03c5 \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2 \u03c4\u03b7\u03c2 \u03b4\u03c1\u03b1\u03c3\u03c4\u03b7\u03c1\u03b9\u03cc\u03c4\u03b7\u03c4\u03b1\u03c2 \u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2 \u0395\u03b9\u03ba\u03cc\u03bd\u03c9\u03bd Pixlr
 pageTitle.admin  =\u0394\u03b9\u03b1\u03c7. Pixlr
 admin.return  =\u0395\u03c0\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ae \u03c3\u03c4\u03bf LAMS
+output.desc.image.url.definition.pixlr  =URL \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03b1\u03c0\u03cc Pixlr
 
 
-#======= End labels: Exported 116 labels for el GR =====
+#======= End labels: Exported 117 labels for el GR =====
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_pixlr/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:19 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:52:28 CST 2012 
  
 #=================== labels for Pixlr Tool =================# 
 
@@ -122,6 +122,7 @@
 monitor.summary.td.addNotebook  =T\u0101piri pukatuhi ki te mutunga o t\u0113nei ngohe Pixlr
 pageTitle.admin  =Kaiwhakahaere Pixlr
 admin.return  =Hoki an\u014d ki te Whakahaere i a LAMS
+output.desc.image.url.definition.pixlr  =URL atahanga mai i Pixlr
 
 
-#======= End labels: Exported 116 labels for mi NZ =====
+#======= End labels: Exported 117 labels for mi NZ =====
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_pixlr/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: no 
 #locale code: NO 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:22 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:52:29 CST 2012 
  
 #=================== labels for Pixlr Tool =================# 
 
@@ -122,6 +122,7 @@
 monitor.summary.td.addNotebook  =Legg til en notatblokk p\u00e5 slutten av Pixlr aktiviteten
 pageTitle.admin  =Pixlr administrasjon
 admin.return  =Returner for \u00e5 vedlikeholde LAMS
+output.desc.image.url.definition.pixlr  =Bildets URL fra Pixir
 
 
-#======= End labels: Exported 116 labels for no NO =====
+#======= End labels: Exported 117 labels for no NO =====
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties	(.../ApplicationResources_el_GR.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: el 
 #locale code: GR 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:17 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:51:55 CST 2012 
  
 #=================== labels for Wiki =================# 
 
@@ -76,7 +76,7 @@
 button.cancel  =\u0386\u03ba\u03c5\u03c1\u03bf
 button.close  =\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf
 button.ok  =\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9
-button.done  =\u0388\u03b3\u03b9\u03bd\u03b5
+button.done  =\u039f\u03bb\u03bf\u03ba\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7
 button.save  =\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
 button.next  =\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf
 label.created  =\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03ae\u03b8\u03b7\u03ba\u03b5
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_mi_NZ.properties
===================================================================
diff -u -rdb46abfd22650e81e900fbbf9f93cee55421a3fd -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_wiki/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision db46abfd22650e81e900fbbf9f93cee55421a3fd)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_mi_NZ.properties	(.../ApplicationResources_mi_NZ.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: mi 
 #locale code: NZ 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Mar 13 11:09:06 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:51:54 CST 2012 
  
 #=================== labels for Wiki =================# 
 
@@ -157,6 +157,13 @@
 notify.learner.subscribe  =Ohauru
 notify.learner.unsubscribe  =Wetemai
 notify.learner.query  ={0} te whakam\u014dhio \u0101-\u012bm\u0113r\u0101 ia w\u0101 ka whakatikaina a Wiki.
+label.wiki.restore  =Whakaora
+label.wiki.restore.toolTip  =Whakaora wh\u0101rangi i tangohia i mua
+notify.pageRestored.subject  =Kua oti te wh\u0101rangi Wiki te whakaora mai e {0}.
+notify.pageRestored.body  =Kua oti te wh\u0101rangi Wiki te whakaora mai e {0} m\u014d {1}. Kia kite ai i te Wiki, haere ki {2}
+label.wiki.remove.mark.toolTip  =Tohua t\u0113nei wh\u0101rangi hei wh\u0101rangi kua tangohia
+label.wiki.remove.mark.confirm  =Me tino tohu t\u0113nei wh\u0101rangi hei wh\u0101rangi kua tangohia?
+label.wiki.removed  =Kua tangohia t\u0113nei wh\u0101rangi.
 
 
-#======= End labels: Exported 151 labels for mi NZ =====
+#======= End labels: Exported 158 labels for mi NZ =====
Index: lams_tool_wiki/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r6ff8f4985f648cc094949228f03d4607cff3a7c7
--- lams_tool_wiki/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision e9f3814b6b6ca31db204710d2eed84d6339807da)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources_no_NO.properties	(.../ApplicationResources_no_NO.properties)	(revision 6ff8f4985f648cc094949228f03d4607cff3a7c7)
@@ -2,7 +2,7 @@
 #language code: no 
 #locale code: NO 
 
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Apr 13 09:18:16 CST 2012 
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Dec 06 14:51:53 CST 2012 
  
 #=================== labels for Wiki =================# 
 
@@ -94,7 +94,7 @@
 button.try.again  =Fors\u00f8k igjen
 message.learner.blank.input  =Du har ikke skrevet noe. Er dette riktig ?
 button.finish  =Neste aktivitet
-message.alertContentEdit  =Merk ! En eller flere studenter har begynt p\u00e5 denne aktiviteten. Hvis du endrer innholdet vil studentene motta forskjellig innhold
+message.alertContentEdit  =Merk ! En eller flere studenter har begynt p\u00e5 denne aktiviteten. Hvis du endrer innholdet vil studentene motta forskjellig innhold.
 message.warnLockOnFinish  =Merk ! Etter at du har klikket p\u00e5 Neste Aktivitet og du kommer tilbake til denne Wiki, s\u00e5 kan du ikke fortsette med redigering.
 message.activityLocked  =Foreleseren har satt opp denne aktiviteten slik at du ikke kan redigere innholdet etter at du er ferdig. Kommer du tilbake til denne Wiki s\u00e5 kan du se innholdet, men ikke redigere dette.
 message.minumumEditsNotReached  =Merk: Du har enda ikke n\u00e5dd maksimalt antall redigereinger  som skal utf\u00f8res, du m\u00e5 gj\u00f8re ytligere {0} redigeringer f\u00f8r du kan fortsette til neste aktivitet.