Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4769 Updating Greek, English, Spanish, Norwegian

    • -0
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 17 more files in changeset.
LDEV-4769 Updating Greek, English, Spanish, Norwegian

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 12 more files in changeset.
LDEV-5219 Display customised messages for various gate types

Move i18n labels from tool to Learning module so they are the same for

all tools.

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 10 more files in changeset.
LDEV-4769 Updating Greek

    • -1
    • +16
    ./lams/ApplicationResources_el_GR.properties
  1. … 6 more files in changeset.
LDEV-4769 Updating English, Spanish

    • -0
    • +15
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    ./lams/ApplicationResources_es_ES.properties
  1. … 6 more files in changeset.
LDEV-5208: Updating sentiment option labels

    • -7
    • +7
    ./lams/ApplicationResources.properties
LDEV-5208 Add Discussion Sentiment monitor widget

    • -1
    • +5
    ./lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LDEV-5208 Add Discussion Sentiment learner widget

    • -0
    • +11
    ./lams/ApplicationResources.properties
  1. … 17 more files in changeset.
LDEV-4553 Updating labels

    • -2
    • +2
    ./lams/ApplicationResources_es_ES.properties
  1. … 3 more files in changeset.
LDEV-5143 and LDEV-5140 labels updates

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 20 more files in changeset.
LDEV-4769 Update Greek

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 3 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 11 more files in changeset.
LDEV-4769 Updating Greek

    • -3
    • +3
    ./lams/ApplicationResources_el_GR.properties
  1. … 2 more files in changeset.
LDEV-4769 Updating labels Green, Norwegian, English

    • -6
    • +6
    ./lams/ApplicationResources_el_GR.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating Greek and Norwegian

    • -4
    • +4
    ./lams/ApplicationResources_el_GR.properties
  1. … 1 more file in changeset.
Updating translations English, Greek, German and Norwegian

Added German to Lokalise. All labels are the same but the output file format is slightly different.

    • -111
    • +70
    ./lams/ApplicationResources_de_DE.properties
  1. … 40 more files in changeset.
LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

    • -0
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 14 more files in changeset.
LDEV-4769 Updating English , Spanish, Norwegian

    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 5 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +0
    ./lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -19
    • +19
    ./lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./lams/ApplicationResources_no_NO.properties
  1. … 40 more files in changeset.
LDEV-4769 Updating Spanish, Greek, French, Norwegian

    • -2
    • +2
    ./lams/ApplicationResources_es_ES.properties
    • -102
    • +0
    ./lams/ApplicationResources_fr_FR.properties
  1. … 20 more files in changeset.
LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

    • -207
    • +189
    ./lams/ApplicationResources.properties
    • -196
    • +189
    ./lams/ApplicationResources_el_GR.properties
    • -198
    • +189
    ./lams/ApplicationResources_en_AU.properties
    • -198
    • +189
    ./lams/ApplicationResources_es_ES.properties
    • -131
    • +189
    ./lams/ApplicationResources_fr_FR.properties
    • -196
    • +189
    ./lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
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

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 21 more files in changeset.
LDEV-4989 fixing layout and labels

    • -3
    • +2
    ./lams/ApplicationResources.properties
  1. … 2 more files in changeset.
LDEV-4989 Inform user of incorrect gate password

    • -0
    • +1
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4989 Password Gate initial implementation

    • -0
    • +3
    ./lams/ApplicationResources.properties
  1. … 36 more files in changeset.
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

    • -1
    • +7
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 14 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 16 more files in changeset.
LDEV-4769 updating labels

    • -4
    • +4
    ./lams/ApplicationResources.properties
    • -3
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./lams/ApplicationResources_es_ES.properties
LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

    • -2
    • +3
    ./lams/ApplicationResources.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./lams/ApplicationResources_es_ES.properties
  1. … 63 more files in changeset.
Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# 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_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.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_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

    • -8
    • +9
    ./lams/ApplicationResources.properties
    • -3
    • +4
    ./lams/ApplicationResources_en_AU.properties
  1. … 34 more files in changeset.