[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm lonroles.pm /html/adm/help/tex Domain_Configuration_Login_Page.tex Domain_Coordination_Overview.tex /interface coursecatalog.pm createaccount.pm domainprefs.pm loncreateuser.pm lonmodifycourse.pm lonsyllabus.pm /localize/localize de.pm es.pm zh.pm

bisitz bisitz@source.lon-capa.org
Fri, 23 Oct 2009 16:14:48 -0000


This is a MIME encoded message

--bisitz1256314488
Content-Type: text/plain

bisitz		Fri Oct 23 16:14:48 2009 EDT

  Modified files:              
    /loncom/auth	lonlogin.pm lonroles.pm 
    /loncom/html/adm/help/tex	Domain_Configuration_Login_Page.tex 
                             	Domain_Coordination_Overview.tex 
    /loncom/interface	coursecatalog.pm createaccount.pm domainprefs.pm 
                     	loncreateuser.pm lonmodifycourse.pm 
                     	lonsyllabus.pm 
    /loncom/localize/localize	de.pm es.pm zh.pm 
  Log:
  Consistent wording "Course Catalog" -> "Course/Community Catalog"
  
  
--bisitz1256314488
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20091023161448.txt"

Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.128 loncom/auth/lonlogin.pm:1.129
--- loncom/auth/lonlogin.pm:1.128	Wed Oct 21 12:29:40 2009
+++ loncom/auth/lonlogin.pm	Fri Oct 23 16:14:36 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Login Screen
 #
-# $Id: lonlogin.pm,v 1.128 2009/10/21 12:29:40 raeburn Exp $
+# $Id: lonlogin.pm,v 1.129 2009/10/23 16:14:36 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -337,21 +337,21 @@
 # ----------------------------------------------------------------------- Texts
 
 my %lt=&Apache::lonlocal::texthash(
-	  'un'  => 'Username',
-	  'pw'  => 'Password',
-	  'dom' => 'Domain',
-	  'perc' => 'percent',
-	  'load' => 'Server Load',
-	  'userload' => 'User Load',
-	  'catalog' => 'Course Catalog',
-	  'log' => 'Log in',
-	  'help' => 'Log-in Help',
-	  'serv' => 'Server',
-	  'servadm' => 'Server Administration',
-	  'helpdesk' => 'Contact Helpdesk',
-	  'forgotpw' => 'Forgot password?',
-	  'newuser'  => 'New User?',
-	  );
+          'un'       => 'Username',
+          'pw'       => 'Password',
+          'dom'      => 'Domain',
+          'perc'     => 'percent',
+          'load'     => 'Server Load',
+          'userload' => 'User Load',
+          'catalog'  => 'Course/Community Catalog',
+          'log'      => 'Log in',
+          'help'     => 'Log-in Help',
+          'serv'     => 'Server',
+          'servadm'  => 'Server Administration',
+          'helpdesk' => 'Contact Helpdesk',
+          'forgotpw' => 'Forgot password?',
+          'newuser'  => 'New User?',
+       );
 # -------------------------------------------------- Change password field name
 my $forgotpw = &forgotpwdisplay(%lt);
 my $loginhelp = &loginhelpdisplay(%lt);
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.232 loncom/auth/lonroles.pm:1.233
--- loncom/auth/lonroles.pm:1.232	Fri Oct 23 00:20:36 2009
+++ loncom/auth/lonroles.pm	Fri Oct 23 16:14:36 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.232 2009/10/23 00:20:36 raeburn Exp $
+# $Id: lonroles.pm,v 1.233 2009/10/23 16:14:36 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -712,7 +712,19 @@
             &queued_selfenrollment($r);
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-            $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
+            $r->print(
+                '<p>'
+               .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
+                   .' to view all [_4] LON-CAPA courses and communities.'
+                   ,'<b>'
+                   ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
+                   ,'</a></b>',$domdesc)
+               .'<br />'
+               .&mt('If a course is [_1]not[_2] in your list of current courses below,'
+                   .' you may be able to enroll if self-enrollment is permitted.'
+                   ,'<b>','</b>')
+               .'</p>'
+            );
         }
     }
 
