[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface loncreateuser.pm /localize/localize de.pm es.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Mon, 26 Oct 2009 15:54:50 -0000
This is a MIME encoded message
--bisitz1256572490
Content-Type: text/plain
bisitz Mon Oct 26 15:54:50 2009 EDT
Modified files:
/loncom/auth lonroles.pm
/loncom/interface loncreateuser.pm
/loncom/localize/localize de.pm es.pm zh.pm
Log:
- Consistent Wording "Course/Community Catalog":
- Updated phrases in translation files de, es, zh corresponding to updates in lonroles.pm 1.234
- Wording/Consistency
- Consistent Wording "Self-Enrollment"
--bisitz1256572490
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20091026155450.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.234 loncom/auth/lonroles.pm:1.235
--- loncom/auth/lonroles.pm:1.234 Sun Oct 25 14:48:43 2009
+++ loncom/auth/lonroles.pm Mon Oct 26 15:54:20 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.234 2009/10/25 14:48:43 raeburn Exp $
+# $Id: lonroles.pm,v 1.235 2009/10/26 15:54:20 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -675,7 +675,8 @@
} else {
$r->print(
'<h3><span class="LC_error">'.
- &mt('You need to choose another user role or enter a specific course or community for this function').'</span></h3>');
+ &mt('You need to choose another user role or enter a specific course or community for this function.').
+ '</span></h3>');
}
}
}
@@ -720,7 +721,7 @@
,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
,'</a></b>',$domdesc)
.'<br />'
- .&mt('If a course or community is [_1]not[_2] in your list of current courses below,'
+ .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
.' you may be able to enroll if self-enrollment is permitted.'
,'<b>','</b>')
.'</p>'
@@ -1170,9 +1171,9 @@
} 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('<h3>'.&mt('Self Enrollment').'</h3>'.
+ $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
'<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
- $r->print(&mt('You can search the course catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
+ $r->print(&mt('You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
&queued_selfenrollment($r);
return;
}
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.316 loncom/interface/loncreateuser.pm:1.317
--- loncom/interface/loncreateuser.pm:1.316 Fri Oct 23 16:14:43 2009
+++ loncom/interface/loncreateuser.pm Mon Oct 26 15:54:34 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.316 2009/10/23 16:14:43 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.317 2009/10/26 15:54:34 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4189,7 +4189,7 @@
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
permission => $permission->{'cusr'},
- linktitle => 'Configure user self enrollment.',
+ linktitle => 'Configure user self-enrollment.',
},
);
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.333 loncom/localize/localize/de.pm:1.334
--- loncom/localize/localize/de.pm:1.333 Fri Oct 23 16:55:18 2009
+++ loncom/localize/localize/de.pm Mon Oct 26 15:54:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.333 2009/10/23 16:55:18 bisitz Exp $
+# $Id: de.pm,v 1.334 2009/10/26 15:54:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2277,8 +2277,8 @@
'Which problems do you wish to set a parameter for?'
=> 'Für welche Aufgaben möchten Sie die Parameter setzen?',
- 'You need to choose another user role or enter a specific course for this function'
-=> 'Für die angeforderte Seite müssen Sie eine andere Benutzerrolle wählen oder einen bestimmten Kurs betreten.',
+ 'You need to choose another user role or enter a specific course or community for this function.'
+=> 'Für die angeforderte Seite müssen Sie eine andere Benutzerrolle wählen oder einen bestimmten Kurs bzw. eine bestimmte Community betreten.',
'a.m.'
=> 'vorm.',
@@ -3722,11 +3722,11 @@
'Current Version'
=> 'Derzeitige Version',
- 'Currently no active roles or courses'
-=> 'Derzeit keine aktiven Rollen oder Kurse',
+ 'Currently no active roles, courses or communities'
+=> 'Derzeit keine aktiven Rollen, Kurse oder Communitys',
- 'Currently no additional roles or courses'
-=> 'Derzeit keine weiteren Rollen oder Kurse',
+ 'Currently no additional roles, courses or communities'
+=> 'Derzeit keine weiteren Rollen, Kurse oder Communitys',
'The following [quant,_1,role,roles] will become active in the future:'
=> 'Die [quant,_1,folgende Rolle wird,folgenden Rollen werden] zukünftig aktiv:',
@@ -7853,11 +7853,11 @@
'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/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.',
+ 'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.' # [_3]: domain
+=> 'Die [_1]Kurs-/Community-Übersicht[_2] enthält Informationen über alle Kurse der Einrichtung [_3], für die LON-CAPA-Kurse sowie Communitys in dieser Domäne eingerichtet wurden.',
- 'You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.'
-=> 'Falls Sie einen Kurs belegen möchten, können Sie die Kursübersicht nach Kursen durchsuchen, die eine Selbsteintragung zulassen.',
+ 'You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.'
+=> 'Falls Sie sich in einen Kurs oder in eine Community eintragen möchten, können Sie die Kurs-/Community-Übersicht nach Kursen und Communitys durchsuchen, die eine Selbsteintragung zulassen.',
'User Authentication'
=> 'Benutzer-Authentifizierung',
@@ -15535,7 +15535,7 @@
'[_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.'
+ 'If a course or community is [_1]not[_2] in your list of current courses and communities 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.',
#SD begin 2008-07-02
@@ -16008,8 +16008,8 @@
'There are no author roles currently in domain: [_1], so there are no Construction spaces for which you can assume a co-author role.'
=> 'In der Domäne [_1] gibt es derzeit keine Autoren-Rollen. Somit können Sie auch keinen Konstruktionsbereich wählen, für den Sie eine Co-Autoren-Rolle annehmen könnten.',
- 'As your session file for the course has expired, you will need to re-select the course.'
-=> 'Da die Sitzungsdatei für diesen Kurs zwischenzeitlich verfallen ist, müssen Sie den Kurs erneut auswählen.',
+ 'As your session file for the course or community has expired, you will need to re-select it.'
+=> 'Da die Sitzungsdatei für diesen Kurs bzw. diese Community zwischenzeitlich verfallen ist, müssen Sie ihn bzw. sie erneut auswählen.',
'[quant,_1,yr]'
=> '[quant,_1,Jahr,Jahre]',
@@ -16221,11 +16221,14 @@
'Automated enrollment manager.'
=> 'Verwaltung der automatischen Kursbelegung.',
+ 'Self-Enrollment'
+=> 'Selbsteintragung',
+
'User Self-Enrollment'
=> 'Benutzer-Selbsteintragung',
- 'Configure user self enrollment.'
-=> 'Die Selbsteintragung in diesen Kurs konfigurieren.',
+ 'Configure user self-enrollment.'
+=> 'Die Selbsteintragung in diesem Kurs konfigurieren.',
'Manage course groups.'
=> 'Kursgruppen verwalten.',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.33 loncom/localize/localize/es.pm:1.34
--- loncom/localize/localize/es.pm:1.33 Fri Oct 23 16:55:18 2009
+++ loncom/localize/localize/es.pm Mon Oct 26 15:54:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Spanish Localization Lexicon
#
-# $Id: es.pm,v 1.33 2009/10/23 16:55:18 bisitz Exp $
+# $Id: es.pm,v 1.34 2009/10/26 15:54:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2294,8 +2294,8 @@
#=> '¿Para que problemas quiere configurar algún parámetro?',
=> '¿Para que problemas desea establecer algún parámetro?',
- 'You need to choose another user role or enter a specific course for this function'
-=> 'Necesita elegir otra función o introducir un curso específico para esta función',
+'You need to choose another user role or enter a specific course or community for this function.'
+=> 'You need to choose another user role or enter a specific course or community for this function.', # 'Necesita elegir otra función o introducir un curso específico para esta función',
'a.m.'
=> 'a.m.',
@@ -3777,11 +3777,11 @@
'Current Version'
=> 'Versión Actual',
- 'Currently no active roles or courses'
-=> 'Actualmente no hay funciones activas o cursos',
+ 'Currently no active roles, courses or communities'
+=> 'Currently no active roles, courses or communities', # 'Actualmente no hay funciones activas o cursos',
- 'Currently no additional roles or courses'
-=> 'Actualmente no hay funciones adicionales o cursos',
+ 'Currently no additional roles, courses or communities'
+=> 'Currently no additional roles, courses or communities', # 'Actualmente no hay funciones adicionales o cursos',
'The following [quant,_1,role,roles] will become active in the future:'
=> 'Los siguientes [quant,_1,función,funciones] se activarán en el futuro:',
@@ -7954,11 +7954,11 @@
'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/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.',
+ 'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.' # [_3]: domain
+=> 'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the 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.'
-=> 'Puede buscar en el catalogo de cursos por cursos que permiten auto-matricularse, si quisiera matricular en un curso.',
+ 'You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.'
+=> 'You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.', # 'Puede buscar en el catalogo de cursos por cursos que permiten auto-matricularse, si quisiera matricular en un curso.',
'User Authentication'
=> 'Autenticación de Usuario',
@@ -15648,8 +15648,8 @@
'[_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.',
+ 'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
+=> 'If a course or community is [_1]not[_2] in your list of current courses and communities 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.',
#SD begin 2008-07-02
'When'
@@ -16133,8 +16133,8 @@
'There are no author roles currently in domain: [_1], so there are no Construction spaces for which you can assume a co-author role.'
=> 'No hay funciones de autor actualmente en dominio: [_1], por tanto no hay zonas de construcción para que pueda asumir una función de co-autor.',
- 'As your session file for the course has expired, you will need to re-select the course.'
-=> 'Como su archivo de sesión para el curso ha expirado, necesitará re-seleccionar el curso.',
+ 'As your session file for the course or community has expired, you will need to re-select it.'
+=> 'As your session file for the course or community has expired, you will need to re-select it.', # 'Como su archivo de sesión para el curso ha expirado, necesitará re-seleccionar el curso.',
'[quant,_1,yr]'
=> '[quant,_1,Año,Años]',
@@ -16351,10 +16351,13 @@
'Automated enrollment manager.'
=> 'Control de inscripción Automatizada.',
+ 'Self-Enrollment'
+=> 'Auto Inscripción',
+
'User Self-Enrollment'
=> 'Auto inscripción de Usuario',
- 'Configure user self enrollment.'
+ 'Configure user self-enrollment.'
=> 'Configurar auto inscripción de usuario.',
'Manage course groups.'
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.82 loncom/localize/localize/zh.pm:1.83
--- loncom/localize/localize/zh.pm:1.82 Fri Oct 23 16:55:18 2009
+++ loncom/localize/localize/zh.pm Mon Oct 26 15:54:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.82 2009/10/23 16:55:18 bisitz Exp $
+# $Id: zh.pm,v 1.83 2009/10/26 15:54:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2289,8 +2289,8 @@
'Which problems do you wish to set a parameter for?'
=> 'Für welche Aufgaben möchten Sie die Parameter setzen?',
- 'You need to choose another user role or enter a specific course for this function'
-=> '对于此功能您需要选择另一个用户角色，或者输入特定的课程。',
+ 'You need to choose another user role or enter a specific course or community for this function.'
+=> 'You need to choose another user role or enter a specific course or community for this function.', # '对于此功能您需要选择另一个用户角色，或者输入特定的课程。',
'a.m.'
=> '上午',
@@ -3737,11 +3737,11 @@
'Current Version'
=> '当前版本',
- 'Currently no active roles or courses'
-=> '目前没有任何活动的角色或课程',
+ 'Currently no active roles, courses or communities'
+=> 'Currently no active roles, courses or communities', # '目前没有任何活动的角色或课程',
- 'Currently no additional roles or courses'
-=> '目前还没有更多的角色或课程',
+ 'Currently no additional roles, courses or communities'
+=> 'Currently no additional roles, courses or communities', # '目前还没有更多的角色或课程',
'The following [quant,_1,role,roles] will become active in the future:'
=> 'Die [quant,_1,folgende Rolle wird,folgenden Rollen werden] zukünftig aktiv:',
@@ -7874,11 +7874,11 @@
'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/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.',
+ 'The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.' # [_3]: domain
+=> 'Die [_1]Kurs-/Community-Übersicht[_2] enthält Informationen über alle Kurse der Einrichtung [_3], für die LON-CAPA-Kurse sowie Communitys in dieser Domäne eingerichtet wurden.',
- 'You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.'
-=> 'Falls Sie einen Kurs belegen möchten, können Sie die Kursübersicht nach Kursen durchsuchen, die eine Selbsteintragung zulassen.',
+ 'You can search the Course/Community Catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.'
+=> 'Falls Sie sich in einen Kurs oder in eine Community eintragen möchten, können Sie die Kurs-/Community-Übersicht nach Kursen und Communitys durchsuchen, die eine Selbsteintragung zulassen.',
'User Authentication'
=> 'Benutzer-Authentifizierung',
@@ -15582,9 +15582,8 @@
'[_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.'
-=> '如果一个课程在下面列出您目前的课程中[_1]没有[_2]显示，你可以注册，如果自我注册是允许的。',
+ 'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.'
+=> 'If a course or community is [_1]not[_2] in your list of current courses and communities below, you may be able to enroll if self-enrollment is permitted.', # '如果一个课程在下面列出您目前的课程中[_1]没有[_2]显示，你可以注册，如果自我注册是允许的。',
#SD begin 2008-07-02
'When'
@@ -16056,8 +16055,8 @@
'There are no author roles currently in domain: [_1], so there are no Construction spaces for which you can assume a co-author role.'
=> 'In der Domäne [_1] gibt es derzeit keine Autoren-Rollen. Somit können Sie auch keinen Konstruktionsbereich wählen, für den Sie eine Co-Autoren-Rolle annehmen könnten.',
- 'As your session file for the course has expired, you will need to re-select the course.'
-=> '当您的课程已过期，您将需要重新选择课程。',
+ 'As your session file for the course or community has expired, you will need to re-select it.'
+=> 'As your session file for the course or community has expired, you will need to re-select it.', # '当您的课程已过期，您将需要重新选择课程。',
'[quant,_1,yr]'
=> '[quant,_1,Jahr,Jahre]',
@@ -16274,10 +16273,13 @@
'Automated enrollment manager.'
=> '管理自助注册',
+ 'Self-Enrollment'
+=> 'Selbsteintragung',
+
'User Self-Enrollment'
=> '用户自助注册',
- 'Configure user self enrollment.'
+ 'Configure user self-enrollment.'
=> '配置用户自助注册。',
'Manage course groups.'
--bisitz1256572490--