From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 12 Dec 2011 00:54:48 +0000 (+1300)
Subject: Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle
X-Git-Tag: v2.3.0-beta~1591
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d35fc666d69deba29a0959e01b94c21595ffc00d;hp=ffdbcf3998461e06278c5efbd6a4b5a185aaa7e3

Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle
---

diff --git a/mod/glossary/import_form.php b/mod/glossary/import_form.php
index 475644b3265..2f37a149e4d 100644
--- a/mod/glossary/import_form.php
+++ b/mod/glossary/import_form.php
@@ -17,7 +17,7 @@ class mod_glossary_import_form extends moodleform {
         $options = array();
         $options['current'] = get_string('currentglossary', 'glossary');
         $options['newglossary'] = get_string('newglossary', 'glossary');
-        $mform->addElement('select', 'dest', get_string('currentglossary', 'glossary'), $options);
+        $mform->addElement('select', 'dest', get_string('destination', 'glossary'), $options);
         $mform->addHelpButton('dest', 'destination', 'glossary');
         $mform->addElement('checkbox', 'catsincl', get_string('importcategories', 'glossary'));
         $submit_string = get_string('submit');