@@ -848,7 +860,7 @@
                  .'</i><br />'
                  .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                 .&mt('Course Catalog')
+                 .&mt('Course/Community Catalog')
                  .'</a></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
@@ -1157,7 +1169,7 @@
     } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }
-    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+    $r->print('<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
     $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
     &queued_selfenrollment($r);
     return;
Index: loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex
diff -u loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.2 loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.3
--- loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex:1.2	Wed Jul 23 13:18:39 2008
+++ loncom/html/adm/help/tex/Domain_Configuration_Login_Page.tex	Fri Oct 23 16:14:39 2009
@@ -27,7 +27,7 @@
 \item Enable/disable display of three links: 
 
 \begin{itemize}
-\item Course Catalog, for a catalog of courses 
+\item Course/Community Catalog, for a catalog of courses and communities
 \item Admin E-mail, for the e-mail address of the administrator 
 \item New User, for users to create their own accounts 
 \end{itemize}
Index: loncom/html/adm/help/tex/Domain_Coordination_Overview.tex
diff -u loncom/html/adm/help/tex/Domain_Coordination_Overview.tex:1.6 loncom/html/adm/help/tex/Domain_Coordination_Overview.tex:1.7
--- loncom/html/adm/help/tex/Domain_Coordination_Overview.tex:1.6	Tue Jul 29 21:02:36 2008
+++ loncom/html/adm/help/tex/Domain_Coordination_Overview.tex	Fri Oct 23 16:14:39 2009
@@ -44,4 +44,4 @@
 of \emph{localenroll.pm} is also needed to define user population terms/titles
 used at an institution (e.g., Faculty, Staff, Students), and also
 to define official course categories (e.g., Year, Semester, Department,
-Number) which can be used as filters when searching the Course Catalog.
+Number) which can be used as filters when searching the Course/Community Catalog.
Index: loncom/interface/coursecatalog.pm
diff -u loncom/interface/coursecatalog.pm:1.55 loncom/interface/coursecatalog.pm:1.56
--- loncom/interface/coursecatalog.pm:1.55	Sat Oct 17 01:42:07 2009
+++ loncom/interface/coursecatalog.pm	Fri Oct 23 16:14:43 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.55 2009/10/17 01:42:07 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.56 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -174,7 +174,7 @@
     my $js = '<script type="text/javascript">'."\n".
              &courselink_javascript().'</script>'."\n";
     my $start_page =
-        &Apache::loncommon::start_page('Course Catalog',$js,
+        &Apache::loncommon::start_page('Course/Community Catalog',$js,
                                            {
                                              'add_entries' => \%add_entries,
                                              'no_inline_link'   => 1,});
@@ -182,7 +182,7 @@
     if ($env{'form.numtitles'} > 0) {
         &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"});
+                  text=>"Course/Community Catalog"});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
              ({href=>"javascript:document.$formname.submit()",
@@ -292,7 +292,7 @@
         if ($numtitles > 0) {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"/adm/coursecatalog",
-                  text=>"Select courses"},
+                  text=>"Course/Community Catalog"},
                  {text=>"Course listing"});
         } else {
             &Apache::lonhtmlcommon::add_breadcrumb
@@ -301,7 +301,7 @@
     } else {
         &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/coursecatalog",
-          text=>"Select courses"});
+          text=>"Course/Community Catalog"});
     }
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course/Community Catalog'));
     my $onchange;
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.36 loncom/interface/createaccount.pm:1.37
--- loncom/interface/createaccount.pm:1.36	Mon May  4 16:45:57 2009
+++ loncom/interface/createaccount.pm	Fri Oct 23 16:14:43 2009
@@ -3,7 +3,7 @@
 # institutional log-in ID (institutional authentication required - localauth
 #  or kerberos) or an e-mail address.
 #
