lams-github / lams_learning / conf / language / lams

ApplicationResources.properties

Tree
Options

a61b6ad

Merge remote-tracking branch 'origin/master' into v4.0
Conflicts:
lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

20 Mar 20 Marcin Cieslak a61b6ad192148c0ae514f37a9b488c3a15535ee9

f27fea8

Merge branch 'develop' into LDEV-4745
# Conflicts:
# lams_admin/conf/language/lams/ApplicationResources.properties
# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
# lams_central/conf/language/lams/ApplicationResources.properties
# lams_central/conf/language/lams/ApplicationResources_en_AU.properties
# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
# lams_learning/conf/language/lams/ApplicationResources.properties
# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_assessment/conf/language/lams/ApplicationResources.properties
# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
# lams_tool_lamc/conf/language/lams/ApplicationResources.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
# lams_tool_laqa/web/learning/LearnerRep.jsp
# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_nb/conf/language/lams/ApplicationResources.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
# lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
# lams_tool_scribe/conf/language/lams/ApplicationResources.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_survey/conf/language/lams/ApplicationResources.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_task/conf/language/lams/ApplicationResources.properties
# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_vote/conf/language/lams/ApplicationResources.properties
# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

20 Dec 19 Andrey Balan f27fea8eb6533208beffced8d55e3544857577e8

Loading ...