diff --git a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_it.properties
index d5f18646297f14107821a23e019e1ba8a2cb0c09..f01ad091428bd528dd67c1944637be3921e4fac6 100644
--- a/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Fri Aug 27 15:04:46 CEST 2010
+#Mon Oct 10 11:17:44 CEST 2016
 cal.add.event=Aggiungere un impegno
 cal.add.readonly=(solo lettura)
 cal.color.choose=Selezionare un colore
@@ -88,7 +88,6 @@ cal.import.remove.title=Conferma rimozione
 cal.import.success=Importazione riuscita
 cal.import.title=Importare calendari
 cal.import.type.file=Importare file
-cal.synchronize.type.url=Importazione via URL
 cal.import.url.content.invalid=Il formato del file calendario non \u00E8 corretto. Verifichi l'URL, p.f.
 cal.import.url.empty.error=L'URL del calendario deve essere indicato.
 cal.import.url.file.write.error=Non \u00E8 possibile scrivere il file calendario. Riprovi pi\u00F9 tardi, p.f.
@@ -101,7 +100,7 @@ cal.list=Lista dei calendari
 cal.managecalendars=Importare e gestire calendari
 cal.mon=Luned\u00EC
 cal.nextweek=Settimana seguente >>
-cal.notifications.entry=Impegno "{0}" del {1} {2} ge\u00E4ndert
+cal.notifications.entry=Impegno "{0}" del {1} {2} modificato da {3}
 cal.notifications.header=In un calendario da Lei abbonato si trovano eventi nuovi o attualizzati\:
 cal.notifications.header.course=Calendario nel corso "{0}"
 cal.notifications.header.group=Calendario nel gruppo "{0}"
@@ -124,6 +123,7 @@ cal.search.submit=Cercare
 cal.search.title=Ricerca impegni
 cal.subscribe=Aggiungere al calendario pers.
 cal.sun=Domenica
+cal.synchronize.type.url=Importazione via URL
 cal.thisweek=Oggi
 cal.thu=Gioved\u00EC
 cal.tue=Marted\u00EC
@@ -132,41 +132,6 @@ cal.until=fino a
 cal.wed=Mercoled\u00EC
 cal.week.label=Settimana
 checkall=Selezionare tutti
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 day.short.di=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.di
 day.short.do=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.do
 day.short.fr=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.fr
@@ -174,6 +139,7 @@ day.short.mi=$org.olat.core.gui.components.form.flexible.impl.elements\:day.shor
 day.short.mo=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.mo
 day.short.sa=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.sa
 day.short.so=$org.olat.core.gui.components.form.flexible.impl.elements\:day.short.so
+error.goto.date=Inserimanto data errato (dd.mm.yyyy)
 month.long.apr=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.apr
 month.long.aug=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.aug
 month.long.dec=$org.olat.core.gui.components.form.flexible.impl.elements\:month.long.dec
@@ -198,16 +164,6 @@ month.short.mar=Mar
 month.short.nov=Nov
 month.short.oct=Ott
 month.short.sep=Set
-error.goto.date=Inserimanto data errato (dd.mm.yyyy)
-
-
-
-
-
-
-
-
-
 tab.event=Dettagli impegno
 tab.links=Collegamento
 ul.select=Selezionare file
diff --git a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_it.properties
index 4a9b0fd8814bf4cb244641606f444e2797032f1d..28f0f1aea4a14d93d2671b91e453d4189b7e46fd 100644
--- a/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/commons/info/notification/_i18n/LocalStrings_it.properties
@@ -1,3 +1,3 @@
-#Mon Jun 27 12:37:07 CEST 2016
-notification.title=Comunicazioni nel corso "{0}"
+#Mon Oct 10 11:31:49 CEST 2016
+notification.title=Notifiche nel corso "{0}"
 notifications.entry=Messaggio "{0}" aggiunto da {1}
diff --git a/src/main/java/org/olat/core/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/core/_i18n/LocalStrings_it.properties
index 7334ef5b53c4ad1ff42d7666126cbc63976c9052..f46d2999d7595173b2df1e50e58845afddb02397 100644
--- a/src/main/java/org/olat/core/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/core/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Fri Jun 17 09:33:42 CEST 2016
+#Mon Oct 10 11:49:19 CEST 2016
 alert=Selezioni almeno un oggetto per l'azione desiderata, p.f.
 back=Indietro
 calendar.choose=Selezioni una data nel calendario mini
@@ -71,6 +71,7 @@ rating.5.5=Ottimo
 rating.explanation=Clicchi per valutare
 reset=Azzerare
 save=Salvare
+save.admin.settings=La configurazione \u00E8 stata salvata
 save.close=Salva e chiudi
 savesas=Salvare come
 search=Cercare
diff --git a/src/main/java/org/olat/core/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/_i18n/LocalStrings_zh_CN.properties
index 5c84d419286f3e0f2735d376b383301aa624bda9..89c9ec01819b146c6ad329e8c0d19ded2cdfb166 100644
--- a/src/main/java/org/olat/core/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,4 @@
-#Tue Sep 27 13:18:22 CEST 2016
+#Wed Oct 12 05:26:18 CEST 2016
 alert=\u8BF7\u4E3A\u4F60\u7684\u64CD\u4F5C\u9009\u62E9\u4E00\u4E2A\u81F3\u5C11\u4E00\u4E2A\u76EE\u6807\u3002
 back=\u8FD4\u56DE
 calendar.choose=\u4ECE\u8FF7\u4F60\u65E5\u5386\u4E2D\u9009\u62E9\u4E00\u4E2A\u65E5\u671F
@@ -71,6 +71,7 @@ rating.5.5=\u4F18\u79C0
 rating.explanation=\u70B9\u51FB\u6B64\u8FDB\u884C\u8BC4\u4EF7
 reset=\u91CD\u7F6E
 save=\u4FDD\u5B58
+save.admin.settings=\u8BBE\u7F6E\u5DF2\u4FDD\u5B58
 save.close=\u4FDD\u5B58\u540E\u5173\u95ED
 savesas=\u53E6\u5B58\u4E3A
 search=\u641C\u7D22
@@ -94,7 +95,7 @@ table.showall=\u5168\u90E8\u663E\u793A
 table.showpages=\u9875
 this.language.in.english=Simplified Chinese
 this.language.translated=\u7B80\u4F53\u4E2D\u6587
-this.language.translator.names=Hanna Chen, Maggie Dang, Vivi Li, Jonathan Luo, Karen Zhang, Qinrong Zhou, bin wu(matthew wu),
+this.language.translator.names=Hanna Chen, Maggie Dang, Vivi Li, Jonathan Luo, Karen Zhang, Qinrong Zhou, bin wu(matthew wu),Kehua Gao(\u9AD8\u79D1\u534E),
 tomcat.options.restart=\u7ACB\u5373\u91CD\u542F
 tomcat.options.restartonidle=\u53EA\u8981\u6CA1\u6709\u7528\u6237\u7ACB\u5373\u91CD\u542F
 toolbox.actions=\u64CD\u4F5C
diff --git a/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_zh_CN.properties
index f666431a1b01c71fb4bd047b63b061ae55355b8c..fc9f32d503317d61292e7c985a2882151eac0c69 100644
--- a/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_zh_CN.properties
@@ -1,15 +1,19 @@
-#Fri Jan 22 04:33:45 CET 2010
+#Sun Oct 09 05:05:08 CEST 2016
 AssessmentManager=\u8BC4\u4F30\u5DE5\u5177
+BinderTemplate=Portfolio 2.0 \u6A21\u677F
 BusinessGroup=\u4E8B\u52A1\u7EC4
 CalendarManager=\u65E5\u5386
 CalendarManager.course=\u5B66\u7A0B\u65E5\u5386
 CalendarManager.group=\u7FA4\u7EC4\u65E5\u5386
 CatalogEntry=\u76EE\u5F55\u6761\u76EE
+CertificatesManager=\u8BC1\u4E66
 CourseBb=\u5B66\u7A0B\u5143\u7D20
 CourseModule=\u5B66\u7A0B
 DENCourseNode=\u5165\u5B66\u6CE8\u518C\u65E5\u671F
 DialogElement=\u6587\u4EF6\u5BF9\u8BDD\u6846
 DropboxController=\u4E0B\u62C9\u6846
+EPStructuredMap=ePortfolio
+EPStructuredMapTemplate=Portfolio \u6A21\u677F
 FileResource.ANIM=\u52A8\u753B
 FileResource.BLOG=\u535A\u5BA2
 FileResource.DOC=Word
@@ -17,6 +21,7 @@ FileResource.FILE=\u6587\u4EF6
 FileResource.GLOSSARY=\u672F\u8BED\u8BCD\u6C47\u8868
 FileResource.IMAGE=\u56FE\u7247
 FileResource.IMSCP=CP\u5B66\u4E60\u5185\u5BB9\u5305
+FileResource.IMSQTI21=Test (QTI 2.1)
 FileResource.MOVIE=\u89C6\u9891
 FileResource.PDF=PDF
 FileResource.PODCAST=\u64AD\u5BA2
@@ -26,11 +31,17 @@ FileResource.SHAREDFOLDER=\u8D44\u6E90\u6587\u4EF6\u5939
 FileResource.SOUND=\u97F3\u9891
 FileResource.SURVEY=\u8C03\u67E5\u95EE\u5377
 FileResource.TEST=\u6D4B\u9A8C
+FileResource.VIDEO=Video
 FileResource.WIKI=\u7EF4\u57FA
 FileResource.XLS=Excel
 FolderModule=\u6587\u4EF6\u5939
 Forum=\u8BBA\u575B
+GroupTask=\u4EFB\u52A1
+Inbox=\u6536\u4EF6\u7BB1
+InfoMessage=\u6D88\u606F
+LibrarySite=\u5E93
 ReturnboxController=\u53CD\u9988\u7BB1
+SolutionController=\u793A\u4F8B\u65B9\u6848
 User=\u7528\u6237
 WikiPage=\u7EF4\u57FA
 ajax.show.on=[Ajax\u963F\u8D3E\u514B\u65AF\u6D4B\u8BD5\u6A21\u5F0F]
@@ -48,6 +59,10 @@ topnav.admin=\u7CFB\u7EDF\u7BA1\u7406
 topnav.admin.alt=\u7BA1\u7406OLAT\u5B89\u88C5
 topnav.buddygroups=\u7FA4  \u7EC4
 topnav.buddygroups.alt=\u4E0E\u4E2A\u4EBA\u5B66\u4E60\u7EC4\u548C\u5DE5\u4F5C\u7EC4\u534F\u4F5C
+topnav.catalog=\u76EE\u5F55
+topnav.catalog.admin=\u76EE\u5F55\u7BA1\u7406
+topnav.catalog.admin.alt=\u7BA1\u7406\u76EE\u5F55\u4E2D\u7684\u5B66\u4E60\u8D44\u6E90
+topnav.catalog.alt=\u76EE\u5F55
 topnav.close=\u5173\u95ED\u7A97\u53E3
 topnav.close.alt=\u5173\u95ED\u8BE5\u7A97\u53E3
 topnav.closeRecent=\u5173\u95ED
@@ -59,6 +74,10 @@ topnav.guesthome=\u6E38\u5BA2\u9996\u9875
 topnav.guesthome.alt=\u60A8\u4F5C\u4E3A\u6E38\u5BA2\u5F00\u59CB\u767B\u5F55OLAT \u3002
 topnav.home=\u9996  \u9875
 topnav.home.alt=\u60A8\u4F5C\u4E3A\u7528\u6237\u5728OLAT\u7684\u5F00\u59CB\u3002
+topnav.mycourses=\u8BFE\u7A0B
+topnav.mycourses.alt=\u8BFE\u7A0B
+topnav.portal=\u95E8\u6237
+topnav.portal.alt=\u6240\u6709\u95E8\u6237\u7EC4\u4EF6
 topnav.printview=\u6253\u5370
 topnav.printview.alt=\u6253\u5370\u8BE5\u9875
 topnav.testing=\u6D4B\u9A8C
diff --git a/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_zh_CN.properties
index be1c84d9fcfc19647e79c66b857d29272cafb134..aabcb04e6052346d354b6cf5b007f59ee32f1475 100644
--- a/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_zh_CN.properties
@@ -1,7 +1,8 @@
-#Fri Oct 23 12:24:58 CEST 2009
+#Sat Oct 08 10:09:51 CEST 2016
 error.pageeditedby=\u672C\u9875\u6B63\u5728\u88AB\u7528\u6237{0}\u7F16\u8F91\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\u3002
+file.too.large.server=\u672C\u6587\u6863\u56E0\u4E3A\u592A\u5927({0}KB)\u4E0D\u80FD\u4FDD\u5B58\u3002\u5141\u8BB8\u7684\u6587\u4EF6\u6700\u5927\u4E0D\u80FD\u8D85\u8FC7{1}KB
 lastModified=\u6700\u540E\u7684\u4FEE\u6539
+plaintext.error.tolarge=$org.olat.core.commons.editor.plaintexteditor\:plaintext.error.tolarge
 saveandclosebuttontext=\u4FDD\u5B58\u5E76\u5173\u95ED
 savebuttontext=\u4FDD\u5B58
 warn.foreigneditor=\u6CE8\u610F\! \u8BE5\u6587\u4EF6\u7531\u5176\u5B83HTML\u7F16\u8F91\u5668\u521B\u5EFA . \u5982\u679C\u5B83\u901A\u8FC7\u5185\u5728\u7684OLAT\u7F16\u8F91\u5668\u7F16\u8F91\u548C\u4FDD\u5B58, \u5176\u683C\u5F0F\u548C\u6E90\u4EE3\u7801\u4F1A\u6539\u53D8\!
-plaintext.error.tolarge=$org.olat.core.commons.editor.plaintexteditor\:plaintext.error.tolarge
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/fullWebApp/_i18n/LocalStrings_zh_CN.properties
index 83d8215d77854fc35cbd18eb8b459b562394d065..c2c4d8c33aadcfee8329bd7214c886da42aded1d 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_i18n/LocalStrings_zh_CN.properties
@@ -1,5 +1,7 @@
-#Fri Oct 23 05:45:00 CEST 2009
+#Sat Oct 08 09:27:34 CEST 2016
+access.skip.to.content=\u8DF3\u8F6C\u5230\u4E3B\u8981\u5185\u5BB9
 accesskey.back=\u4E0A\u4E00\u6B65(\u82E5\u53EF\u7528)
+accesskey.changes=\u66F4\u65B0\u7684\u5C4F\u5E55\u533A\u57DF (Web2.IE \u4E2D\u7684\u4E00\u4E2A\u6A21\u5F0F)\: u, u, u...
 accesskey.content=\u5185\u5BB9\u533A\u57DF
 accesskey.menu=\u83DC\u5355
 accesskey.modal=\u6A21\u5F0F\u5BF9\u8BDD\u6846(\u82E5\u6709\u6548)