-# $Id: createaccount.pm,v 1.36 2009/05/04 16:45:57 bisitz Exp $
+# $Id: createaccount.pm,v 1.37 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,7 @@
     my ($r,$courseid,$desc) = @_;
     &Apache::lonhtmlcommon::add_breadcrumb
          ({href=>"javascript:ToCatalog('backupcrumbs','')",
-           text=>"Course Catalog"});
+           text=>"Course/Community Catalog"});
     if ($env{'form.coursenum'} ne '') {
         &Apache::lonhtmlcommon::add_breadcrumb
           ({href=>"javascript:ToCatalog('backupcrumbs','details')",
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.115 loncom/interface/domainprefs.pm:1.116
--- loncom/interface/domainprefs.pm:1.115	Wed Oct 21 14:06:11 2009
+++ loncom/interface/domainprefs.pm	Fri Oct 23 16:14:43 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.115 2009/10/21 14:06:11 raeburn Exp $
+# $Id: domainprefs.pm,v 1.116 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -788,7 +788,7 @@
 sub login_choices {
     my %choices =
         &Apache::lonlocal::texthash (
-            coursecatalog => 'Display Course Catalog link?',
+            coursecatalog => 'Display Course/Community Catalog link?',
             adminmail     => "Display Administrator's E-mail Address?",
             disallowlogin => "Login page requests redirected",
             submitbugs    => "Display &quot;Submit Bug&quot; link?",
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.315 loncom/interface/loncreateuser.pm:1.316
--- loncom/interface/loncreateuser.pm:1.315	Mon Sep 21 17:09:22 2009
+++ loncom/interface/loncreateuser.pm	Fri Oct 23 16:14:43 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.315 2009/09/21 17:09:22 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.316 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4665,9 +4665,9 @@
     my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
     my ($cathash,%settable,@vismsgs,$cansetvis);
     my %visactions = &Apache::lonlocal::texthash(
-                   vis => 'Your course currently appears in the Course Catalog for this domain.',
+                   vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.',
                    gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
-                   miss => 'Your course does not currently appear in the Course Catalog for this domain.',
+                   miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.',
                    yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
                    coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
                    make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
Index: loncom/interface/lonmodifycourse.pm
diff -u loncom/interface/lonmodifycourse.pm:1.46 loncom/interface/lonmodifycourse.pm:1.47
--- loncom/interface/lonmodifycourse.pm:1.46	Fri Jul 31 03:01:31 2009
+++ loncom/interface/lonmodifycourse.pm	Fri Oct 23 16:14:43 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # handler for DC-only modifiable course settings
 #
-# $Id: lonmodifycourse.pm,v 1.46 2009/07/31 03:01:31 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.47 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -361,8 +361,8 @@
                 $excludeon = $excludeoff;
                 $excludeoff = ''; 
             }
-            $r->print('<h4>'.&mt('Visibility in Course Catalog').'</h4>'.
-                      &mt("Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies").':<ul>'.
+            $r->print('<h4>'.&mt('Visibility in Course/Community Catalog').'</h4>'.
+                      &mt("Unless excluded, a course/community is listed in this domain's publicly accessible Course/Community Catalog, if at least one of the following applies").':<ul>'.
                       '<li>'.&mt('Auto-cataloging is enabled and the course is assigned an institutional code').'</li>'.
                       '<li>'.&mt('The course has been categorized into at least one of the course categories defined for the domain.').'</li></ul>'.
                       &mt('Exclude from course catalog').'&nbsp;<label><input name="hidefromcat" type="radio" value="yes" '.$excludeon.' />'.&mt('Yes').'</label>&nbsp;&nbsp;&nbsp;<label><input name="hidefromcat" type="radio" value="" '.$excludeoff.' />'.&mt('No').'</label><br />'); 
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.99 loncom/interface/lonsyllabus.pm:1.100
--- loncom/interface/lonsyllabus.pm:1.99	Sun Sep 27 11:05:06 2009
+++ loncom/interface/lonsyllabus.pm	Fri Oct 23 16:14:43 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.99 2009/09/27 11:05:06 amueller Exp $
+# $Id: lonsyllabus.pm,v 1.100 2009/10/23 16:14:43 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -151,7 +151,7 @@
             &Apache::lonhtmlcommon::clear_breadcrumbs();
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>"javascript:ToCatalog()",
-                text=>"Course Catalog"});
+                text=>"Course/Community Catalog"});
             if ($env{'form.coursenum'} ne '') {
                 &Apache::lonhtmlcommon::add_breadcrumb
                     ({href=>"javascript:ToCatalog('details')",
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.331 loncom/localize/localize/de.pm:1.332
--- loncom/localize/localize/de.pm:1.331	Fri Oct 23 15:03:43 2009
+++ loncom/localize/localize/de.pm	Fri Oct 23 16:14:46 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.331 2009/10/23 15:03:43 bisitz Exp $
+# $Id: de.pm,v 1.332 2009/10/23 16:14:46 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7835,8 +7835,8 @@
    'About LON-CAPA'
 => 'Über LON-CAPA',
 
-   'Course Catalog'
-=> 'Kursübersicht',
+   'Course/Community Catalog'
+=> 'Kurs-/Community-Übersicht',
 
    'If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:'
 => 'Falls Sie eine aktive Rolle für einen bestimmten Kurs in der Domäne "[_1]" erwartet haben, könnte es sein, dass diese aus einem der folgenden Gründe fehlt:',
@@ -7856,7 +7856,7 @@
    'If you were expecting to see an active role listed for a particular course, that course may not have been created yet.'
 => 'Falls Sie eine aktive Rolle für einen bestimmten Kurs erwartet haben, könnte es sein, dass diese noch nicht erstellt wurde.',
 
-   'The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
+   'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
 => 'Die [_1]Kursübersicht[_2] enthält Informationen über alle Kurse der Domäne [_3], für die LON-CAPA-Kurse eingerichtet wurden.',
 
    'You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.'
@@ -9263,11 +9263,11 @@
    'Catalog Settings for Course'
 => 'Katalog-Einstellungen für den Kurs',
 
-   'Visibility in Course Catalog'
-=> 'Sichtbarkeit in der Kursübersicht',
+   'Visibility in Course/Community Catalog'
+=> 'Sichtbarkeit in der Kurs-/Community-Übersicht',
 
-   "Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies:"
-=> "Sofern ein Kurs nicht aus der Anzeige in der in dieser Domäne öffentlich zugänglichen Kursübersicht ausgeschlossen wurde, wird er angezeigt, solange mindestens eine der folgenden Einstellungen zutrifft:",
+   "Unless excluded, a course/community is listed in this domain's publicly accessible Course/Community Catalog, if at least one of the following applies:"
+=> 'Sofern ein Kurs/eine Community nicht aus der Anzeige in der in dieser Domäne öffentlich zugänglichen Kurs-/Community-Übersicht ausgeschlossen wurde, wird er/sie angezeigt, solange mindestens eine der folgenden Einstellungen zutrifft:',
 
    'Auto-cataloging is enabled and the course is assigned an institutional code'
 => 'Automatische Katalogisierung ist aktiviert und dem Kurs wurde ein institutioneller Code zugewiesen',
@@ -12548,8 +12548,8 @@
    'String Response'
 => 'Texteingabe (String Response)',
 
-   'Display catalog of courses'
-=> 'Kursübersicht', # long version: Kursübersicht anzeigen
+   'Display catalog of courses and communities'
+=> 'Kurs-/Community-Übersicht', # long version: Kurs- und Community-Übersicht anzeigen
 
    'Manage co-authors'
 => 'Co-Autoren verwalten',
@@ -15535,8 +15535,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'Für [quant,_1,Aufgabe,Aufgaben] wurden die Punkte geändert.',
 
-   '[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]Besuchen Sie die [_2]Kursübersicht[_3], um alle LON-CAPA-Kurse der Domäne [_4] zu betrachten.',
+   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
+=> '[_1]Besuchen Sie die [_2]Kurs-/Community-Übersicht[_3], um alle LON-CAPA-Kurse und -Communitys der Domäne [_4] zu betrachten.',
 
    'If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.'
 => 'Falls ein Kurs in der folgenden Liste Ihrer derzeitigen Kurse [_1]nicht[_2] angezeigt wird, können Sie sich in der Kursübersicht in diesen Kurs selbst eintragen, sofern die Selbsteintragung für diesen Kurs aktiviert ist.',
@@ -15873,14 +15873,14 @@
    'Error occurred saving new values in metadata table in LON-CAPA database!'
 => 'Speichern neuer Werte in der Metadaten-Tabelle der LON-CAPA-Datenbank ist fehlgeschlagen!',
 
-   'Your course currently appears in the Course Catalog for this domain.'
-=> 'Ihr Kurs wird momentan in der Kursübersicht aufgelistet.',
+   'Your course/community currently appears in the Course/Community Catalog for this domain.'
+=> 'Ihr Kurs/Ihre Community wird momentan in der Kurs-/Community-Übersicht aufgelistet.',
 
    'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.'
 => 'Kurse können selbst-katalogisiert sein, auf institutionellen Codes basieren (z.B. fbi_ws20082009_linalg) oder können eine Kategorie einer Hierarchie zugeordnet sein, die durch die Domäne definiert ist.',
 
-   'Your course does not currently appear in the Course Catalog for this domain.'
-=> 'Ihr Kurs wird derzeit nicht in der Kursübersicht dieser Domäne aufgelistet.',
+   'Your course/community does not currently appear in the Course/Community Catalog for this domain.'
+=> 'Ihr Kurs/Ihre Community wird derzeit nicht in der Kurs-/Community-Übersicht dieser Domäne aufgelistet.',
 
    'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.'
 => 'Sie sollten dies ändern, falls Sie Selbsteintragung für diesen Kurs anbieten möchten, da Studierende sonst Schwierigkeiten haben werden, Ihren Kurs zu finden.',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.31 loncom/localize/localize/es.pm:1.32
--- loncom/localize/localize/es.pm:1.31	Fri Oct 23 15:03:43 2009
+++ loncom/localize/localize/es.pm	Fri Oct 23 16:14:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.31 2009/10/23 15:03:43 bisitz Exp $
+# $Id: es.pm,v 1.32 2009/10/23 16:14:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7936,8 +7936,8 @@
    'About LON-CAPA'
 => 'Acerca de LON-CAPA',
 
-   'Course Catalog'
-=> 'Catálogo de Cursos',
+   'Course/Community Catalog'
+=> 'Course/Community Catalog', # 'Catálogo de Cursos',
 
    'If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:'
 => 'Si está esperando ver una lista de funciones activas para un curso en particular en el dominio [_1], podría estar extraviado por una de las siguientes razones:',
@@ -7957,7 +7957,7 @@
    'If you were expecting to see an active role listed for a particular course, that course may not have been created yet.'
 => 'Si está esperando ver una lista de funciones activas para un curso en particular, ese curso pudo no ser creado aún.',
 
-   'The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
+   'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
 => 'El [_1]Catálogo de Cursos[_2] provee información sobre todas las clases en el dominio [_3], para los cuales se crearon cursos LON-CAPA.',
 
    'You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.'
@@ -9361,11 +9361,11 @@
    'Catalog Settings for Course'
 => 'Configuración del Catálogo para Curso',
 
-   'Visibility in Course Catalog'
+   'Visibility in Course/Community Catalog'
 => 'Visibilidad en Catálogo del Curso',
 
-   "Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies:"
-=> "A menos que esté excluído, un curso es listado en este catálogo de curso de dominio públicamente accesible,  si al menos uno de los siguiente aplica:",
+   "Unless excluded, a course/community is listed in this domain's publicly accessible Course/Community Catalog, if at least one of the following applies:"
+=> "Unless excluded, a course/community is listed in this domain's publicly accessible Course/Community Catalog, if at least one of the following applies:", # "A menos que esté excluído, un curso es listado en este catálogo de curso de dominio públicamente accesible,  si al menos uno de los siguiente aplica:",
 
    'Auto-cataloging is enabled and the course is assigned an institutional code'
 => 'Auto-catalogar está activado y el curso es asignado un código institucional',
@@ -12658,8 +12658,8 @@
    'String Response'
 => 'Respuesta Concatenada (String Response)',
 
-   'Display catalog of courses'
-=> 'Ver catálogo de cursos',
+   'Display catalog of courses and communities'
+=> 'Display catalog of courses and communities', # 'Ver catálogo de cursos',
 
    'Manage co-authors'
 => 'Control de co-autores',
@@ -15648,8 +15648,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'La puntuación a cambiado para [quant,_1,problema,problemas].',
 
-   '[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]Visite el [_2]Catálogo de Cursos[_3], para ver todos los cursos LON-CAPA del dominio [_4].',
+   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
+=> '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.', # '[_1]Visite el [_2]Catálogo de Cursos[_3], para ver todos los cursos LON-CAPA del dominio [_4].',
 
    'If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.'
 => 'Si un curso [_1]no[_2] está en su lista actual de cursos, usted podría registrarse si la auto-inscripción es permitida.',
@@ -15998,14 +15998,14 @@
    'Error occurred saving new values in metadata table in LON-CAPA database!'
 => 'Ocurrió un error guardando valores nuevos en la tabla de metadatos en la base de datos LON-CAPA!',
 
-   'Your course currently appears in the Course Catalog for this domain.'
-=> 'Su curso actualmente aparece en el Catálogo de Cursos para este dominio.',
+   'Your course/community currently appears in the Course/Community Catalog for this domain.'
+=> 'Your course/community currently appears in the Course/Community Catalog for this domain.', # 'Su curso actualmente aparece en el Catálogo de Cursos para este dominio.',
 
    'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.'
 => 'Cursos pueden ser ambos auto-catalogados, basados en un código institucional (p.e. fisi3172f08), o pueden asignarse categorías desde una jerarquía definida para el dominio.',
 
-   'Your course does not currently appear in the Course Catalog for this domain.'
-=> 'Su curso, actualmente, no aparece en el Catálogo del curso para este dominio.',
+   'Your course/community does not currently appear in the Course/Community Catalog for this domain.'
+=> 'Your course/community does not currently appear in the Course/Community Catalog for this domain.', # 'Su curso, actualmente, no aparece en el Catálogo del curso para este dominio.',
 
    'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.'
 => 'Debe remediar esto si planea permitir auto-incripción, sino los estudiantes tendrán dificultad encontrando su curso.',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.80 loncom/localize/localize/zh.pm:1.81
--- loncom/localize/localize/zh.pm:1.80	Fri Oct 23 15:03:43 2009
+++ loncom/localize/localize/zh.pm	Fri Oct 23 16:14:47 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.80 2009/10/23 15:03:43 bisitz Exp $
+# $Id: zh.pm,v 1.81 2009/10/23 16:14:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7855,11 +7855,9 @@
 
    'About LON-CAPA'
 => '关于 LON-CAPA',
-#=> 'Über LON-CAPA',
 
-   'Course Catalog'
-=> '课程目录',
-#=> 'Kursübersicht',
+   'Course/Community Catalog'
+=> 'Kurs-/Community-Übersicht', '课程目录',
 
    'If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:'
 => 'Falls Sie eine aktive Rolle für einen bestimmten Kurs in der Domäne "[_1]" erwartet haben, könnte es sein, dass diese aus einem der folgenden Gründe fehlt:',
@@ -7879,7 +7877,7 @@
    'If you were expecting to see an active role listed for a particular course, that course may not have been created yet.'
 => 'Falls Sie eine aktive Rolle für einen bestimmten Kurs erwartet haben, könnte es sein, dass diese noch nicht erstellt wurde.',
 
-   'The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
+   'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.' # [_3]: domain
 => 'Die [_1]Kursübersicht[_2] enthält Informationen über alle Kurse der Domäne [_3], für die LON-CAPA-Kurse eingerichtet wurden.',
 
    'You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.'
@@ -9262,11 +9260,11 @@
    'Catalog Settings for Course'
 => 'Katalog-Einstellungen für den Kurs',
 
-   'Visibility in Course Catalog'
-=> 'Sichtbarkeit in der Kursübersicht',
+   'Visibility in Course/Community Catalog'
+=> 'Sichtbarkeit in der Kurs-/Community-Übersicht',
 
-   "Unless excluded, a course is listed in this domain's publicly accessible course catalog, if at least one of the following applies:"
-=> "Sofern ein Kurs nicht aus der Anzeige in der in dieser Domäne öffentlich zugänglichen Kursübersicht ausgeschlossen wurde, wird er angezeigt, solange mindestens eine der folgenden Einstellungen zutrifft:",
+   "Unless excluded, a course/community is listed in this domain's publicly accessible Course/Community Catalog, if at least one of the following applies:"
+=> 'Sofern ein Kurs/eine Community nicht aus der Anzeige in der in dieser Domäne öffentlich zugänglichen Kurs-/Community-Übersicht ausgeschlossen wurde, wird er/sie angezeigt, solange mindestens eine der folgenden Einstellungen zutrifft:',
 
    'Auto-cataloging is enabled and the course is assigned an institutional code'
 => 'Automatische Katalogisierung ist aktiviert und dem Kurs wurde ein institutioneller Code zugewiesen',
@@ -12542,8 +12540,8 @@
    'String Response'
 => '文本输入 (String Response)',
 
-   'Display catalog of courses'
-=> '课程目录',
+   'Display catalog of courses and communities'
+=> 'Kurs- und Community-Übersicht', '课程目录',
 
    'Manage co-authors'
 => '管理共同作者',
@@ -15584,8 +15582,8 @@
    'The scores were changed for [quant,_1,problem].'
 => 'Für [quant,_1,Aufgabe wurde,Aufgaben wurden] die Punkte geändert.',
 
-   '[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
-=> '[_1]访问[_2]课程目录[_3], 来查看 [_4] LON-CAPA 的所有课程。',
+   '[_1]Visit the [_2]Course/Community Catalog[_3] to view all [_4] LON-CAPA courses and communities.' # _1: <b>, _2: <a>, _3: </a> </b>, _4: domain
+=> '[_1]Besuchen Sie die [_2]Kurs-/Community-Übersicht[_3], um alle LON-CAPA-Kurse und -Communitys der Domäne [_4] zu betrachten.', # '[_1]访问[_2]课程目录[_3], 来查看 [_4] LON-CAPA 的所有课程。',
 
 
    'If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.'
@@ -15923,14 +15921,14 @@
    'Error occurred saving new values in metadata table in LON-CAPA database!'
 => '保存新值数据表到LON-CAPA数据库中时发生错误!',
 
-   'Your course currently appears in the Course Catalog for this domain.'
-=> '您的课程目前出现在此域的课程目录中。',
+   'Your course/community currently appears in the Course/Community Catalog for this domain.'
+=> 'Ihr Kurs/Ihre Community wird momentan in der Kurs-/Community-Übersicht aufgelistet.', # '您的课程目前出现在此域的课程目录中。',
 
    'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.'
 => '课程可自我编目的基础的研究所代码(例如, fbi_ws20082009_linalg )或可通过域的定义分配类别界定。',
 
-   'Your course does not currently appear in the Course Catalog for this domain.'
-=> '您的课程目前没有出现在此域的课程目录中。',
+   'Your course/community does not currently appear in the Course/Community Catalog for this domain.'
+=> 'Your course/community does not currently appear in the Course/Community Catalog for this domain.', # '您的课程目前没有出现在此域的课程目录中。',
 
    'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.'
 => 'Sie sollten dies ändern, falls Sie Selbsteintragung für diesen Kurs anbieten möchten, da Studenten sonst Schwierigkeiten haben werden, Ihren Kurs zu finden.',

--bisitz1256314488--