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

    • -14
    • +55
    ./lams/ApplicationResources_fr_FR.properties
  1. … 8 more files in changeset.
LDEV-4769 Updating Greek, French

    • -1
    • +9
    ./lams/ApplicationResources_fr_FR.properties
  1. … 7 more files in changeset.
LDEV-4769 Updating Greek and English

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 1 more file in changeset.
LDEV-4769 Updating English, Norwegian and Greek

    • -0
    • +4
    ./lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    ./lams/ApplicationResources_no_NO.properties
  1. … 25 more files in changeset.
LDEV-4553 Adding missing label for Q&A

    • -0
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 2 more files in changeset.
LDEV-5143 labels

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -0
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +4
    ./lams/ApplicationResources_es_ES.properties
  1. … 19 more files in changeset.
Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 19 more files in changeset.
LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

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

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

    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 5 more files in changeset.
LDEV-5138 Set leader only on his activity entry, not on any user entry

    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  1. … 25 more files in changeset.
LDEV-4769 Updating English, Spanish, Norwegian, Greek

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

    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -2
    • +3
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./lams/ApplicationResources_no_NO.properties
  1. … 16 more files in changeset.
LDEV-5114 Add "Add as new version" button to Q&A

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

    • -1
    • +1
    ./lams/ApplicationResources_el_GR.properties
  1. … 4 more files 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.

    • -261
    • +164
    ./lams/ApplicationResources_de_DE.properties
  1. … 40 more files in changeset.
Updating labels Spanish, English, French, Norwegian

    • -18
    • +18
    ./lams/ApplicationResources_es_ES.properties
  1. … 41 more files in changeset.
LDEV-4769 Updating Spanish

Also removing a deprecated label

    • -1
    • +1
    ./lams/ApplicationResources_es_ES.properties
  1. … 22 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!!

    • -234
    • +225
    ./lams/ApplicationResources.properties
    • -233
    • +225
    ./lams/ApplicationResources_el_GR.properties
    • -234
    • +225
    ./lams/ApplicationResources_en_AU.properties
    • -235
    • +225
    ./lams/ApplicationResources_es_ES.properties
    • -265
    • +176
    ./lams/ApplicationResources_fr_FR.properties
    • -233
    • +225
    ./lams/ApplicationResources_no_NO.properties
  1. … 166 more files in changeset.
LDEV-4745 Adding missing labels

    • -4
    • +3
    ./lams/ApplicationResources.properties
    • -4
    • +3
    ./lams/ApplicationResources_en_AU.properties
LDEV-4769 Updating Greek and Norwegian

    • -3
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./lams/ApplicationResources_no_NO.properties
LDEV-4739 updating Greek and Norwegian

    • -3
    • +3
    ./lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./lams/ApplicationResources_no_NO.properties
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

    • -4
    • +5
    ./lams/ApplicationResources.properties
  1. … 17 more files in changeset.
LDEV-4769 updating labels

    • -7
    • +6
    ./lams/ApplicationResources.properties
    • -5
    • +6
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +5
    ./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
    • -3
    • +4
    ./lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./lams/ApplicationResources_es_ES.properties
  1. … 63 more files in changeset.
LDEV-4927 Improvements to Q&A UI

1) Only show question numbering if there's more than one question.

2) Improve warnings about answer requirements and word count required

3) Make use of placeholder for "Your answer" instead.

    • -2
    • +2
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
  1. … 5 more files in changeset.
LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

    • -0
    • +2
    ./lams/ApplicationResources.properties
  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

    • -11
    • +8
    ./lams/ApplicationResources_en_AU.properties
  1. … 11 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

    • -2
    • +6
    ./lams/ApplicationResources.properties
  1. … 35 more files in changeset.