@@ -11,20 +13,24 @@ accesskey.title=\u8BBE\u7F6E\u5FEB\u901F\u5BFC\u822A\u8BBF\u95EE\u952E
 accesskey.tools=\u5DE5\u5177\u548C\u64CD\u4F5C
 accesskey.top=\u9875\u9762\u9876\u7AEF
 accesskey.topnav=\u5BFC\u822A\u9876\u7AEF
+error.head=\u9519\u8BEF
 footer.ajax.hover=AJAX\u6A21\u5F0F\u5DF2\u6FC0\u6D3B--\u8FD0\u884C\u901F\u5EA6\u66F4\u5FEB
 footer.logged.in.as=\u4F5C\u4E3A<i>{0}</i>\u767B\u9646
 footer.not.logged.in=\u6CA1\u6709\u767B\u5F55
 footer.users.online=\u5728\u7EBF\u7528\u6237
+goto.login=\u8F6C\u5230\u767B\u5F55\u9875\u9762
 header.topnav.close=\u5173\u95ED\u7A97\u53E3
 header.topnav.close.alt=\u5173\u95ED\u672C\u7A97\u53E3
 header.topnav.login=\u767B\u5165
 header.topnav.login.alt=\u767B\u5165
 header.topnav.logout=\u767B\u51FA
 header.topnav.logout.alt=\u6CE8\u9500
+header.topnav.more=\u66F4\u591A
 header.topnav.printview=\u6253\u5370
 header.topnav.printview.alt=\u6253\u5370\u6B64\u9875
 preview.close=\u5173\u95ED\u9884\u89C8
 resize.clear.tooltip=\u91CD\u8BBE\u672C\u5217\uFF0C\u4F7F\u5176\u6062\u590D\u5230\u9ED8\u8BA4\u5C5E\u6027
 resize.compress.tooltip=\u7F29\u5C0F\u8868\u683C\u5BBD\u5EA6
 resize.expand.tooltip=\u6269\u5C55\u672C\u5217\u7684\u5BBD\u5EA6
+support.email=\u5982\u679C\u95EE\u9898\u8FD8\u4E0D\u80FD\u89E3\u51B3\uFF0C\u8BF7\u4F7F\u7528\u4E0B\u9762\u7684\u5730\u5740\u8054\u7CFB\u6280\u672F\u652F\u6301\u3002
 warn.tabsfull=\u60A8\u5F00\u7684\u6807\u7B7E\u9875\u592A\u591A\u4E86\uFF0C\u8BF7\u5173\u95ED\u4E00\u4E2A\u91CD\u8BD5\u4E00\u6B21
diff --git a/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_it.properties
index 2ca1a01064509827b194adc774fe0993858ef53a..915e8f8efdc523bbd947898681a9270a299557c1 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Thu Jun 23 11:37:32 CEST 2016
+#Mon Oct 10 11:11:02 CEST 2016
 Directory=Cartella
 FileDeleteFailed=Eliminazione del file/della cartella <b>{0}</b> fallita.
 FileDeleted=Eliminazione dei file/delle cartelle <b>{0}</b> riuscita.
@@ -16,7 +16,7 @@ OverlappingTarget=Fonte e destinazione si sovrappongono.
 QuotaExceeded=La Sua cartella \u00E8 piena.
 QuotaExceededSupport=La cartella \u00E8 piena. Si rivolga a {0} per richiedere pi\u00F9 spazio di memoria.
 TargetNameAlreadyUsed=Esiste gi\u00E0 un file con questo nome.
-ULLimitExceeded=Il file \u00E8 troppo grande o la Sua cartella \u00E8 piena. Si rivolga a {0} per richiedere pi\u00F9 spazio di memoria.
+ULLimitExceeded=Il file \u00E8 troppo grande (massimo {0}MB) o la tua cartella \u00E8 piena. Rivolgersi a {1} per richiedere pi\u00F9 spazio di memorizzazione.
 UnknownFile=Sconosciuto
 UploadCanceled=Caricamento interrotto.
 UploadSuccess=Caricamento del file <b>{0}</b> riuscito.
diff --git a/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_zh_CN.properties
index cb64b644583022941b713d3f65b7f13e7caa8a45..df2f91c80cd9178538a07d1a883914645317ca8c 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_zh_CN.properties
@@ -1,8 +1,9 @@
-#Thu Sep 08 16:42:39 CEST 2011
+#Sun Oct 09 05:11:01 CEST 2016
 Directory=\u6587\u4EF6\u5939
 FileDeleteFailed=\u6587\u4EF6/\u6587\u4EF6\u5939<b>{0}</b>\u4E0D\u80FD\u5220\u9664\u3002
 FileDeleted=\u6587\u4EF6/\u6587\u4EF6\u5939<b>{0}</b> \u5220\u9664\u6210\u529F\u3002
 FileDoesNotExist=\u8BE5\u64CD\u4F5C\u65E0\u6CD5\u5B8C\u6210\uFF1A\u672A\u627E\u5230\u6587\u4EF6\u3002\u8BF7\u6CE8\u610F\u6587\u4EF6\u540D\u4E0D\u652F\u6301\u67D0\u4E9B\u5B57\u7B26\u3002
+FileEditFailed=\u672C\u6587\u4EF6\u4E0D\u80FD\u5728\u7F16\u8F91\u5668\u6253\u5F00\u3002
 FileMoveCopyFailed=\u6587\u4EF6/\u6587\u4EF6\u5939<b>{0}</b> \u65E0\u6CD5\u79FB\u52A8\u6216\u62F7\u8D1D\u3002
 FileRenameFailed=\u6587\u4EF6<b>{0}</b>\u4E0D\u80FD\u88AB\u91CD\u547D\u540D\u3002
 FileUnzipFailed=\u6587\u4EF6<b>{0}</b> \u4E0D\u80FD\u89E3\u538B\u7F29\u3002
@@ -13,6 +14,7 @@ NoFileChosen=\u6CA1\u6709\u9009\u62E9\u4EFB\u4F55\u6587\u4EF6
 NoFiles=\u6CA1\u6709\u4EFB\u4F55\u6587\u4EF6\u6216\u6587\u4EF6\u5939
 OverlappingTarget=\u6E90\u6587\u4EF6\u548C\u76EE\u6807\u6587\u4EF6\u91CD\u53E0\u3002
 QuotaExceeded=\u5B8C\u6210\u8BE5\u64CD\u4F5C\u6CA1\u6709\u591A\u4F59\u7684\u7A7A\u95F4\u3002
+QuotaExceededSupport=\u60A8\u7684\u6587\u4EF6\u5939\u6CA1\u6709\u5269\u4F59\u7A7A\u95F4\uFF0C\u8BF7\u8054\u7CFB{0}\uFF0C\u7533\u8BF7\u66F4\u591A\u7A7A\u95F4\u3002
 TargetNameAlreadyUsed=\u4EE5\u6B64\u547D\u540D\u7684\u6587\u4EF6\u5DF2\u7ECF\u5B58\u5728
 ULLimitExceeded=\u8BE5\u6587\u4EF6\uFF08\u6700\u591A{0}MB\uFF09\u592A\u5927\u6216\u8D85\u8FC7\u4E86\u4F60\u7684\u6587\u4EF6\u5939\u9650\u5236\uFF0C\u8BF7\u8054\u7CFB{1}\u83B7\u53D6\u66F4\u591A\u7A7A\u95F4\u3002
 UnknownFile=\u672A\u77E5
@@ -39,18 +41,24 @@ cfile.header=\u521B\u5EFA\u65B0\u6587\u4EF6
 cfile.name=\u540D\u79F0
 cfile.name.empty=\u8BF7\u60A8\u4E3A\u8981\u521B\u5EFA\u7684\u6587\u4EF6\u63D2\u5165\u4E00\u4E2A\u540D\u5B57\u3002
 cfile.name.example=index.html,info.txt,mystyles.css
+cfile.name.nodir=\u4E0D\u80FD\u4F7F\u7528\u76EE\u5F55\u4F5C\u4E3A\u6587\u4EF6\u540D
+cfile.name.noextension=\u672C\u6587\u4EF6\u6CA1\u6709\u6269\u5C55\u540D\uFF0C\u5728\u4E0A\u4F20\u6587\u4EF6\u4E4B\u524D\uFF0C\u8BF7\u786E\u4FDD\u6587\u4EF6\u5177\u6709\u6269\u5C55\u540D\u3002
+cfile.name.noname=\u6CA1\u6709\u7ED9\u51FA\u6587\u4EF6\u540D
 cfile.name.notvalid=\u6587\u4EF6\u540D\u79F0\u4E0D\u53EF\u7528\uFF0C\u8BF7\u79FB\u8D70\u6240\u6709\u8DEF\u5F84\u4E0B\u7684\u4FE1\u606F\u8D44\u6E90\uFF01
 cfile.name.notvalid.cannot.edit.metadata=\u672C\u6587\u4EF6\u540D\u5305\u542B\u65E0\u6548\u5B57\u7B26\u3002\u5143\u6570\u636E\u65E0\u6CD5\u88AB\u7F16\u8F91\u3002
+cfile.name.notvalidchars=\u672C\u6587\u4EF6\u540D\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26\u201D{0}\u201C\uFF0C\u8BF7\u79FB\u9664\u65E0\u6548\u5B57\u7B26\u518D\u4E0A\u4F20\u3002
 checkall=\u5168\u9009
 command.closepreview=\u5173\u95ED\u9884\u89C8
 command.preview=\u9884\u89C8
 copy=\u590D\u5236
+copyfile=\u590D\u5236\u6587\u4EF6
 del=\u5220\u9664
 del.confirm=\u4F60\u786E\u5B9A\u8981\u5220\u9664\u4E0B\u5217\u6587\u4EF6\uFF1F
 del.header=\u786E\u8BA4\u5220\u9664
 del.partial=\u90E8\u5206\u6587\u4EF6\u65E0\u6CD5\u5220\u9664\u3002
 dfiles=\u5220\u9664\u6587\u4EF6
 displayname.user={0}\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939
+download=\u4E0B\u8F7D
 edit=\u7F16\u8F91
 editQuota=\u7F16\u8F91\u914D\u989D
 editQuota.nop=\u8BE5\u5BF9\u8C61\u4E0D\u652F\u6301\u5B9A\u5236\u7684\u914D\u989D\u3002
@@ -65,7 +73,6 @@ header.Size=\u5927\u5C0F
 header.Status=\u72B6\u6001
 header.Type=\u7C7B\u578B
 header.Version=\u7248\u672C
-
 invalid.file.names=***
 lock.description=\u4E00\u4E2A\u6216\u591A\u4E2A\u6587\u4EF6\u88AB\u9501\u5B9A\u3002
 lock.title=\u9501\u5B9A\u6587\u4EF6
@@ -90,6 +97,8 @@ notifications.entry={1}\u4FEE\u6539\u4E86\u6587\u4EF6"{0}"
 notifications.header=\u60A8\u6240\u8BA2\u9605\u7684\u6587\u4EF6\u5939\u4E2D\u6709\u65B0\u6587\u4EF6\uFF1A
 resize_image=\u66F4\u6539\u56FE\u7247\u5927\u5C0F(1280X1280)
 searchfile=\u641C\u7D22
+send=\u53D1\u9001e-mail
+subpath.error.dir.is.file=\u4F7F\u7528\u8FD9\u4E2A\u8DEF\u5F84\u7684\u6587\u4EF6\u5DF2\u5B58\u5728
 success=\u64CD\u4F5C\u6210\u529F
 text.element.error.notlongerthan=\u6587\u4EF6\u548C\u6587\u4EF6\u5939\u540D\u79F0\u4E0D\u80FD\u8D85\u8FC720\u4E2A\u5B57\u7B26\u3002
 ul=\u4E0A\u4F20\u6587\u4EF6
@@ -107,6 +116,7 @@ ul.overwrite.threeoptions.title=\u6587\u4EF6\u5DF2\u5B58\u5728
 ul.quote=\u4F60\u7684\u6587\u4EF6\u5939\u4FE1\u606F
 ul.select=\u9009\u62E9\u6587\u4EF6
 ul.target=\u76EE\u6807
+ul.target.child=\u5B50\u76EE\u5F55
 ul.tooManyRevisions.description=\u6700\u5927\u7684\u4FEE\u8BA2\u6B21\u6570\u662F{0}\u3002\u73B0\u5DF2\u6709{1}\u6B21\u4FEE\u8BA2\u3002\u8BF7\u5148\u5220\u9664\u4E00\u4E9B\u5DF2\u505A\u8FC7\u7684\u4FEE\u8BA2\u4EE5\u589E\u52A0\u65B0\u7684\u4FEE\u8BA2\u3002
 ul.tooManyRevisions.title=\u5DF2\u6709\u8FC7\u591A\u7684\u4FEE\u8BA2\u3002
 ul.upload=\u63D0\u4EA4
@@ -117,6 +127,7 @@ unzip.alreadyexists=\u6587\u4EF6{0}\u5939\u5DF2\u7ECF\u5B58\u5728\uFF0C\u4E5F\u8
 versions=\u7248\u672C
 versions.revisions=\u7248\u672C
 webdav.link=WebDAV \u94FE\u63A5
+webdav.link.http=\u5982\u679C\u60A8\u9047\u5230\u94FE\u63A5\u95EE\u9898\uFF0C\u53EF\u4EE5\u4F7F\u7528\u4E0B\u9762\u7684\u66FF\u4EE3\u94FE\u63A5\u3002\u66F4\u591A\u4FE1\u606F\uFF0C\u8BF7\u770B\u4E0A\u4E0B\u6587\u5E2E\u52A9
 zip=\u538B\u7F29
 zip.alreadyexists=\u6587\u4EF6{0}\u5DF2\u7ECF\u5B58\u5728\uFF0C\u8BF7\u9009\u62E9\u53E6\u5916\u4E00\u4E2A\u3002
 zip.button=Zip\u6587\u4EF6
diff --git a/src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties
index 01642d2b3ae801fd839ee55b1020282897decd3c..81042e3725facd657b8749a4d7667786cbd556eb 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties
@@ -1,6 +1,8 @@
-#Sun Feb 07 10:24:24 CET 2010
+#Sun Oct 09 05:15:28 CEST 2016
 cfile.name.notvalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
+external.url=\u94FE\u63A5\u5230\u672C\u8D44\u6E90\u7684\u5916\u90E8\u94FE\u63A5
 file.name.notvalid=\u8BF7\u7FFB\u8BD1\uFF01\u6587\u4EF6\u540D\u4E0D\u5408\u6CD5\uFF0C\u8BF7\u5220\u9664\u6389\u4E0D\u5408\u6CD5\u7684\u5B57\u7B26\uFF01\u4E0D\u5408\u6CD5\u7684\u5B57\u7B26\u5305\u62EC\uFF1A\u975E\u62C9\u4E01\u5B57\u6BCD-1\uFF0C_,\:,\u7B49\u7B49
