diff -Naur moodle-20080924/admin/uploaduser.php moodle/admin/uploaduser.php
--- moodle-20080924/admin/uploaduser.php	2008-04-24 02:17:11.000000000 +0200
+++ moodle/admin/uploaduser.php	2008-09-28 21:14:02.000000000 +0200
@@ -949,7 +949,11 @@
     $plugins = get_enabled_auth_plugins();
     $choices = array();
     foreach ($plugins as $plugin) {
-        $choices[$plugin] = get_string('auth_'.$plugin.'title', 'auth');
+        $str = get_string('auth_'.$plugin.'title', 'auth');
+        if ($str == '[[auth_'.$plugin.'title]]') {
+            $str = get_string('auth_'.$plugin.'title', 'auth_'.$plugin);
+        }
+        $choices[$plugin] = $str;
     }
 
     return $choices;
diff -Naur moodle-20080924/user/editadvanced_form.php moodle/user/editadvanced_form.php
--- moodle-20080924/user/editadvanced_form.php	2008-07-04 02:18:57.000000000 +0200
+++ moodle/user/editadvanced_form.php	2008-09-28 21:14:02.000000000 +0200
@@ -28,7 +28,11 @@
         $modules = get_list_of_plugins('auth');
         $auth_options = array();
         foreach ($modules as $module) {
-            $auth_options[$module] = get_string("auth_$module"."title", "auth");
+            $str = get_string("auth_{$module}title", 'auth');
+            if ($str == "[[auth_{$module}title]]") {
+                $str = get_string("auth_{$module}title", "auth_{$module}");
+            }
+            $auth_options[$module] = $str;
         }
         $mform->addElement('select', 'auth', get_string('chooseauthmethod','auth'), $auth_options);
         $mform->setHelpButton('auth', array('authchange', get_string('chooseauthmethod','auth')));
diff -Naur moodle-20080924/user/filters/lib.php moodle/user/filters/lib.php
--- moodle-20080924/user/filters/lib.php	2008-08-18 02:18:15.000000000 +0200
+++ moodle/user/filters/lib.php	2008-09-28 21:14:02.000000000 +0200
@@ -115,7 +115,11 @@
                 $plugins = get_list_of_plugins('auth');
                 $choices = array();
                 foreach ($plugins as $auth) {
-                    $choices[$auth] = get_string("auth_{$auth}title", 'auth');
+                    $str = get_string("auth_{$auth}title", 'auth');
+                    if ($str == "[[auth_{$auth}title]]") {
+                        $str = get_string("auth_{$auth}title", "auth_{$auth}");
+                    }
+                    $choices[$auth] = $str;
                 }
                 return new user_filter_simpleselect('auth', get_string('authentication'), $advanced, 'auth', $choices);