Checking in changed files. Wierd merge but files all look OK :-/
commit64a129a4f6623f4078c30c78c58509b3ab061ff9
authormoodler <moodler>
Fri, 15 Jul 2005 19:46:48 +0000 (15 19:46 +0000)
committermoodler <moodler>
Fri, 15 Jul 2005 19:46:48 +0000 (15 19:46 +0000)
tree0473c5d6395a88161ef145728406aee6fb7b919c
parent7e6bc94ad2439caf08ed8d0f71e92f2f039176c2
Checking in changed files.  Wierd merge but files all look OK :-/
126 files changed:
lang/de/admin.php
lang/de/assignment.php
lang/de/calendar.php
lang/de/chat.php
lang/de/lesson.php
lang/de/message.php
lang/de/moodle.php
lang/de/quiz.php
lang/de/scorm.php
lang/de/survey.php
lang/it/install.php
lang/it/lesson.php
lang/it/scorm.php
lang/ja/README
lang/ja/admin.php
lang/ja/auth.php
lang/ja/docs/features.html
lang/ja/docs/intro.html
lang/ja/docs/release.html
lang/ja/enrol_authorize.php
lang/ja/help/lesson/handlingofretakes.html [new file with mode: 0644]
lang/ja/help/lesson/maxattempts.html [new file with mode: 0644]
lang/ja/help/workshop/agreeassessments.html [new file with mode: 0644]
lang/ja/help/workshop/assessmentend.html [new file with mode: 0644]
lang/ja/help/workshop/editingacomment.html [new file with mode: 0644]
lang/ja/help/workshop/nattachments.html [new file with mode: 0644]
lang/ja/help/workshop/regrading.html [new file with mode: 0644]
lang/ja/help/workshop/showinggrades.html [new file with mode: 0644]
lang/ja/lesson.php
lang/ja/moodle.php
lang/ja/resource.php
lang/ja_utf8/README
lang/ja_utf8/admin.php
lang/ja_utf8/auth.php
lang/ja_utf8/docs/features.html
lang/ja_utf8/docs/intro.html
lang/ja_utf8/docs/release.html
lang/ja_utf8/enrol_authorize.php
lang/ja_utf8/help/lesson/handlingofretakes.html [new file with mode: 0644]
lang/ja_utf8/help/lesson/maxattempts.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/agreeassessments.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/assessmentend.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/editingacomment.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/nattachments.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/regrading.html [new file with mode: 0644]
lang/ja_utf8/help/workshop/showinggrades.html [new file with mode: 0644]
lang/ja_utf8/lesson.php
lang/ja_utf8/moodle.php
lang/ja_utf8/resource.php
lang/ko/activitynames.php
lang/ko/admin.php
lang/ko/algebra.php
lang/ko/appointment.php
lang/ko/assignment.php
lang/ko/attendance.php
lang/ko/auth.php
lang/ko/block_course_list.php
lang/ko/block_course_summary.php
lang/ko/block_glossary_random.php
lang/ko/block_html.php
lang/ko/block_online_users.php
lang/ko/block_quiz_results.php
lang/ko/block_rss_client.php
lang/ko/block_section_links.php
lang/ko/block_social_activities.php
lang/ko/book.php
lang/ko/calendar.php
lang/ko/censor.php
lang/ko/chat.php
lang/ko/choice.php
lang/ko/countries.php
lang/ko/dialogue.php
lang/ko/editor.php
lang/ko/enrol_database.php
lang/ko/enrol_flatfile.php
lang/ko/error.php
lang/ko/exercise.php
lang/ko/forum.php
lang/ko/gallery.php
lang/ko/glossary.php
lang/ko/hotpot.php
lang/ko/install.php
lang/ko/journal.php
lang/ko/label.php
lang/ko/lesson.php
lang/ko/mediaplugin.php
lang/ko/message.php
lang/ko/moodle.php
lang/ko/multilang.php
lang/ko/pix.php
lang/ko/questionnaire.php
lang/ko/quiz.php
lang/ko/resource.php
lang/ko/scheduler.php
lang/ko/scorm.php
lang/ko/survey.php
lang/ko/tex.php
lang/ko/webquest.php
lang/ko/wiki.php
lang/ko/workshop.php
lang/nl/admin.php
lang/pt_br/block_rss_client.php
lang/pt_br/help/hotpot/analysistable.html [new file with mode: 0644]
lang/pt_br/help/hotpot/forceplugins.html [new file with mode: 0644]
lang/pt_br/help/hotpot/index.html [new file with mode: 0644]
lang/pt_br/help/hotpot/mediaplayers.html [new file with mode: 0644]
lang/pt_br/help/hotpot/mods.html [new file with mode: 0644]
lang/pt_br/help/hotpot/navigation.html [new file with mode: 0644]
lang/pt_br/help/hotpot/outputformat.html [new file with mode: 0644]
lang/pt_br/help/hotpot/reportselector.html [new file with mode: 0644]
lang/pt_br/help/hotpot/responsestable.html [new file with mode: 0644]
lang/pt_br/help/hotpot/shownextquiz.html [new file with mode: 0644]
lang/pt_br/hotpot.php
lang/pt_br/install.php
lang/pt_br/lesson.php
lang/pt_br/scorm.php
lang/ru/assignment.php
lang/ru/message.php
lang/ru/quiz.php
lang/tr/enrol_authorize.php
lang/vi_utf8/moodle.php
lang/zh_tw/auth.php
lang/zh_tw/docs/files.php
lang/zh_tw/forum.php
lang/zh_tw/moodle.php
lang/zh_tw/survey.php