+folder.name.notvalid=\u6587\u4EF6\u5939\u540D\u79F0\u5305\u542B\u65E0\u6548\u5B57\u7B26\u3002\u8BF7\u79FB\u9664\u6240\u6709\u7279\u6B8A\u5B57\u7B26\uFF0C\u4F8B\u5982/\uFF0C\:\u7B49
 mf.author=\u7531\u521B\u5EFA
 mf.cancel=\u53D6\u6D88
 mf.city=\u4F4D\u7F6E
@@ -13,11 +15,13 @@ mf.error.filename.exists=\u4EE5\u6B64\u547D\u540D\u7684\u5BF9\u8C61\u65E9\u5DF2\
 mf.error.filename.invalidchars=\u5BF9\u8C61\u7684\u540D\u79F0\u5305\u542B\u65E0\u6548\u7684\u5B57\u7B26\u3002
 mf.file=\u6587\u4EF6
 mf.filename=\u6587\u4EF6\u540D
+mf.filename.warning=<i class\="o_icon o_icon_warn"> </i> \u8FD9\u4E2A\u6587\u4EF6\u5305\u542B\u4E86\u88AB\u79FB\u9664\u7684\u65E0\u6548\u5B57\u7B26\u3002
 mf.header=\u5143\u6570\u636E\u6587\u4EF6/\u6587\u4EF6\u5939
 mf.language=\u8BED\u8A00
 mf.lastModified=\u6700\u540E\u4E00\u6B21\u4FEE\u6539
 mf.locked=\u5DF2\u9501\u5B9A
 mf.locked.description={0} on {1}
+mf.locked.help=\u5982\u679C\u5176\u4ED6\u7528\u6237\u4E0D\u80FD\u91CD\u5199\uFF0C\u5220\u9664\u6216\u79FB\u52A8\u6587\u4EF6\uFF0C\u5C31\u4E3A\u6587\u4EF6\u52A0\u9501
 mf.lockedBy=\u9501\u5B9A\u8005
 mf.metadata.title=\u5143\u6570\u636E
 mf.month=mm
diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_it.properties
index 77663e0495c77c6c7994c86c260a8930005b9d20..fd1cd510944915d5bd7f64445be5ff13feb11e12 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_it.properties
@@ -1,4 +1,4 @@
-#Thu Jun 23 11:44:48 CEST 2016
+#Mon Oct 10 11:36:29 CEST 2016
 action.choose=Seleziona 
 actions.title=Modifiche
 command.subscribe=Abbonare
@@ -18,7 +18,7 @@ news.since.link=Mostrare modifiche
 news.title=Novit\u00E0 dagli abbonamenti
 news.type=Tipo
 news.type.all=Tutti
-notifcations.rss.desc=Pu\u00F2 abbonare le Sue novit\u00E0 anche tramite feed RSS. Selezioni il link RSS sottostante e lo inserisca nel Suo news reader RSS.
+notifcations.rss.desc=Puoi effettuare l'abbonamento alle novit\u00E0 anche tramite feed RSS. Seleziona il link RSS sottostante e inseriscilo nel tuo news reader RSS.
 notifcations.rss.title=Feed RSS personale
 notificationsPortlet.description=Accesso rapido agli avvisi delle Sue risorse didattiche abbonate
 notificationsPortlet.multiple.news.in={0} modifiche in {1}
@@ -31,7 +31,7 @@ overview.column.action.cellvalue=Eliminare
 overview.column.creationDate=Creato il
 overview.column.key=ID
 overview.column.lastEmail=Ultima e-mail
-overview.column.resname=Specie
+overview.column.resname=Tipo
 overview.column.subidentifier=Titolo
 overview.column.type=Tipo
 overview.tab.news=Novit\u00E0
@@ -43,7 +43,7 @@ rss.description=Avvisi sulle novit\u00E0 in OLAT via RSS News Feed per l'utente
 rss.notifications.title={0}\: {1} in {2} {3}
 rss.olat.description=Attraverso questo link pu\u00F2 arrivare a OLAT.
 rss.olat.title={0}, benvenuta/o a OLAT\!
-rss.title=Novit\u00E0 OLAT per {0}
+rss.title=Novit\u00E0 OpenOLAT per {0}
 subs.deleted=La sorgente dell'avviso \u00E8 eliminata\!
 subs.ok=Valido
 subscription.listitem.dateprefix=il {0}
diff --git a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_zh_CN.properties
index d094decfb7524110f789aaa75bf8cec286bca7e9..295a7083bb003564cc26cb80eb62ab70584d7d8c 100644
--- a/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/commons/services/notifications/ui/_i18n/LocalStrings_zh_CN.properties
@@ -1,37 +1,8 @@
-#Fri Dec 17 17:13:23 CET 2010
+#Sun Oct 09 05:18:33 CEST 2016
+action.choose=\u9009\u62E9
 actions.title=\u4FEE\u6539
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 command.subscribe=\u8BA2\u9605
 command.unsubscribe=\u53D6\u6D88\u8BA2\u9605
-
-subscription.listitem.dateprefix=on {0}
-user.unknown=\u672A\u77E5
-action.choose=\u9009\u62E9
 confirm.delete=\u60A8\u771F\u7684\u60F3\u8981\u5220\u9664\u4E3A\u60A8\u7684\u5B66\u4E60\u8D44\u6E90\u800C\u8BA2\u9605\u901A\u77E5\u5417\uFF1F
 email.nok=\u65E0\u6CD5\u901A\u8FC7e-mail\u53D1\u9001\u901A\u77E5\u3002\u8BF7\u7A0D\u540E\u518D\u8BD5\u6216\u8054\u7CFB\u60A8\u7684\u540E\u53F0\u670D\u52A1\u4EBA\u5458\u3002
 email.ok=\u5DF2\u901A\u8FC7e-mail\u53D1\u9001\u901A\u77E5\u3002
@@ -45,6 +16,8 @@ news.no.news=\u65E0\u6709\u6548\u4FE1\u606F
 news.since=\u4FEE\u6539\u59CB\u4E8E\uFF1A
 news.since.link=\u663E\u793A\u4FEE\u6539
 news.title=\u60A8\u6240\u8BA2\u9605\u7684\u901A\u77E5
+news.type=\u7C7B\u578B
+news.type.all=\u5168\u90E8
 notifcations.rss.desc=\u60A8\u4E5F\u53EF\u4EE5\u901A\u8FC7RSS\u6765\u8BA2\u9605\u901A\u77E5\u3002\u8BF7\u9009\u62E9\u4E0B\u65B9\u7684RSS\u94FE\u63A5\u4EE5\u6DFB\u52A0\u5230\u60A8\u7684RSS\u901A\u77E5\u9605\u8BFB\u5668\u4E2D\u3002
 notifcations.rss.title=\u4E2A\u4EBARSS\u901A\u77E5
 notificationsPortlet.description=\u5FEB\u901F\u8BBF\u95EE\u60A8\u5DF2\u8BA2\u9605\u7684\u5B66\u4E60\u8D44\u6E90\u66F4\u65B0\u901A\u77E5
@@ -55,6 +28,8 @@ notificationsPortlet.single.news.in=\u5728{0}\u4E2D\u8FDB\u884C\u4E00\u6B21\u66F
 notificationsPortlet.title=\u6211\u7684\u901A\u77E5
 overview.column.action=\u64CD\u4F5C
 overview.column.action.cellvalue=\u5220\u9664
+overview.column.creationDate=\u521B\u5EFA\u4E8E
+overview.column.key=ID
 overview.column.resname=\u7C7B\u578B
 overview.column.subidentifier=\u6807\u9898
 overview.column.type=\u7C7B\u578B
@@ -70,7 +45,10 @@ rss.olat.title=\u6B22\u8FCE\=\= {0} \=\=\u6765\u5230OLAT\u4E16\u754C\!
 rss.title={0}\u7684OLAT\u65B0\u95FB
 subs.deleted=\u901A\u77E5\u5DF2\u88AB\u5220\u9664
 subs.ok=\u6709\u6548
+subscription.listitem.dateprefix=on {0}
 subscriptions.desc=\u8BF7\u5217\u8868\u4E2D\u9009\u62E9\u4E00\u4E2A\u8BA2\u9605\u4EE5\u83B7\u5F97\u4ED6\u7684\u8D44\u6E90\u3002\u5982\u679C\u60A8\u4E0D\u5728\u5E0C\u671B\u6536\u5230\u6765\u81EA\u4ED6\u7684\u901A\u77E5\uFF0C\u8BF7\u5220\u9664\u8BA2\u9605\u3002\u7136\u800C\uFF0C\u65E0\u8BBA\u4F55\u65F6\u60A8\u518D\u60F3\u8BA2\u9605\u6B64\u901A\u77E5\uFF0C\u60A8\u8FD8\u662F\u53EF\u4EE5\u505A\u5230\u7684\u3002
 subscriptions.no.subscriptions=\u6B64\u523B\u60A8\u8FD8\u6CA1\u6709\u8BA2\u9605\u4EFB\u4F55\u8D44\u6E90\u3002\r\n\u60A8\u53EF\u4EE5\u4ECE\u8BBA\u575B\u3001\u7EF4\u57FA\u3001\u6587\u4EF6\u5939\u4EE5\u53CA\u5176\u4ED6\u8BB8\u591A\u8D44\u6E90\u53D1\u8D77\u8BA2\u9605\u3002\u4E3A\u4E86\u60A8\u80FD\u8BA2\u9605\u6210\u529F\uFF0C\u5728\u70B9\u51FB"\u8BA2\u9605"\u6309\u94AE\u4E4B\u524D\u8BF7\u5148\u6253\u5F00\u60F3\u8981\u8BA2\u9605\u7684\u8D44\u6E90\u3002
 subscriptions.title=\u7BA1\u7406\u5458\u8BA2\u9605
+user.formatted={0} {1}
+user.unknown=\u672A\u77E5
 warn.nolaunch=\u65E0\u6CD5\u518D\u542F\u52A8\u5DF2\u9009\u62E9\u7684\u8D44\u6E90
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_zh_CN.properties
index aaf810c64e4b726be275e30c6d13989ddc1c5b37..60700ca1bab69d7137b7ad73b13bb6a445a9eac7 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,6 @@
-#Fri Jan 22 04:34:05 CET 2010
+#Sat Oct 08 09:29:41 CEST 2016
+confirm.delete.file=\u60A8\u771F\u7684\u60F3\u8981\u79FB\u9664\u8FD9\u4E2A\u6587\u4EF6\u5417\uFF1F
+confirm.delete.file.title=\u5220\u9664\u6587\u4EF6
 day.short.di=\u5468\u4E8C
 day.short.do=\u5468\u56DB
 day.short.fr=\u5468\u4E94
@@ -6,6 +8,13 @@ day.short.mi=\u5468\u4E09
 day.short.mo=\u5468\u4E00
 day.short.sa=\u5468\u516D
 day.short.so=\u5468\u65E5
+file.element.delete=\u4ECE\u670D\u52A1\u5668\u4E0A\u5220\u9664\u9009\u4E2D\u7684\u6587\u4EF6
+file.element.error.general=\u5728\u6587\u4EF6\u4F20\u8F93\u4E2D\u53D1\u751F\u672A\u77E5\u7684\u9519\u8BEF\u3002\u8BF7\u518D\u8BD5\u4E00\u6B21\uFF0C\u5E76\u786E\u4FDD\u6587\u4EF6\u540D\u4E2D\u4E0D\u5305\u542B\u4EFB\u4F55\u7279\u6B8A\u5B57\u7B26(+"*\u00E7&/()\=?^`^'\!$\u00A3\u00A8\:,;\u00A7\u00B0).
+file.element.select=\u9009\u62E9\u6587\u4EF6
+file.element.select.maxsize=\u6700\u59270.5MB
+inline.edit.help=\u5355\u51FB\u4EE5\u7F16\u8F91
+inline.empty.click.for.edit=<\u70B9\u51FB\u4FEE\u6539>
+integer.element.int.error=\u6709\u6548\u503C\u5E94\u8BE5\u662F\u6574\u6570
 month.long.apr=4\u6708
 month.long.aug=8\u6708
 month.long.dec=12\u6708
@@ -18,11 +27,6 @@ month.long.mar=3\u6708
 month.long.nov=11\u6708
 month.long.oct=9\u6708
 month.long.sep=9\u6708
-file.element.error.general=\u5728\u6587\u4EF6\u4F20\u8F93\u4E2D\u53D1\u751F\u672A\u77E5\u7684\u9519\u8BEF\u3002\u8BF7\u518D\u8BD5\u4E00\u6B21\uFF0C\u5E76\u786E\u4FDD\u6587\u4EF6\u540D\u4E2D\u4E0D\u5305\u542B\u4EFB\u4F55\u7279\u6B8A\u5B57\u7B26(+"*\u00E7&/()\=?^`^'\!$\u00A3\u00A8\:,;\u00A7\u00B0).
-file.element.select=\u9009\u62E9\u6587\u4EF6
-file.element.select.maxsize=\u6700\u59270.5MB
-inline.empty.click.for.edit=<\u70B9\u51FB\u4FEE\u6539>
-integer.element.int.error=\u6709\u6548\u503C\u5E94\u8BE5\u662F\u6574\u6570
 text.element.error.maxvalue=\u5141\u8BB8\u6700\u5927\u503C\u4E3A{0}\u3002
 text.element.error.minvalue=\u5141\u8BB8\u6700\u5C0F\u503C\u4E3A{0}\u3002
 text.element.error.notlongerthan=\u4E0D\u5141\u8BB8\u8D85\u8FC7{0}\u4E2A\u8BCD\u3002
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_i18n/LocalStrings_zh_CN.properties
index 595c794e457e1e0819c46625100b14518faccf60..aa828ba70091957c0e1c315213ef549b83fbbc2e 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/plugins/olatmovieviewer/_i18n/LocalStrings_zh_CN.properties
@@ -1,13 +1,4 @@
-#Wed Jul 28 13:33:30 CEST 2010
-
-
-
-
-
-
-
-
-
+#Sat Oct 08 09:30:13 CEST 2016
 olatmovieviewer.address=\u6D41\u5A92\u4F53\u5730\u5740
 olatmovieviewer.advanced=\u9AD8\u7EA7
 olatmovieviewer.autostart=\u7ACB\u5373\u5F00\u59CB
@@ -23,6 +14,7 @@ olatmovieviewer.insert=\u63D2\u5165
 olatmovieviewer.invalid_date=\u65E0\u6548\u7684\u65F6\u95F4\u683C\u5F0F\uFF1A\u8BF7\u4F7F\u7528 \u65F6\uFF1A\u5206\uFF1A\u5999.000\u7684\u683C\u5F0F
 olatmovieviewer.name=\u59D3\u540D
 olatmovieviewer.play=\u64AD\u653E\u89C6\u9891
+olatmovieviewer.poster=\u9884\u89C8
 olatmovieviewer.preview=\u9884\u89C8
 olatmovieviewer.provider=\u7C7B\u578B
 olatmovieviewer.repeat=\u56DE\u653E
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..3b9b7ac3abfd6d72db7760a7cf94bf0eaa2e249c
--- /dev/null
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,4 @@
+#Sat Oct 08 09:31:04 CEST 2016
+page.size.a=\u663E\u793A {0} to {1} of {2} \u884C
+page.size.b=\u6BCF\u4E00\u9875\u7684\u6761\u76EE
+show.all=\u5168\u90E8
diff --git a/src/main/java/org/olat/core/gui/components/stack/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/stack/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b9ae80604ef72cb4754543402429846111ac76cc
--- /dev/null
+++ b/src/main/java/org/olat/core/gui/components/stack/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,2 @@
+#Sat Oct 08 09:31:18 CEST 2016
+doclose=\u5173\u95ED{0}
diff --git a/src/main/java/org/olat/core/gui/components/table/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/table/_i18n/LocalStrings_zh_CN.properties
index 144fe9ad69d28c5a760e423f85a919857e0c65a0..a0de49d13e4a2cf0b8ec03bec8aef7bc1e8b0ff4 100644
--- a/src/main/java/org/olat/core/gui/components/table/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/components/table/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,4 @@
-#Wed Apr 21 14:01:16 CEST 2010
+#Sat Oct 08 09:31:56 CEST 2016
 checkall=\u5168\u9009
 command.changecols=\u5217 ...
 default.tableEmptyMessage=\u672A\u627E\u5230\u6570\u636E\uFF0C\u56E0\u6B64\u65E0\u6CD5\u663E\u793A\u3002
@@ -9,6 +9,7 @@ row.move.left=\u628A\u884C\u79FB\u5230\u5DE6\u8FB9
 row.move.right=\u628A\u884C\u79FB\u5230\u53F3\u8FB9
 row.sort=\u5728\u6B64\u5217\u4E0B\u6392\u5E8F
 row.sort.invert=\u6539\u53D8\u6392\u5217\u987A\u5E8F
+table.export.title=\u8868\u683C\u8F93\u51FA
 table.filter.label=\u5728\u8868\u683C\u4E2D\u641C\u7D22\uFF1A
 table.filtered.include.plur=\u5305\u62EC
 table.filtered.include.sing=\u5305\u542B
diff --git a/src/main/java/org/olat/core/gui/components/textboxlist/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/components/textboxlist/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ea01e038885aaf544354e8a375e83e20df15b141
--- /dev/null
+++ b/src/main/java/org/olat/core/gui/components/textboxlist/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,5 @@
+#Sat Oct 08 09:34:23 CEST 2016
+add.new.element.prefix=\u589E\u52A0
+default.input.hint=\u5355\u51FB\uFF0C\u589E\u52A0\u5143\u7D20\u3002\u591A\u4E2A\u5143\u7D20\u7528\u9017\u53F7\u5206\u9694\u3002
+more.results.found.specify.search=\u627E\u5230\u7684\u7ED3\u679C\u592A\u591A\uFF0C\u8BF7\u7F29\u5C0F\u641C\u7D22\u8303\u56F4
+please.wait.searching=\u8BF7\u8010\u5FC3\u7B49\u5F85\uFF0C\u6B63\u5728\u641C\u7D22\uFF1A
diff --git a/src/main/java/org/olat/core/gui/control/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/control/_i18n/LocalStrings_zh_CN.properties
index 87ad9a8e37f5a75897b2d48feb80d1663261b751..45b900518e518bf2fd196ca7e331098eca83006a 100644
--- a/src/main/java/org/olat/core/gui/control/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/control/_i18n/LocalStrings_zh_CN.properties
@@ -1,2 +1,7 @@
-#Tue Jun 08 09:23:08 CEST 2010
+#Sat Oct 08 09:40:56 CEST 2016
 controller.disposed.message=\u8BE5\u663E\u793A/\u8FC7\u7A0B\u4E0D\u518D\u6709\u6548, \u8BF7\u9009\u62E9\u5176\u5B83\u94FE\u63A5\u7EE7\u7EED, \u8C22\u8C22.
+standby.page.button=\u56DE\u5230OLAT
+standby.page.button.title=\u5728\u672C\u7A97\u53E3\u7EE7\u7EEDOLAT
+standby.page.heading=\u5F85\u673A\u6A21\u5F0F
+standby.page.message=\u56E0\u4E3A\u5F53\u524D\u60A8\u6B63\u5728\u53E6\u4E00\u4E2AOLAT\u6D4F\u89C8\u5668\u7A97\u53E3\u5DE5\u4F5C\uFF0C\u672C\u6D4F\u89C8\u5668\u7A97\u53E3\u5904\u4E8E\u5F85\u673A\u6A21\u5F0F\u3002\u5982\u679C\u60A8\u60F3\u7EE7\u7EED\u5728\u53E6\u4E00\u4E2A\u6D4F\u89C8\u5668\u7A97\u53E3\u5DE5\u4F5C\uFF0C\u60A8\u53EF\u4EE5\u5173\u95ED\u672C\u7A97\u53E3\u3002\u53EA\u9700\u8981\u5355\u51FB\u6309\u94AE\u201C\u56DE\u5230 OLAT" \u5C31\u53EF\u4EE5\u7EE7\u7EED\u672C\u7A97\u53E3\u3002
+standby.page.title=OLAT\uFF08\u5F85\u673A\u6A21\u5F0F\uFF09
diff --git a/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..339192ee89d9d1dc52cd930058358beb19531bce
--- /dev/null
+++ b/src/main/java/org/olat/core/gui/control/generic/ajax/autocompletion/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,5 @@
+#Sat Oct 08 09:42:48 CEST 2016
+autocomplete.error=\u641C\u7D22\u65F6\u4EA7\u751F\u4E86\u9519\u8BEF
+autocomplete.noresults=\u6CA1\u6709\u67E5\u5230\u641C\u7D22\u7ED3\u679C
+autocomplete.not.enough.chars=\u8BF7\u6CE8\u660E\u81F3\u5C11\u4E09\u4E2A\u5B57\u7B26\u3002
+autocomplete.searching=\u6B63\u5728\u641C\u7D22......
diff --git a/src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_zh_CN.properties
index 8487ed0eff14636f08fbee8bb349f4625cacce41..c391ecd9a941bb7462a7034168d3d84805e9cf66 100644
--- a/src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/control/generic/iframe/_i18n/LocalStrings_zh_CN.properties
@@ -1,8 +1,27 @@
-#Fri Oct 23 09:22:07 CEST 2009
+#Sat Oct 08 10:07:07 CEST 2016
+automatic.need.js=\u81EA\u52A8\u5316\u9700\u8981javascript
 command.download=\u4E0B\u8F7D
-iframe.content=\u5728\u6D6E\u52A8\u7A97\u4F53\u4E2D\u7684\u9875\u9762\u5185\u5BB9
+custom=\u4FEE\u6539
+encoding.auto=\u81EA\u52A8
 encoding.content=\u5185\u5BB9\u5B57\u7B26\u96C6
 encoding.js=Javascript\u5B57\u7B26\u96C6
 encoding.same=\u4E0E\u5185\u5BB9\u76F8\u540C
+glossary.need.jQuery=\u8BCD\u6C47\u8868\u9700\u8981jQuery
 height.auto=\u81EA\u52A8
-height.label=\u663E\u793A\u9AD8\u5EA6
\ No newline at end of file
+height.label=\u663E\u793A\u9AD8\u5EA6
+iframe.content=\u5728\u6D6E\u52A8\u7A97\u4F53\u4E2D\u7684\u9875\u9762\u5185\u5BB9
+inherit.label=\u4F7F\u7528\u6807\u51C6\u8BBE\u7F6E
+mode=\u663E\u793A\u6A21\u5F0F
+mode.configured=OpenOLAT\u4F18\u5316
+mode.hover=\u4F7F\u7528\u6807\u51C6\u8BBE\u7F6E\u5916\u90E8\u521B\u5EFA\u5185\u5BB9
+mode.standard=\u6807\u51C6
+option.css=\u81EA\u9002\u5E94\u5E03\u5C40
+option.css.none=None
+option.css.openolat=OpenOLAT stylesheets
+option.delivery=\u5E03\u5C40
+option.desc=\u5E03\u5C40\u9009\u9879
+option.glossary=\u5D4C\u5165\u7684\u8BCD\u6C47\u672F\u8BED
+option.js=\u5D4C\u5165\u7684Javascript\u5E93
+option.js.jQuery=jQuery
+option.js.none=None
+option.js.prototypejs=Prototype
diff --git a/src/main/java/org/olat/core/gui/exception/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/gui/exception/_i18n/LocalStrings_zh_CN.properties
index ef4d42ac361dd4c67583d294fb90577ea6f140d0..169683592d401006a96bbc840572c2cfcb767ac2 100644
--- a/src/main/java/org/olat/core/gui/exception/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/gui/exception/_i18n/LocalStrings_zh_CN.properties
@@ -1,7 +1,9 @@
-#Fri Oct 23 12:17:45 CEST 2009
+#Sat Oct 08 10:07:52 CEST 2016
 cancel=\u5220\u9664
 error.addinfo=\u9644\u52A0\u4FE1\u606F\uFF1A
 error.back=\u8FD4\u56DE
+error.businesspath=\u4E1A\u52A1\u8DEF\u5F84
+error.businesspath.unkown=\u672A\u77E5
 error.databaseexception=\u610F\u5916\u7684\u6570\u636E\u5E93\u9519\u8BEF
 error.errnum=\u9519\u8BEF\u4EE3\u7801\uFF1A
 error.header=\u9519\u8BEF
diff --git a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_zh_CN.properties
index 7778182b17b7df97c29524a9589dc64ca540c0f9..908a1137b7de86b08f847ace8ef0a2c25da59208 100644
--- a/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_zh_CN.properties
@@ -1,17 +1,51 @@
-#Wed Sep 10 11:13:16 CEST 2014
-
-
-
-
-
-
-
-
-
+#Sun Oct 09 05:46:32 CEST 2016
+add.email=\u589E\u52A0
 contact.cp.from=\u53D1\u9001\u7ED9\u53D1\u4EF6\u4EBA\u7684\u590D\u4EF6
 footer.no.userdata=<p>\u8BE5\u6D88\u606F\u5DF2\u7ECF\u901A\u8FC7OpenOLAT\u81EA\u52A8\u53D1\u9001\: {0}</p>
 footer.with.userdata=<p>{2} {3} ({0}), {4} {5}</p><p>\u8BE5\u6D88\u606F\u5DF2\u7ECF\u901A\u8FC7 OpenOLAT\u53D1\u9001\: {1}</p>
-
+mail.action.emtpy=\u81F3\u5C11\u9009\u62E9\u4E00\u4E2Ae-mail\uFF0C\u624D\u80FD\u6267\u884C\u672C\u64CD\u4F5C
+mail.action.mark=\u6807\u8BB0
+mail.action.open=\u8BFB
+mail.action.send.real.success=\u4E3B\u9898\u201C{0}\u201D\u7684\u6D88\u606F\u5DF2\u53D1\u9001\u5230\u60A8\u7684\u4E2A\u4EBA\u90AE\u7BB1
+mail.action.unmark=\u53D6\u6D88\u6807\u8BB0
+mail.action.unread=\u672A\u8BFB
+mail.admin.default.settings=e-mail\u53D1\u9001\u7684\u6807\u51C6\u8BBE\u7F6E
+mail.admin.description=OLAT e-mail\u548C\u6536\u4EF6\u7BB1\u7684\u8BBE\u7F6E
+mail.admin.intern.enabled=\u542F\u7528OLAT e-mail\u6536\u4EF6\u7BB1
+mail.admin.intern.only=\u53D1\u9001e-mail\u5230\u5185\u90E8OLAT\u6536\u4EF6\u7BB1
+mail.admin.intern.real.mail=\u53D1\u9001e-mail\u5230\u5185\u90E8OLAT\u6536\u4EF6\u7BB1\u548C\u4E2A\u4EBAe-mail\u90AE\u7BB1
+mail.admin.title=E-mail\u6536\u4EF6\u7BB1\u548C\u53D1\u4EF6\u7BB1
+mail.attachments=\u9644\u4EF6
+mail.body=\u6D88\u606F
+mail.confirm.delete.multi.text=\u8BF7\u786E\u8BA4\u60A8\u771F\u7684\u8981\u5220\u9664\u9009\u62E9\u7684{0}e-mail\u53CA\u5176\u9644\u4EF6\u3002\u8BE5\u64CD\u4F5C\u4E0D\u80FD\u53D6\u6D88
+mail.confirm.delete.single.text=\u8BF7\u786E\u8BA4\u60A8\u771F\u7684\u8981\u5220\u9664\u9009\u62E9\u7684e-mail\u53CA\u5176\u9644\u4EF6\u3002\u8BE5\u64CD\u4F5C\u4E0D\u80FD\u53D6\u6D88
+mail.confirm.delete.title=\u5220\u9664e-mail
+mail.context=\u6B63\u6587
+mail.empty.box=\u672C\u6536\u4EF6\u7BB1\u6CA1\u6709\u90AE\u4EF6
+mail.from=\u53D1\u4EF6\u4EBA
+mail.from.miscellaneous=\u5176\u4ED6
+mail.inbox=\u6536\u4EF6\u7BB1
+mail.inbox.alt=E-mail\u6536\u4EF6\u7BB1
+mail.marked=\u5DF2\u6807\u8BB0
+mail.marked.header=<i class\="o_icon o_icon-lg o_icon_bookmark_header"> </i>
+mail.notification.type=E-mails
+mail.outbox=\u53D1\u4EF6\u7BB1
+mail.outbox.alt=E-mail\u53D1\u4EF6\u7BB1
+mail.outbox.meta=\u8FD9\u4E9B\u7535\u5B50\u90AE\u4EF6\u5DF2\u88AB\u4F5C\u4E3A\u7FA4\u53D1\u7535\u5B50\u90AE\u4EF6\u53D1\u9001\u3002
+mail.outbox.title=E-mail\u53D1\u4EF6\u7BB1
+mail.read=\u5DF2\u8BFB
+mail.read.header=<i class\="o_icon o_icon-lg o_icon_to_read"> </i>
+mail.receivedDate=\u6536\u5230
+mail.recipients=\u6536\u4EF6\u4EBA
+mail.sendDate=\u53D1\u9001\u65E5\u671F
+mail.settings=\u8BBE\u7F6E
+mail.subject=\u4E3B\u9898
+mail.template=E-mail\u6A21\u677F
+mail.template.description=\u4FEE\u6539e-mail\u6A21\u677F\u7684\uFF28\uFF34\uFF2D\uFF2C\u4EE3\u7801\uFF0C\u6539\u53D8\u7CFB\u7EDF\u53D1\u9001\u7684\u6240\u6709e-mail\u7684\u5916\u89C2
+mail.template.title=\u7F16\u8F91e-mail\u6A21\u677F
+mail.unmarked=\u53D6\u6D88\u6807\u8BB0
+mail.unread=\u672A\u8BFB
+mailhelper.error.addressinvalid=\u4E00\u4E2A\u6216\u591A\u4E2A\u5730\u5740\u65E0\u6548\uFF1A{0}
 mailhelper.error.attachment=\u90AE\u4EF6\u4E0D\u80FD\u88AB\u53D1\u9001\uFF1A\u65E0\u6548\u9644\u4EF6.\u8BF7\u4EBA\u5DE5\u901A\u77E5\u90AE\u4EF6\u63A5\u53D7\u8005.
 mailhelper.error.failedusers=\u4F60\u7684\u7535\u5B50\u90AE\u4EF6\u4E0D\u80FD\u88AB\u53D1\u9001\u7ED9\u4E0B\u9762\u7684\u7528\u6237\u3002\u8BF7\u4EBA\u5DE5\u901A\u77E5\u4ED6\u4EEC\u5E76\u8981\u6C42\u5176\u68C0\u67E5\u7535\u5B50\u90AE\u4EF6\u5730\u5740
 mailhelper.error.failedusers.title=\u4F7F\u90AE\u4EF6\u63A5\u6536\u8005\u7684\u7535\u5B50\u90AE\u4EF6\u5730\u5740\u65E0\u6548\u3002
@@ -40,3 +74,4 @@ send.mail.selectionContainsFolder=\u53EA\u80FD\u53D1\u9001\u5355\u4E2A\u6587\u4E
 send.mail.subject=\u4E3B\u9898
 send.mail.title=\u6587\u4EF6\u548C\u7535\u5B50\u90AE\u4EF6\u4E00\u8D77\u53D1\u9001
 send.mail.to=\u81F4
+send.mail.to.auto=To
diff --git a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_zh_CN.properties
index 7e8e0e6c33e5ce9b7f8bdf08d5cb77e8a90b5bd1..171b178125ad20cc0ba8fc75d6b746353d399cb5 100644
--- a/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/archiver/_i18n/LocalStrings_zh_CN.properties
@@ -1,51 +1,23 @@
-#Thu Sep 03 11:24:43 CEST 2015
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#Tue Oct 11 03:12:57 CEST 2016
+checklist=\u6E05\u5355
+cmd.download=\u4E0B\u8F7D
 cmd.start=\u5F00\u59CB
 column.field.missing=-
 column.field.no=\u5426
 column.field.notavailable=n/a
 column.field.yes=\u662F
 column.header.attempts=\u5C1D\u8BD5\u6B21\u6570
+column.header.businesspath=URL
 column.header.coachcomment=\u5BF9\u6307\u5BFC\u6559\u5E08\u7684\u8BC4\u8BBA
 column.header.comment=\u5BF9\u7528\u6237\u7684\u8BC4\u8BBA
+column.header.initialLaunchDate=\u8BFE\u7A0B\u521D\u59CB\u5316
 column.header.passed=\u5DF2\u901A\u8FC7
 column.header.score=\u6210\u7EE9
+column.header.scoreLastModified=\u6700\u540E\u66F4\u65B0
 column.header.seqnum=\u53F7\u7801 
 command.change.charset=\u5B57\u7B26\u96C6
 command.closearchiver=\u5173\u95ED
+course.logs.busy=\u4E3A\u672C\u8BFE\u7A0B\u6216\u53E6\u4E00\u4E2A\u8BFE\u7A0B\u751F\u6210\u8BFE\u7A0B\u65E5\u5B50\u6587\u4EF6\u7684\u8FDB\u7A0B\u6B63\u5728\u8FD0\u884C\u3002<p>\u8BF7\u7B49\u5F85\u8BE5\u8FDB\u7A0B\u5B8C\u6210\uFF0C\u60A8\u5C06\u6536\u5230\u4E00\u4E2Ae-mail\u901A\u77E5\uFF0C\u4E4B\u540E\u60A8\u624D\u53EF\u4EE5\u63D0\u4EA4\u65B0\u7684\u8BFE\u7A0B\u65E5\u5FD7\u8BF7\u6C42\u3002
 course.logs.error=\u4F60\u672A\u9009\u62E9\u65E5\u5FD7\u6587\u4EF6
 course.logs.existingarchiveintro=\u5DF2\u5BFC\u51FA\u7684\u5B66\u7A0B\u65E5\u5FD7\u6587\u4EF6\u88AB\u4FDD\u5B58\u5728\u60A8\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939\uFF0C\u5B83\u4F4D\u4E8E \u4E2A\u4EBA/\u5B58\u6863  \u90E8\u5206\uFF1A
 course.logs.feedback=\u4F60\u53EF\u4EE5\u5728\u4E2A\u4EBA\u7684\u6587\u4EF6\u5939\u7684private/archive/[\u8BFE\u7A0B\u540D\u79F0]\u90E8\u5206\u4E2D\u627E\u5230\u5305\u542B\u8BE5\u8BFE\u7A0B\u65E5\u5FD7\u7684\u538B\u7F29\u6587\u4EF6<b>{0}</b>.
@@ -60,9 +32,10 @@ course.res.intro=\u70B9\u51FB\u201C\u5F00\u59CB\u201D\u6309\u94AE\u53EF\u4EE5\u5
 course.res.title=\u8BFE\u7A0B\u7ED3\u679C
 dialog=\u6587\u4EF6\u8BA8\u8BBA
 fo=\u8BBA\u575B
-
+gta=\u4EFB\u52A1\u548C\u7FA4\u7EC4\u4EFB\u52A1
 index.intro=\u4F60\u53EF\u4EE5\u4F7F\u7528\u8BE5\u5DE5\u5177\u5BF9\u8BFE\u7A0B\u7684\u5404\u9879\u6570\u636E\u8FDB\u884C\u5F52\u6863\u3002<p>\u4ECE\u5DE6\u8FB9\u83DC\u5355\u4E2D\u9009\u62E9\u4E00\u4E2A\u4E3B\u9898\u5F00\u59CB
 index.title=\u6570\u636E\u5F52\u6863\u5DE5\u5177
+legend=\u5386\u53F2
 logfilechooserform.archive=\u5F52\u6863
 logfilechooserform.begindate=\u4ECE
 logfilechooserform.deletelog=\u5F52\u6863\u540E\u5220\u9664
@@ -73,10 +46,13 @@ logfilechooserform.logstat=\u7528\u6237\u65E5\u5FD7\u6587\u4EF6(\u533F\u540D/\u7
 logfilechooserform.loguser=\u7528\u6237\u65E5\u5FD7\u6587\u4EF6(\u79C1\u4EBA/\u6240\u6709\u7528\u6237\u7684\u8BE6\u7EC6\u6D3B\u52A8)
 menu.archivelogfiles=\u65E5\u5FD7\u6587\u4EF6
 menu.archivelogfiles.alt=\u7BA1\u7406\u5458\u3001\u8BFE\u7A0B\u548C\u7528\u6237\u7684\u65E5\u5FD7\u6587\u4EF6
+menu.checklist=\u6E05\u5355
 menu.dialogs=\u6587\u4EF6\u8BA8\u8BBA
 menu.dialogs.alt=\u5BF9"\u6587\u4EF6\u8BA8\u8BBA"\u8FDB\u884C\u5F52\u6863
 menu.forums=\u8BBA\u575B
 menu.forums.alt=\u5BF9"\u8BBA\u575B"\u8BB0\u5F55\u5F52\u6863
+menu.grouptasks=\u4EFB\u52A1\u548C\u7FA4\u7EC4\u4EFB\u52A1
+menu.grouptasks.alt=\u5BF9\u4EFB\u52A1\u548C\u7FA4\u7EC4\u4EFB\u52A1\u5F52\u6863
 menu.handedintasks=\u63D0\u4EA4\u7BB1
 menu.handedintasks.alt=\u5BF9\u63D0\u4EA4\u7BB1\u8FDB\u884C\u5F52\u6863
 menu.index=\u5F52\u6863
@@ -91,12 +67,15 @@ menu.scorm=SCORM \u6210\u7EE9
 menu.scorm.alt=SCORM \u6210\u7EE9
 menu.wikis=Wiki
 menu.wikis.alt=\u5F52\u6863Wikis
+nodechoose.intro.cl=\u8BF7\u9009\u62E9\u8981\u5F52\u6863\u7684\u5143\u7D20\u6E05\u5355
 nodechoose.intro.dialog=\u9009\u62E9\u4E00\u4E2A\u8BFE\u7A0B\u5143\u7D20\u5F52\u6863\u5176\u6587\u4EF6\u8BA8\u8BBA. \u8BE5\u5F52\u6863\u5B58\u653E\u5728\u4F60\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939 private/archive/[course name]/file dialog_[forum_id]\u4E2D.
 nodechoose.intro.fo=\u9009\u62E9\u4E00\u4E2A\u8BFE\u7A0B\u5143\u7D20\u5F52\u6863\u5176\u8BBA\u575B. \u8BE5\u5F52\u6863\u5B58\u653E\u5728\u4F60\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939private/archive/[course name]/forum_[forum_id]\u4E2D. 
+nodechoose.intro.gta=\u8BF7\u9009\u62E9\u8981\u5F52\u6863\u7FA4\u7EC4\u4EFB\u52A1\u7684\u8BFE\u7A0B\u5143\u7D20
 nodechoose.intro.projectbroker=\u8BF7\u9009\u62E9\u4E00\u4E2A\u5B66\u7A0B\u5143\u7D20\u4EE5\u4FDD\u5B58\u5176\u9879\u76EE\u7ECF\u7EAA\u4EBA\u3002\u60A8\u80FD\u591F\u5728\u60A8\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939\u4E2D\u627E\u5230\u4FDD\u5B58\u7684\u9879\u76EE\u7ECF\u7EAA\u4EBA\uFF0C\u5B83\u4F4D\u4E8E \u4E2A\u4EBA/\u5B58\u6863/[course's name]/projectbroker_[id]
 nodechoose.intro.scorm=\u8BF7\u5728\u4EE5\u4E0B\u5BF9\u8BDD\u6846\u4E2D\u9009\u62E9\u8981\u8BC4\u4EF7\u7684SCORM\u5143\u7D20\u3002\u5B58\u50A8\u7684\u6210\u7EE9\u53EF\u4EE5\u5728\u60A8\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939\u4E2D\u627E\u5230\uFF0C\u5B83\u4F4D\u4E8E \u4E2A\u4EBA/\u5B58\u50A8/[course name]/[file name]\u3002
 nodechoose.intro.ta=\u9009\u62E9\u4E00\u4E2A\u8BFE\u7A0B\u5143\u7D20\u5F52\u6863\u5176tasks/solutions. \u8BE5\u5F52\u6863\u5B58\u653E\u5728\u4F60\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939n private/archive/[course name]/task_[name of course element]\u4E2D.
 nodechoose.intro.wiki=\u9009\u62E9\u4E00\u4E2A\u8BFE\u7A0B\u5143\u7D20\u5F52\u6863\u5176wiki. \u8BE5\u5F52\u6863\u5B58\u653E\u5728\u4F60\u7684\u4E2A\u4EBA\u6587\u4EF6\u5939  private/archive/[course name]/wiki_[date] \u4E2D.
+overview.nonodes.checklist=\u672C\u8BFE\u7A0B\u6CA1\u6709\u4EFB\u4F55\u6E05\u5355
 overview.nonodes.dialog=\u8BE5\u8BFE\u7A0B\u4E0D\u5305\u542B\u4EFB\u4F55\u6587\u4EF6\u8BA8\u8BBA
 overview.nonodes.fo=\u8BE5\u8BFE\u7A0B\u4E0D\u5305\u542B\u4EFB\u4F55\u8BBA\u575B
 overview.nonodes.gta=\u8BE5\u8BFE\u7A0B\u4E0D\u5305\u542B\u4EFB\u4F55\u8BBA\u575B
@@ -106,8 +85,13 @@ overview.nonodes.ta=\u8BE5\u8BFE\u7A0B\u4E0D\u5305\u542B\u4EFB\u4F55\u4EFB\u52A1
 overview.nonodes.wiki=\u8BE5\u8BFE\u7A0B\u4E0D\u5305\u542B\u4EFB\u4F55wiki
 projectbroker=\u9879\u76EE\u7ECF\u7EAA\u4EBA
 readme=\u63D0\u793A\n\n\u4F5C\u4E3A\u4E00\u4E2A\u5F52\u6863\u6570\u636E\u7684\u63A5\u53D7\u8005\uFF0C\u4F60\u5FC5\u987B\u786E\u4FDD\u8BE5\u6570\u636E\u53EA\u6709\u5728\u88AB\u6388\u6743\u7684\u60C5\u51B5\u4E0B\u624D\u88AB\u4F7F\u7528\u3002n \n \n- \u8DDF\u5927\u5B66\u95EE\u9898\u6709\u5173\u7684\u4E2A\u4EBA\u6570\u636E\u53EF\u7528\u4E8E\u7814\u7A76\uFF0C\u6559\u5B66\u548C\u8BC4\u4F30\u3002\n \n- \u533F\u540D\u6570\u636E\u4E5F\u53EF\u7528\u4E8E\u6570\u636E\u7EDF\u8BA1\u3002n \n- \u53EA\u8981\u6709\u5FC5\u8981\uFF0C\u8FD8\u53EF\u4EE5\u5F52\u6863\u4E2A\u4EBA\u6570\u636E\u3002\n \n-  \u4E0D\u5FC5\u8981\u7684\u6570\u636E\u5FC5\u987B\u5220\u9664\u3002
+scorm=SCORM
+select.group=\u9009\u62E9\u7FA4\u7EC4
+select.group.all=\u6240\u6709\u5B66\u4E60\u8005
+select.group.desc=\u5982\u679C\u4F60\u613F\u610F\uFF0C\u4F60\u53EF\u4EE5\u9650\u5236\u4E00\u4E2A\u7279\u5B9A\u7684\u7FA4\u7EC4\u4E0B\u8F7D\u3002
 showfile=\u663E\u793A\u6587\u4EF6
 ta=Tasks/solutions
+table.action.download=\u4E0B\u8F7D
 table.action.select=\u9009\u62E9
 table.header.node=\u8BFE\u7A0B\u5143\u7D20
 tool.name=\u5F52\u6863\u5DE5\u5177
diff --git a/src/main/java/org/olat/course/area/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/area/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..781f2adac339348cf23b9e6fe99d3d60489cecb8
--- /dev/null
+++ b/src/main/java/org/olat/course/area/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,12 @@
+#Tue Oct 11 03:18:36 CEST 2016
+action=\u64CD\u4F5C
+course.areas.description=\u7528\u4E0B\u9762\u7684\u6309\u94AE\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u5B66\u4E60\u533A\u57DF\u3002\u7136\u540E\uFF0C\u5728\u8BFE\u7A0B\u7F16\u8F91\u5668\u4E2D\u60A8\u53EF\u4EE5\u4F7F\u7528\u5B66\u4E60\u533A\u57DF\uFF0C\u9650\u5236\u5BF9\u8BFE\u7A0B\u5143\u7D20\u7684\u8BBF\u95EE\uFF0C\u5C06\u7FA4\u7EC4\u5206\u914D\u7ED9\u5B66\u4E60\u533A\u57DF\u3002
+course.areas.title=\u8BFE\u7A0B\u5185\u5B66\u4E60\u533A\u57DF
+create.area=\u521B\u5EFA\u5B66\u4E60\u533A\u57DF
+delete=\u5220\u9664
+delete.area.description=\u60A8\u771F\u7684\u60F3\u8981\u5220\u9664\u5B66\u4E60\u533A\u57DF\u201C{0}\u201D\u5417\uFF1F
+delete.area.title=\u5220\u9664\u5B66\u4E60\u533A\u57DF
+edit=\u7F16\u8F91
+resources.noresources=\u672C\u8BFE\u7A0B\u8FD8\u6CA1\u6709\u5B66\u4E60\u533A\u57DF
+table.header.description=\u63CF\u8FF0
+table.header.name=\u540D\u79F0
diff --git a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_zh_CN.properties
index 38bd135108b9921f10c31e3114d4cbe61213e3b4..b817f82c016397df7c2eb66411b04a46a9750609 100644
--- a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_zh_CN.properties
@@ -1,29 +1,30 @@
-#Wed Jul 28 13:33:30 CEST 2010
+#Tue Oct 11 03:39:14 CEST 2016
 action.choose=\u9009\u62E9
+artefact.title=\u6210\u7EE9\u5355{0}
+assessment.testresults.finished=<font color\="green">\u8BC4\u4F30\u5DF2\u5B8C\u6210</font>
+assessment.testresults.open=<font color\="orange">\u4ECD\u5728\u8BC4\u4F30\u4E2D</font>
 assessmentLock=\u7528\u6237{0}({1})\u6B63\u5728\u88AB\u4FEE\u6539\u8BE5\u9879\u8BC4\u4F30, \u76EE\u6807\u88AB\u9501\u5B9A\u3002\u8BF7\u7A0D\u540E\u518D\u8BD5.
-
-
-
-
-
-
-
-
-
-
 cmd.all.users=\u663E\u793A\u6240\u6709\u7528\u6237
 cmd.filterCourseNodes=\u5B66\u7A0B\u5143\u7D20\u8FC7\u6EE4\u5668
 cmd.filterGroups=\u7FA4\u7EC4\u8FC7\u6EE4\u5668
 cmd.showAllCourseNodes=\u663E\u793A\u6240\u6709\u5B66\u7A0B\u5143\u7D20
 cmd.showAllGroups=\u663E\u793A\u6240\u6709\u7FA4\u7EC4
+cmd.showOnyxReporter=\u603B\u5206
 column=\u5217{0}
 command.closeassessment=\u5173\u95ED
 command.hidelog=\u9690\u85CF\u65E5\u5FD7\u6587\u4EF6
 command.showlog=\u663E\u793A\u65E5\u5FD7\u6587\u4EF6
 command.start.bulkwizard=\u542F\u52A8\u6279\u91CF\u8BC4\u4F30
+confirm.certificate.description=\u4E3A\u4E0B\u9762\u7684\u7528\u6237\uFF1A{0}\u521B\u5EFA\u65B0\u7684\u8BC1\u4E66
+confirm.certificate.description.warning=\u60A8\u6B63\u5728\u4E3A\u4E0B\u9762\u7684\u7528\u6237\uFF1A{0}\u521B\u5EFA\u65B0\u7684\u8BC1\u4E66\u3002\u4EE5\u4E0B\u7528\u6237\uFF1A{ 1 }\u7684\u91CD\u65B0\u8BA4\u8BC1\u671F\u5C1A\u672A\u8FC7\u671F\u3002\u60A8\u60F3\u7EE7\u7EED\u5417\uFF1F
+confirm.certificate.title=\u521B\u5EFA\u8BC1\u4E66
+contact.link=\u8054\u7CFB\u65B9\u5F0F
 course=\u8BFE\u7A0B\: 
+course.link=\u6253\u5F00\u8BFE\u7A0B
+create.certificate=\u521B\u5EFA\u8BC1\u4E66
 date=\u65E5\u671F\: 
 detailview.title=\u8BC4\u4F30\u7684\u8BE6\u7EC6\u89C6\u56FE
+efficiencyStatements.cannot.delete=\u4E0D\u80FD\u5220\u9664\u73B0\u6709\u8BFE\u7A0B\u7684\u6210\u7EE9\u5355
 efficiencyStatements.course.noaccess=\u8BE5\u8BFE\u7A0B\u5DF2\u7ECF\u88AB\u9501\u5B9A\uFF0C\u4F60\u65E0\u6CD5\u8BBF\u95EE\u3002
 efficiencyStatements.course.noexists=\u8BE5\u8BFE\u7A0B\u5DF2\u7ECF\u88AB\u9501\u5B9A\uFF0C\u4F60\u65E0\u6CD5\u8BBF\u95EE\u3002
 efficiencyStatements.delete.confirm=\u4F60\u786E\u5B9A\u8981\u5220\u9664\u8BE5\u6210\u7EE9\u5355 \u3002
@@ -31,6 +32,12 @@ efficiencyStatementsPortlet.description=\u5FEB\u901F\u8BBF\u95EE\u4F60\u4F7F\u75
 efficiencyStatementsPortlet.nostatements=\u60A8\u8FD8\u6CA1\u6709\u6210\u7EE9\u5355\uFF01
 efficiencyStatementsPortlet.showAll=\u5168\u90E8\u663E\u793A
 efficiencyStatementsPortlet.title=\u6211\u7684\u6210\u7EE9\u5355
+efficiencystatement.config=\u4FEE\u6539\u8BBE\u7F6E
+efficiencystatement.config.off=\u7981\u7528
+efficiencystatement.config.on=\u542F\u7528
+efficiencystatement.intro.1=\u8BFE\u7A0B\u5143\u7D20\u6709\u8BC4\u4F30\u4FE1\u606F\uFF08\u5206\u6570/\u901A\u8FC7\uFF09\u7684\u8BFE\u7A0B\u5C06\u4E3A\u6BCF\u4E2A\u7528\u6237\u751F\u6210\u4E00\u4E2A\u6709\u6548\u58F0\u660E\u3002\u5F53\u8BC4\u4F30\u6570\u636E\u66F4\u6539\u65F6\uFF0C\u65E0\u8BBA\u662F\u7531\u8F85\u5BFC\u8001\u5E08\u64CD\u4F5C\u8FD8\u662F\u901A\u8FC7\u6D4B\u8BD5\u6267\u884C\uFF0C\u8FD9\u79CD\u6709\u6548\u58F0\u660E\u90FD\u4F1A\u81EA\u52A8\u66F4\u65B0\u3002\u7528\u6237\u53EF\u4EE5\u5728\u201C\u8BFE\u7A0B\u5DE5\u5177\u7BB1\u201D\u6216\u201C\u7528\u6237\u9996\u9875\u201D\u4E2D\u8BBF\u95EE\u6709\u6548\u58F0\u660E\u3002
+efficiencystatement.intro.2=\u6839\u636E\u9700\u8981\uFF0C\u53EF\u4EE5\u5728\u8BFE\u7A0B\u8BBE\u7F6E\u4E2D\u542F\u7528/\u7981\u7528\u6709\u6548\u58F0\u660E\u529F\u80FD\u3002\u5F53\u524D\u7684\u6709\u6548\u58F0\u660E\u662F<strong>{0}</strong>
+efficiencystatement.intro.3=\u5982\u679C\u8BFE\u7A0B\u5DF2\u88AB\u4F7F\u7528\uFF0C\u60A8\u60F3\u4FEE\u6539\u8BC4\u4EF7\u89C4\u5219\u6216\u5728\u8BFE\u7A0B\u4E2D\u589E\u52A0\u53EF\u8BC4\u4EF7\u7684\u8BFE\u7A0B\u5143\u7D20\uFF0C\u5C06\u4F1A\u91CD\u65B0\u751F\u6210\u6709\u6548\u58F0\u660E\u3002
 efficiencystatement.nodata=\u6CA1\u6709\u53EF\u663E\u793A\u7684\u8BC4\u4F30\u7ED3\u679C
 efficiencystatement.title=\u6210\u7EE9\u5355
 email=E-mail\:
@@ -66,7 +73,6 @@ form.usercomment=\u5BF9\u7528\u6237\u7684\u8BC4\u8BBA
 form.valueUndefined=<i> \u672A\u5B9A\u4E49 </i>
 groupchoose.nogroups=\u6CA1\u6709\u627E\u5230\u76F8\u5173\u5C0F\u7EC4\u3002\u539F\u56E0\u65E2\u53EF\u80FD\u662F\u5728\u8BE5\u5B66\u7A0B\u91CC\u4E0D\u5B58\u5728\u4EFB\u4F55\u7EC4\uFF0C\u4E5F\u53EF\u80FD\u662F\u60A8\u6CA1\u6709\u6307\u5BFC\u6743\u9650.
 groupchoose.title=\u9009\u62E9\u5B66\u7A0B\u7FA4\u7EC4
-
 identityoverview.title=\u8BC4\u4EF7\u6982\u8FF0
 index.intro=\u60A8\u53EF\u4EE5\u4F7F\u7528\u8BC4\u4EF7\u5DE5\u5177\u5BF9\u672C\u5B66\u7A0B\u53C2\u4E0E\u8005\u8FDB\u884C\u8BC4\u4EF7\u3002\u60A8\u8FD8\u53EF\u4EE5\u770B\u5230\u6D4B\u9A8C\u6216\u8BC4\u4EF7\u7ED3\u679C\u5E76\u4FEE\u6539\u5B83\u4EEC\u3002<p>\u4ECE\u5DE6\u8FB9\u9009\u62E9\u4E00\u4E2A\u4E3B\u9898\u6765\u542F\u52A8\u3002
 index.noAssessableNodes=\u5728\u8BE5\u5B66\u7A0B\u4E2D\u7531\u4E8E\u6CA1\u6709\u8BBE\u7F6E\u53EF\u7528\u4E8E\u8BC4\u4F30\u7684\u5B66\u7A0B\u5143\u7D20, \u6240\u4EE5\u65E0\u6CD5\u6267\u884C\u3002\u542F\u52A8\u8BFE\u7A0B\u7F16\u8F91\u5668\uFF0C\u6DFB\u52A0\u4E00\u4E2A\u53EF\u8BC4\u4EF7\u7684\u5B66\u7A0B\u5143\u7D20\u5230\u8BE5\u5B66\u7A0B\u7ED3\u6784\u4E2D(\u4F8B\u5982\uFF1A\u6D4B\u9A8C\u3001\u8BC4\u4EF7)\u3002
@@ -90,6 +96,7 @@ menu.nodefocus=\u4F5C\u4E3A\u5355\u4E00\u5B66\u7A0B\u7ED3\u6784
 menu.nodefocus.alt=\u9009\u62E9\u4E00\u4E2A\u5B66\u7A0B\u5143\u7D20\u4EE5\u83B7\u5F97\u8BE5\u5143\u7D20\u7684\u8BC4\u4EF7\u4FE1\u606F
 menu.userfocus=\u4F5C\u4E3A\u5355\u4E00\u7528\u6237
 menu.userfocus.alt=\u9009\u62E9\u4E00\u4E2A\u7528\u6237\u4EE5\u83B7\u5F97\u5176\u8BC4\u4EF7\u7684\u7EDF\u8BA1\u6570\u636E
+no.testresults=<font color\="red">\u65E0\u6210\u7EE9</font>
 nodechoose.intro=\u4ECE\u4EE5\u4E0B\u5B66\u7A0B\u5143\u7D20\u4E2D\u9009\u62E9\u4E00\u9879\u3002\u4F60\u53EF\u4EE5\u67E5\u770B\u8BE5\u5143\u7D20\u7684\u8BC4\u4EF7\u4FE1\u606F\u6216\u8005\u4FEE\u6539\u4ED6\u4EEC\u3002
 nodechoose.title=\u9009\u62E9\u5B66\u7A0B\u5143\u7D20
 nodesoverview.emptylist=\u672A\u53D1\u73B0\u53EF\u88AB\u8BC4\u4EF7\u7684\u5B66\u7A0B\u5143\u7D20
@@ -100,6 +107,7 @@ nodesoverview.nonodes=\u8BE5\u5B66\u7A0B\u6CA1\u6709\u4EFB\u4F55\u53EF\u8BC4\u4E
 notifications.entry={1}\u53C2\u52A0\u7684\u6D4B\u9A8C\u662F\uFF1A"{0}",\u5176\u5F97\u5206\u4E3A\uFF1A{2}
 notifications.header=\u5728\u5B66\u7A0B "{0}" \u4E2D\u65B0\u6D4B\u9A8C\u7684\u7ED3\u679C
 notifications.title=\u5B66\u7A0B "{0}"
+onyxreporter.error=\u9519\u8BEF\: Onyx Reporter \u4E0D\u54CD\u5E94\!
 participantgroups.noGroups=\u8BE5\u7528\u6237\u672A\u53C2\u52A0\u4EFB\u4F55\u7FA4\u7EC4\u3002
 participantgroups.title=\u7FA4\u7EC4\u53C2\u4E0E\u8005
 passed.false=<span class\="o_state o_failed"><i class\="o_icon o_icon_failed"> </i> \u5931\u8D25</span>
@@ -107,7 +115,9 @@ passed.true=<span class\="o_state o_passed"><i class\="o_icon o_icon_passed"> </
 table.action.delete=\u5220\u9664
 table.action.launchcourse=\u542F\u52A8\u5B66\u7A0B
 table.action.select=\u9009\u62E9
+table.action.selectparticipant=\u9009\u62E9\u53C2\u52A0\u8005
 table.action.show=\u663E\u793A
+table.action.showOnyxReporter=\u663E\u793A
 table.group.context=\u7FA4\u7EC4\u4E0A\u4E0B\u6587
 table.group.desc=\u8BF4\u660E
 table.group.name=\u7EC4\u540D
@@ -120,9 +130,11 @@ table.header.details.ta=\u4EFB\u52A1
 table.header.launchcourse=\u542F\u52A8\u8BFE\u7A0B
 table.header.name=\u7528\u6237\u59D3\u540D
 table.header.node=\u5B66\u7A0B\u5143\u7D20
+table.header.overallselect=\u603B\u5206
 table.header.passed=\u5DF2\u901A\u8FC7
 table.header.score=\u5F97\u5206
 table.header.show=\u6210\u7EE9\u5355
+table.header.singleselect=\u5355\u5206
 table.header.status=\u72B6\u6001
 table.header.type=\u7C7B\u578B
 title.infocoach=\u8BC4\u4EF7\u7684\u4FE1\u606F
@@ -158,12 +170,3 @@ wizard.step5.title=\u6307\u5B9A\u8BC4\u4F30\u7684\u5217\u9879
 wizard.step6.feedback.column=\u53CD\u9988
 wizard.step6.howto=\u5982\u679C\u4F60\u7684\u8BC4\u4F30\u5DF2\u7ECF\u987A\u5229\u7684\u5B8C\u6210\uFF0C\u5C31\u4F1A\u663E\u793A\u51FA\u201C\u53CD\u9988\u201D\u90A3\u4E00\u5217
 wizard.step6.title=\u8BC4\u4F30\u5B8C\u6210
-assessment.testresults.finished=<font color\="green">\u8BC4\u4F30\u5DF2\u5B8C\u6210</font>
-assessment.testresults.open=<font color\="orange">\u4ECD\u5728\u8BC4\u4F30\u4E2D</font>
-cmd.showOnyxReporter=\u603B\u5206
-no.testresults=<font color\="red">\u65E0\u6210\u7EE9</font>
-onyxreporter.error=\u9519\u8BEF\: Onyx Reporter \u4E0D\u54CD\u5E94\!
-table.action.selectparticipant=\u9009\u62E9\u53C2\u52A0\u8005
-table.action.showOnyxReporter=\u663E\u793A
-table.header.overallselect=\u603B\u5206
-table.header.singleselect=\u5355\u5206
diff --git a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_zh_CN.properties
index 7aa339cffc33790bb204c7eff414977f5de73e83..26a950df6e8f20d75939ddee0ba9fa083c100fde 100644
--- a/src/main/java/org/olat/course/editor/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/editor/_i18n/LocalStrings_zh_CN.properties
@@ -1,301 +1,14 @@
-#Tue Aug 24 04:15:15 CEST 2010
+#Mon Oct 10 15:03:25 CEST 2016
 access.form.label=\u8BBF\u95EE\u6574\u4E2A\u5B66\u7A0B
 access.legend=\u4FEE\u6539\u8BBF\u95EE\u6574\u4E2A\u5B66\u7A0B
+alternative=\u641C\u7D22\u5176\u4ED6\u8BFE\u7A0B\u5143\u7D20
+alternative.bbs=\u5176\u4ED6\u8BFE\u7A0B\u5143\u7D20
+alternative.choose=\u9009\u62E9\u5176\u4ED6\u8BFE\u7A0B\u5143\u7D20\u5E76\u8F6C\u6362
 apply=\u786E\u5B9A
 checkall=\u5168\u9009 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 cif.access=$org.olat.repository\:cif.access
 cif.access.membersonly=$org.olat.repository\:cif.access.membersonly
-cif.access.owners=$org.olat.repository\:cif.access.owners			
+cif.access.owners=$org.olat.repository\:cif.access.owners\t\t\t
 cif.access.owners_authors=$org.olat.repository\:cif.access.owners_authors
 cif.access.users=$org.olat.repository\:cif.access.users
 cif.access.users_guests=$org.olat.repository\:cif.access.users_guests
@@ -343,13 +56,6 @@ form.noAccessExplanation=\u6587\u672C
 form.noAccessExplanation.default=\u65E0\u6CD5\u8BBF\u95EE\u8BE5\u8BFE\u7A0B\u5143\u7D20\u3002 
 header.insertnodes=\u63D2\u5165\u8BFE\u7A0B\u5143\u7D20 
 header.tools=\u7F16\u8F91\u5668
-
-
-
-
-
-
-
 insert.course.element.title=\u63D2\u5165\u4E00\u4E2A\u5B66\u7A0B\u5143\u7D20
 insert.navigate.prompt.msg=\u8BF7\u4F7F\u7528\u5DE6\u8FB9\u7684\u6811\u72B6\u5BF9\u8BDD\u6846\u6765\u9009\u62E9\u76EE\u6807\u4F4D\u7F6E\u3002
 insertAtSelectedTreepos=\u63D2\u5165\u5B66\u7A0B\u5143\u7D20
diff --git a/src/main/java/org/olat/course/editor/formfragments/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/editor/formfragments/_i18n/LocalStrings_zh_CN.properties
index 8712c323b78c230bdb3726ecebd706683d702f55..fe29b35a7d731ce101a702df92594c87cae2a714 100644
--- a/src/main/java/org/olat/course/editor/formfragments/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/editor/formfragments/_i18n/LocalStrings_zh_CN.properties
@@ -1,17 +1,12 @@
-#Thu Sep 03 11:24:43 CEST 2015
-
-
-
-
-
-
-
-
-
-
+#Mon Oct 10 15:09:32 CEST 2016
+areaCoachesChoose=\u9009\u62E9\u5B66\u4E60\u533A\u57DF
+areaCreate=\u521B\u5EFA\u5B66\u4E60\u533A\u57DF
+areaParticipantsChoose=\u9009\u62E9\u5B66\u4E60\u533A\u57DF
 condition.accessibility.title=\u8BBF\u95EE
 email.not.specified=\u8BF7\u6CE8\u660E\u6536\u4EF6\u4EBA
 email.not.valid=\u65E0\u6548E-mail
+error.no.choice.specified=\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u9009\u9879
+error.no.group.specified=\u9009\u62E9\u7FA4\u7EC4/\u533A\u57DF
 error.norecipients.long=\u6CA1\u6709\u4E3A\u201D{0}\u201C\u5B9A\u4E49\u63A5\u6536\u8005\u3002\u4F60\u53EF\u4EE5\u5728\u201D\u63A5\u6536\u8005\u201C\u6807\u7B7E\u4E2D\u6307\u5B9A\u3002
 error.norecipients.short=\u201D{0}\u201C\u7F3A\u5C11\u63A5\u6536\u8005
 error.notfound.name=\u5728\u6B64\u5B66\u7A0B\u7684\u7FA4\u7EC4\u7BA1\u7406\u4E2D\u6CA1\u6709\u627E\u5230\u6307\u5B9A\u7684\u7528\u6237\u540D({1})
@@ -21,18 +16,28 @@ form.choose.coachesandpartips=\u60A8\u9700\u8981\u9009\u62E9\u67D0\u4E9B\u53C2\u
 form.groupnames.wrong=\u5B66\u4E60\u7FA4\u7EC4\u4E2D\u4F7F\u7528\u9017\u53F7\u5206\u9694\u7528\u6237\u540D\u6216\u8005\u7559\u7A7A\u3002
 form.message.area=\u5B66\u4E60\u533A\u57DF
 form.message.chckbx.coaches=\u6307\u5B9A\u5B66\u4E60\u7FA4\u7EC4\u7684\u6307\u5BFC\u6559\u5E08
+form.message.chckbx.owners=\u8BFE\u7A0B\u6240\u6709\u4EBA
 form.message.chckbx.partips=\u6307\u5B9A\u5B66\u4E60\u7FA4\u7EC4\u7684\u53C2\u52A0\u8005
+form.message.coaches.all=\u6240\u6709\u8F85\u5BFC\u8001\u5E08
+form.message.coaches.course=\u4EC5\u8BFE\u7A0B\u8F85\u5BFC\u8001\u5E08
+form.message.coaches.group=\u4EC5\u7FA4\u7EC4\u8F85\u5BFC\u8001\u5E08
 form.message.example.area=\uFF08\u4F8B\u5982\uFF1A\u7FA4\u7EC41,\u7FA4\u7EC42\uFF09
 form.message.example.group=\u7EA2\u7EC4\uFF0C\u7EFF\u7EC4\uFF0C\u84DD\u7EC4
 form.message.group=\u5B66\u4E60\u7EC4
+form.message.participants.all=\u6240\u6709\u5B66\u4E60\u8005
+form.message.participants.course=\u4EC5\u8BFE\u7A0B\u5B66\u4E60\u8005
+form.message.participants.group=\u4EC5\u7FA4\u7EC4\u5B66\u4E60\u8005
 form.noGroupsOrAreas=\u8BF7\u81F3\u5C11\u6307\u5B9A\u4E00\u4E2A\u7FA4\u7EC4\u6216\u5B66\u4E60\u533A\u57DF\u3002
+groupCoachesChoose=\u9009\u62E9\u7FA4\u7EC4
+groupCreate=\u521B\u5EFA\u7FA4\u7EC4
+groupParticipantsChoose=\u9009\u62E9\u7FA4\u7EC4
 header=\u63A5\u6536\u8005
-
 message.body=\u9ED8\u8BA4\u6B63\u6587
 message.emailtoadresses=\u53D1\u9001
 message.subject=\u9ED8\u8BA4\u4E3B\u9898
 message.want.email=\u5206\u914D\u5230e-mail\u5730\u5740
 message.want.group=\u5206\u914D\u5230\u7FA4\u7EC4\u6210\u5458\u548C\u6559\u5E08
+message.want.owners=\u5411\u6240\u6709\u8005\u5206\u914D
 no.recipents.specified=\u8BF7\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u5B58\u50A8\u76EE\u5F55
 pane.tab.accessibility=\u8BBF\u95EE
 pane.tab.coconfig=\u63A5\u6536\u8005
diff --git a/src/main/java/org/olat/course/nodes/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/nodes/_i18n/LocalStrings_zh_CN.properties
index 4d0afc5645e98028332473fb036b6835bb029367..210e6faf6b52bdd4487ebeae498f7be5e1277467 100644
--- a/src/main/java/org/olat/course/nodes/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/course/nodes/_i18n/LocalStrings_zh_CN.properties
@@ -1,4 +1,4 @@
-#Sun Feb 07 12:00:06 CET 2010
+#Mon Oct 10 15:10:44 CEST 2016
 editor.lock.message=\u672C\u5B66\u7A0B\u5143\u7D20\u6B63\u5728\u4FEE\u6539\uFF0C\u56E0\u6B64\u5DF2\u9501\u5B9A\u3002
 editor.lock.title=\u5B66\u7A0B\u5143\u7D20\u5DF2\u9501\u5B9A
 guestnoaccess.message=\u6E38\u5BA2\u65E0\u6CD5\u8BBF\u95EE\u8BE5\u90E8\u5206\u5B66\u7A0B\u3002<p>\u4F60\u53EF\u4EE5\u6CE8\u518C\u4E3AOLAT\u7528\u6237\u6216\u8005\u901A\u8FC7\u4F60\u6240\u5728\u5927\u5B66\u7684\u9A8C\u8BC1\u624D\u53EF\u4EE5\u8BBF\u95EE\u8BE5\u90E8\u5206\u5B66\u7A0B</p>\u3002
diff --git a/src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..d2543066a70f38429bfbea12cc5c6e8a9883d381
--- /dev/null
+++ b/src/main/java/org/olat/course/nodes/info/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,2 @@
+#Mon Oct 10 15:10:23 CEST 2016
+auto_subscribe=\u81EA\u52A8\u63D0\u4EA4
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
index 003fb4b233df86eb765ffe9ee2f3210205237194..dbc400ae8b1cd50c9c61784cd1d62775936c6335 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_it.properties
@@ -1,5 +1,6 @@
-#Wed Jun 22 10:40:06 CEST 2016
+#Mon Oct 10 11:49:24 CEST 2016
 FileResource.IMSCP=Contenuto didattico CP
+FileResource.IMSQTI21=Test (QTI 2.1)
 contentcontroller.editlink_title=Editare le propriet\u00E0 della pagina
 contentcontroller.infoChapterpage=Questo capitolo non contiene una pagina con link.
 contentcontroller.no.lock=Il content package non pu\u00F2 venire editato perch\u00E9 viene attualmente elaborato da un altro utente.
diff --git a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
index 53500038d9e0029da290b5f875e4757cd8dea91e..28e92b1bb5b62b72bcc9d5257a21da3b8c376c64 100644
--- a/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/ims/cp/ui/_i18n/LocalStrings_zh_CN.properties
@@ -1,5 +1,6 @@
-#Wed Sep 28 05:39:13 CEST 2016
+#Sat Oct 08 08:49:30 CEST 2016
 FileResource.IMSCP=CP\u5B66\u4E60\u5185\u5BB9
+FileResource.IMSQTI21=Test (QTI 2.1)
 contentcontroller.editlink_title=\u7F16\u8F91\u9875\u9762\u5C5E\u6027
 contentcontroller.infoChapterpage=\u672C\u7AE0\u4E2D\u6CA1\u6709\u94FE\u63A5\u9875\u9762
 contentcontroller.no.lock=\u7531\u4E8E\u9875\u9762\u6B63\u5728\u88AB\u53E6\u4E00\u4E2A\u4F7F\u7528\u8005\u7F16\u8F91\uFF0C\u90A3\u4E48\u6B64\u523B\u9875\u9762\u5185\u5BB9\u4E0D\u80FD\u88AB\u7F16\u8F91\u3002
diff --git a/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_it.properties
new file mode 100644
index 0000000000000000000000000000000000000000..ee34a9c862e1df2d1bc18b3a5433e67294a5b332
--- /dev/null
+++ b/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_it.properties
@@ -0,0 +1,14 @@
+#Mon Oct 10 11:49:46 CEST 2016
+download.example=$org.olat.ims.qti.questionimport\:download.example
+form.importdata=$org.olat.ims.qti.questionimport\:form.importdata
+input.title=$org.olat.ims.qti.questionimport\:input.title
+item.type.fib=$org.olat.ims.qti.editor\:item.type.fib
+item.type.mc=$org.olat.ims.qti.editor\:item.type.mc
+item.type.sc=$org.olat.ims.qti.editor\:item.type.sc
+table.header.points=$org.olat.ims.qti.questionimport\:table.header.points
+table.header.status=$org.olat.ims.qti.questionimport\:table.header.status
+table.header.title=$org.olat.ims.qti.questionimport\:table.header.title
+table.header.type=$org.olat.ims.qti.questionimport\:table.header.type
+wizard.import.input.description=$org.olat.ims.qti.questionimport\:wizard.import.input.description
+wizard.import.input.title=$org.olat.ims.qti.questionimport\:wizard.import.input.title
+wizard.import.overview.title=$org.olat.ims.qti.questionimport\:wizard.import.overview.title
diff --git a/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..75299897b774a89bd7110cd5115d0bfdf72a02b3
--- /dev/null
+++ b/src/main/java/org/olat/ims/qti21/questionimport/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,14 @@
+#Sat Oct 08 08:51:18 CEST 2016
+download.example=$org.olat.ims.qti.questionimport\:download.example
+form.importdata=$org.olat.ims.qti.questionimport\:form.importdata
+input.title=$org.olat.ims.qti.questionimport\:input.title
+item.type.fib=$org.olat.ims.qti.editor\:item.type.fib
+item.type.mc=$org.olat.ims.qti.editor\:item.type.mc
+item.type.sc=$org.olat.ims.qti.editor\:item.type.sc
+table.header.points=$org.olat.ims.qti.questionimport\:table.header.points
+table.header.status=$org.olat.ims.qti.questionimport\:table.header.status
+table.header.title=$org.olat.ims.qti.questionimport\:table.header.title
+table.header.type=$org.olat.ims.qti.questionimport\:table.header.type
+wizard.import.input.description=$org.olat.ims.qti.questionimport\:wizard.import.input.description
+wizard.import.input.title=$org.olat.ims.qti.questionimport\:wizard.import.input.title
+wizard.import.overview.title=$org.olat.ims.qti.questionimport\:wizard.import.overview.title
diff --git a/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties
new file mode 100644
index 0000000000000000000000000000000000000000..50d3b6fb264b773a7219b882ff5597fd6ec50e27
--- /dev/null
+++ b/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties
@@ -0,0 +1,46 @@
+#Mon Oct 10 14:10:03 CEST 2016
+actualPoints=$org.olat.modules.iq\:actualPoints
+admin.menu.title=QTI 2.1
+admin.menu.title.alt=Configurazione QTI 2.1
+anonym.not.allowed.descr=Gli utenti anonimi non possono eseguire questo test.
+anonym.not.allowed.title=Utenti anonimi
+anonym.user=Utente anonimo
+assessment.comment.legend=Nella casella di testo seguente pu\u00F2 fornire informazioni aggiuntive, commenti o feedback durante questo test\:
+assessment.item.modal.feedback=Feedback
+assessment.item.status.answered=Risposto
+assessment.item.status.finished=Completato
+assessment.item.status.modelSolution=Soluzione modello
+assessment.item.status.needsAttention=Attenzione
+assessment.item.status.notAnswered=Non risposto
+assessment.item.status.notSeen=Non letto
+assessment.item.status.review=Revisione
+assessment.item.status.reviewInvalidAnswer=Revisione (risposta invalida)
+assessment.item.status.reviewNot=Non revisionabile
+assessment.item.status.reviewNotAnswered=Revisione (non risposto)
+assessment.item.status.reviewNotSeen=Revisione (non visto)
+assessment.section.config=Sezione
+assessment.solution.hide=Nascondere la soluzione
+assessment.solution.show=Mostrare la soluzione
+assessment.test.backToTestFeedback=Ritornare al feedback del test
+assessment.test.cancelled=Il test \u00E8 stato interrotto
+assessment.test.close.results=Chiudere risultati
+assessment.test.close.test=Chiudere il test
+assessment.test.close.testpart=Chiudere questa parte del test
+assessment.test.config=Configurazione del test
+assessment.test.end.test=Terminare il test
+assessment.test.end.testPart=Terminare questa parte del test
+assessment.test.enter.test=Avviare il test
+assessment.test.modal.feedback=Feedback
+assessment.test.multiPartTestMenu=Menu di navigazione della parte di test
+assessment.test.nav.title.multiPartTestMenu=Menu delle domande della parte di test
+assessment.test.nav.title.questionMenu=Menu di navigazione del test
+assessment.test.nextQuestion=Prossima domanda
+assessment.test.notReleased=$org.olat.ims.qti\:notReleased
+assessment.test.open=Aperto
+assessment.test.questionMenu=Menu di navigazione del test
+assessment.test.suspended=Il test \u00E8 stato sospeso.
+assessment.testpart.config=Parte del test
+attemptsleft=$org.olat.modules.iq\:attemptsleft
+cancel.test=$org.olat.modules.iq\:cancelAssess
+command.openassessment=Strumento di valutazione
+command.openteststatistic=Statistiche dei test
diff --git a/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..e9a4bef7a1fd7a8efeb6cf39f49778f3ce111076
--- /dev/null
+++ b/src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,46 @@
+#Sun Oct 09 03:58:16 CEST 2016
+actualPoints=$org.olat.modules.iq\:actualPoints
+admin.menu.title=QTI 2.1
+admin.menu.title.alt=QTI 2.1 \u8BBE\u7F6E
+admin.title=QTI 2.1 \u8BBE\u7F6E
+anonym.not.allowed.descr=\u4E0D\u5141\u8BB8\u533F\u540D\u7528\u6237\u8FDB\u884C\u672C\u6D4B\u8BD5
+anonym.not.allowed.title=\u533F\u540D\u7528\u6237
+anonym.user=\u533F\u540D\u7528\u6237
+assessment.comment.legend=\u5982\u679C\u5728\u6D4B\u8BD5\u671F\u95F4\u9700\u8981\u63D0\u4F9B\u5176\u4ED6\u4FE1\u606F\u3001\u8BC4\u8BBA\u6216\u53CD\u9988\uFF0C\u8BF7\u60A8\u4F7F\u7528\u4E0B\u9762\u7684\u6587\u672C\u6846
+assessment.item.modal.feedback=\u53CD\u9988
+assessment.item.status.answered=\u5DF2\u7B54
+assessment.item.status.finished=\u5B8C\u6210
+assessment.item.status.modelSolution=\u6A21\u578B\u89E3\u51B3\u65B9\u6848
+assessment.item.status.needsAttention=\u6CE8\u610F
+assessment.item.status.notAnswered=\u672A\u7B54
+assessment.item.status.notSeen=\u672A\u8BFB
+assessment.item.status.review=\u8BC4\u8BBA
+assessment.item.status.reviewInvalidAnswer=\u8BC4\u8BBA\uFF08\u65E0\u6548\u7B54\u6848\uFF09
+assessment.item.status.reviewNot=\u4E0D\u53EF\u590D\u5BA1
+assessment.item.status.reviewNotAnswered=\u8BC4\u8BBA\uFF08\u672A\u7B54\uFF09
+assessment.item.status.reviewNotSeen=\u8BC4\u8BED\uFF08\u4E0D\u53EF\u89C1\uFF09
+assessment.section.config=\u8282
+assessment.solution.hide=\u9690\u85CF\u65B9\u6848
+assessment.solution.show=\u663E\u793A\u65B9\u6848
+assessment.test.backToTestFeedback=\u8FD4\u56DE\u5230\u6D4B\u8BD5\u53CD\u9988
+assessment.test.cancelled=\u6D4B\u8BD5\u5DF2\u53D6\u6D88
+assessment.test.close.results=\u5173\u95ED\u7ED3\u679C
+assessment.test.close.test=\u5173\u95ED\u6D4B\u8BD5
+assessment.test.close.testpart=\u5173\u95ED\u6D4B\u8BD5\u90E8\u5206
+assessment.test.config=\u6D4B\u8BD5\u8BBE\u7F6E
+assessment.test.end.test=\u6D4B\u8BD5\u5B8C\u6210
+assessment.test.end.testPart=\u6D4B\u8BD5\u90E8\u5206\u5B8C\u6210
+assessment.test.enter.test=\u8FDB\u5165\u6D4B\u8BD5
+assessment.test.modal.feedback=\u53CD\u9988
+assessment.test.multiPartTestMenu=\u6D4B\u8BD5\u90E8\u5206\u95EE\u9898\u83DC\u5355
+assessment.test.nextQuestion=\u4E0B\u4E00\u4E2A\u95EE\u9898
+assessment.test.notReleased=$org.olat.ims.qti\:notReleased
+assessment.test.open=\u6253\u5F00
+assessment.test.questionMenu=\u6D4B\u8BD5\u95EE\u9898\u83DC\u5355
+assessment.test.suspended=\u6D4B\u8BD5\u5DF2\u7ECF\u7EC8\u6B62
+attemptsleft=$org.olat.modules.iq\:attemptsleft
+cancel.test=$org.olat.modules.iq\:cancelAssess
+command.openassessment=\u8BC4\u4F30\u5DE5\u5177
+command.openteststatistic=\u6D4B\u8BD5\u7EDF\u8BA1
+confirm.advance.testpart.text=\u60A8\u771F\u7684 \u8981\u653E\u5F03\u672C\u6D4B\u8BD5\u90E8\u5206\uFF0C\u7EE7\u7EED\u6D4B\u8BD5\u5417 \uFF1F
+confirm.cancel.test=$org.olat.modules.iq\:confirmCancel
diff --git a/src/main/java/org/olat/modules/assessment/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/modules/assessment/ui/_i18n/LocalStrings_zh_CN.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4b57aa0aba02c9a011fd33aeecb3de323f6ff7f3
--- /dev/null
+++ b/src/main/java/org/olat/modules/assessment/ui/_i18n/LocalStrings_zh_CN.properties
@@ -0,0 +1,5 @@
+#Sun Oct 09 04:11:50 CEST 2016
+assessment.status.done=\u8BC4\u4F30
+assessment.status.inProgress=\u5F00\u59CB
+assessment.status.inReview=\u56DE\u987E
+assessment.status.notStart=\u672A\u5F00\u59CB
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
index 791c67223f015aa8a3d086c31247f45e0e4acbb7..febe844e957a9f70f5f662a3b1e1b1da3a032815 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_zh_CN.properties
@@ -1,12 +1,17 @@
-#Thu Sep 25 04:52:09 CEST 2014
+#Sun Oct 09 04:21:11 CEST 2016
+add=+
+add.to.list=\u589E\u52A0\u5230\u5217\u8868
+applications=\u5E94\u7528
 author.item=\u4F5C\u8005\u6743\u9650
 bulk.change=\u6539\u53D8\u5143\u6570\u636E
 bulk.change.description=\u8FD9\u91CC\u60A8\u53EF\u4EE51\u6B65\u66F4\u6539\u66F4\u591A\u95EE\u9898\u7684\u5C5E\u6027\u3002
+classification.taxonomic.path=\u4E3B\u9898
 classification.taxonomy.level=\u4E13\u4E1A\u9886\u57DF
 classification.taxonomy.parents=\u8DEF\u5F84
 collection.creationDate=\u521B\u5EFA\u4E8E
 collection.name=\u540D\u79F0
 confirm.delete=\u60A8\u786E\u5B9A\u5220\u9664\u6B64\u95EE\u9898\u5417\uFF1F\u5B83\u5C06\u4ECE\u6240\u6709\u7FA4\u7EC4\u3001\u6C60\u548C\u8868\u5355\u4E2D\u88AB\u5220\u9664\u3002
+confirm.delete.plural=\u60A8\u771F\u7684\u60F3\u8981\u5220\u9664\u8FD9\u4E9B\u95EE\u9898\u201C{0}\u201D\u5417\uFF1F\u5C06\u4ECE\u6240\u6709\u7FA4\u7EC4\uFF0C\u6C60\u3001\u5217\u8868\u4E2D\u5220\u9664\u5B83\u4EEC
 confirm.delete.source=\u60A8\u786E\u5B9A\u5220\u9664\u6B64\u8868\u5355\u5417\uFF1F
 confirm.unshare=\u60A8\u786E\u5B9A\u5220\u9664\u6B64\u95EE\u9898{0}\u5417\uFF1F
 copy=\u590D\u5236
@@ -30,6 +35,9 @@ educational.learningTime.day=d
 educational.learningTime.hour=h
 educational.learningTime.minute=m
 educational.learningTime.second=s
+error.input.toolong=\u60A8\u8F93\u5165\u7684\u6587\u672C\u592A\u957F\uFF08{0}\u4E2A\u5B57\u7B26\uFF09\u3002\u53EA\u5141\u8BB8\u8F93\u5165{1}\u4E2A\u5B57\u7B26
+error.select.one=\u5FC5\u987B\u81F3\u5C11\u9009\u62E9\u4E00\u4E2A\u95EE\u9898
+error.wrongFloat=\u9519\u8BEF\u7684\u6570\u5B57\u683C\u5F0F\uFF0C\u4F8B\u59821.0,0.5,0.2
 export.item=\u5BFC\u51FA
 general=\u4E00\u822C
 general.additional.informations=\u989D\u5916\u4FE1\u606F
@@ -42,16 +50,7 @@ general.keywords=\u5173\u952E\u8BCD
 general.language=\u8BED\u8A00
 general.master.identifier=Master ID
 general.title=\u6807\u9898
-
-
-
-
-
-
-
-
-
-
+import.excellike=\u901A\u8FC7\u590D\u5236/\u7C98\u8D34\u5BFC\u5165excel
 import.failed=\u95EE\u9898\u4E0D\u80FD\u5BFC\u5165\u3002
 import.file=\u5BFC\u5165\u6587\u4EF6
 import.item=\u5BFC\u5165
@@ -67,8 +66,10 @@ item.pooled={0}\u95EE\u9898\u6DFB\u52A0\u5230\u6C60\u4E2D\u3002
 item.shared=\u91CA\u653E{0}\u95EE\u9898\u3002
 item.type.essay=\u6587\u7AE0
 item.type.fib=Fill-in-Blank
+item.type.hotspot=Hotspot
 item.type.kprim=KPrim
 item.type.mc=\u591A\u9009
+item.type.numerical=\u6570\u503C\u8F93\u5165
 item.type.sc=\u5355\u9009
 item.type.unkown=\u672A\u77E5
 lifecycle=\u751F\u547D\u5468\u671F
@@ -83,8 +84,11 @@ list=\u5236\u5355
 manage.owners=\u4F5C\u8005
 mark=<i class\="o_icon o_icon_bookmark_header o_icon-lg" title\="Favorit"> </i>
 menu.admin=\u7BA1\u7406
+menu.admin.alt=\u7BA1\u7406
 menu.admin.levels=\u7B49\u7EA7
+menu.admin.levels.alt=\u7EA7\u522B
 menu.admin.licenses=\u8BB8\u53EF\u8BC1
+menu.admin.licenses.alt=License
 menu.admin.pools=\u6C60\u7BA1\u7406
 menu.admin.studyfields=\u4E13\u4E1A\u9886\u57DF
 menu.admin.types=\u95EE\u9898\u7C7B\u578B