[LON-CAPA-cvs] cvs: loncom / Lond.pm /enrollment Enrollment.pm /homework inputtags.pm /html/adm/helper newslot.helper /interface loncoursequeueadmin.pm lonmsg.pm lonpreferences.pm lonprintout.pm /localize/localize de.pm
bisitz
bisitz at source.lon-capa.org
Wed Jul 24 14:21:52 EDT 2013
bisitz Wed Jul 24 18:21:52 2013 EDT
Modified files:
/loncom/localize/localize de.pm
/loncom/interface lonpreferences.pm lonmsg.pm
loncoursequeueadmin.pm lonprintout.pm
/loncom/homework inputtags.pm
/loncom/html/adm/helper newslot.helper
/loncom/enrollment Enrollment.pm
/loncom Lond.pm
Log:
Corrected wording typos
Updated related phrases in German translation file
-------------- next part --------------
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.516 loncom/localize/localize/de.pm:1.517
--- loncom/localize/localize/de.pm:1.516 Wed Jul 24 15:12:29 2013
+++ loncom/localize/localize/de.pm Wed Jul 24 18:21:36 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.516 2013/07/24 15:12:29 kruse Exp $
+# $Id: de.pm,v 1.517 2013/07/24 18:21:36 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4682,8 +4682,8 @@
'Choose file(s) to submit'
=> 'Auswahl der Datei(en), die eingereicht werden soll(en)',
- 'Combined size of all files not to exceed: [_1] MB[_2].' # _2 unused
-=> 'GesamtgröÃe aller Dateien darf nicht gröÃer als [_1] MB sein.',
+ 'Combined size of all files not to exceed: [_1] MB.'
+=> 'Die GesamtgröÃe aller Dateien darf [_1] MB nicht überschreiten.',
'Submit a file: (only one file per submission)'
=> 'Datei einreichen: (nur eine Datei pro Einreichung)',
@@ -12270,11 +12270,11 @@
'You received a message from [_1] in LON-CAPA.'
=> 'Sie haben eine Nachricht von [_1] in LON-CAPA erhalten.',
- "'New' critical message from "
-=> "Neue wichtige Nachricht von ",
+ "'New' critical message from [_1]"
+=> "Neue wichtige Nachricht von [_1]",
- "'New' message from "
-=> "Neue Nachricht von ",
+ "'New' message from [_1]"
+=> "Neue Nachricht von [_1]",
'Refers to'
=> 'Bezieht sich auf',
@@ -12718,7 +12718,7 @@
'Found [_1] registered and [_2] unregistered clickers.'
=> '[_1] registrierte und [_2] nicht registrierte Clicker gefunden.',
- 'Found no correct answers answers for grading!'
+ 'Found no correct answers for grading!'
=> 'Keine korrekten Antworten zur Bewertung gefunden!',
'Found [_1] entries for grading!'
@@ -14137,7 +14137,7 @@
'In discussions: all posts will be displayed.'
=> 'In Diskussionen: Es werden alle Beiträge angezeigt.',
- 'In discussions: new posts will be cease to be identified as "NEW" after display.'
+ 'In discussions: new posts will cease to be identified as "NEW" after display.'
=> 'In Diskussionen: Neue Beiträge werden nach dem Anzeigen nicht mehr als "NEU" angezeigt.',
'In discussions: posts will be identified as "NEW" until marked as not "NEW".'
@@ -17833,7 +17833,7 @@
'Time Period'
=> 'Zeitraum',
- 'Rsource is undefined.'
+ 'Resource is undefined.'
=> 'Ressource ist nicht definiert.',
'Plot Graph'
@@ -20618,9 +20618,6 @@
'The change will become active on the next page.'
=> 'Die Ãnderung wird auf der nächsten Seite wirksam.',
- 'Combined size of files not to exceed: [_1] MB[_2].' # _2 unused
-=> 'Die GesamtgröÃe der Dateien darf [_1] MB nicht überschreiten.',
-
'Contacting course home server'
=> 'Nehme Verbindung mit dem Heimatserver des Kurses auf',
@@ -20696,7 +20693,7 @@
'Specify a bubblesheet data file to upload.'
=> 'Geben Sie eine Bubblesheet-Datendatei an, die hochgeladen werden soll.',
- 'SelectProblem(s) to print'
+ 'Select Problem(s) to print'
=> 'Auswahl von Aufgaben, die gedruckt werden sollen',
'Sequence to grade:'
@@ -21389,7 +21386,7 @@
'This username has been dropped from the institutional classlist, but the same student/employee ID is used for user: [_1] who still appears in the institutional classlist.'
=> 'Diese Benutzerkennung wurde aus der institutionellen Kursteilnehmerliste ausgeschlossen, die gleiche Studierenden-/Mitarbeiter-ID wird jedoch für den Benutzer [_1] verwendet, der weiterhin in der institutionellen Kursteilnehmerliste ist.',
- 'You have been enrolled in the LON-CAPA system at your institution, because you are a registered student in a class which is using the LON-CAPA couse management and online homework system.'
+ 'You have been enrolled in the LON-CAPA system at your institution, because you are a registered student in a class which is using the LON-CAPA course management and online homework system.'
=> 'Sie wurden in das LON-CAPA-System in Ihrer Institution eingetragen, weil Sie ein/e registrierte/r Student/in in einem Kurs sind, der das LON-CAPA-Kursverwaltungs- und Online-Ãbungssystem verwendet.',
'A non-zero score can be assigned to the student during bubblesheet grading by selecting a bubble in at least one line.'
@@ -21621,12 +21618,12 @@
=> 'Beim Speichern des geänderten Kursantrags für [_1], eingereicht durch [_2], ist ein Fehler aufgetreten.',
'An error occurred when removing the request for [_1] submitted by [_2] from the pending queue.'
-=> 'Beim Entfernen des Antrags für [_1], eingereicht durch [_2], ist ein Fehler aufgetreten.',
+=> 'Beim Entfernen des Antrags aus der Warteschlange ausstehender Punkte für [_1], eingereicht durch [_2], ist ein Fehler aufgetreten.',
'Any course/community requests which are successfully validated will be created immediately.'
=> 'Alle Kurs-/Community-Anträge, die erfolgreich validiert wurden, werden sofort erstellt.',
- 'For the following course/community requests an error occurred when removing requests for the following from the pending queue:'
+ 'For the following course/community requests an error occurred when removing requests from the pending queue:'
=> 'Für die folgenden Kurs-/Community-Anträge ist beim Entfernen aus der Warteschlange ausstehender Punkte ein Fehler aufgetreten:',
"For the following course/community requests an error occurred when updating the requestor's own requests record:"
@@ -22491,7 +22488,7 @@
'Created Slot'
=> 'Slot wurde erstellt',
- 'Creating/Modfying Slot'
+ 'Creating/Modifying Slot'
=> 'Slot wird erstellt/geändert',
'DISCUSSIONS'
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.208 loncom/interface/lonpreferences.pm:1.209
--- loncom/interface/lonpreferences.pm:1.208 Mon Jul 22 18:06:51 2013
+++ loncom/interface/lonpreferences.pm Wed Jul 24 18:21:39 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.208 2013/07/22 18:06:51 bisitz Exp $
+# $Id: lonpreferences.pm,v 1.209 2013/07/24 18:21:39 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1819,7 +1819,7 @@
if (defined($env{'form.discmark'}) ) {
my $newmark = $env{'form.newmark'};
if ($newmark eq 'ondisp') {
- $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will be cease to be identified as "NEW" after display.')).'<br />';
+ $message.=&Apache::lonhtmlcommon::confirm_success(&mt('In discussions: new posts will cease to be identified as "NEW" after display.')).'<br />';
&Apache::lonnet::put('environment',{'discmarkread' => $newmark});
&Apache::lonnet::appenv({'environment.discmarkread' => $newmark});
} else {
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.234 loncom/interface/lonmsg.pm:1.235
--- loncom/interface/lonmsg.pm:1.234 Mon May 21 18:35:35 2012
+++ loncom/interface/lonmsg.pm Wed Jul 24 18:21:39 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging
#
-# $Id: lonmsg.pm,v 1.234 2012/05/21 18:35:35 bisitz Exp $
+# $Id: lonmsg.pm,v 1.235 2013/07/24 18:21:39 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -526,7 +526,7 @@
to access the full message.',$url);
my %userenv = &Apache::lonnet::get('environment',['notifywithhtml'],$toudom,$touname);
- my $subject = &mt_user($user_lh,"'New' $critical message from ").$sender;
+ my $subject = &mt_user($user_lh,"'New'$critical message from [_1]",$sender);
unless ($subj eq '') {
$subject = $subj;
}
Index: loncom/interface/loncoursequeueadmin.pm
diff -u loncom/interface/loncoursequeueadmin.pm:1.35 loncom/interface/loncoursequeueadmin.pm:1.36
--- loncom/interface/loncoursequeueadmin.pm:1.35 Fri Mar 1 04:48:59 2013
+++ loncom/interface/loncoursequeueadmin.pm Wed Jul 24 18:21:39 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.35 2013/03/01 04:48:59 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.36 2013/07/24 18:21:39 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1256,7 +1256,7 @@
}
$output .= '</ul></p>';
} else {
- $output .= '<p>'.&mt("For the following course/community requests an error occurred when removing requests for the following from the pending queue:").'<ul>';
+ $output .= '<p>'.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'<ul>';
foreach my $cnum (@warn_dels) {
my $showcourse;
if (ref($requesthash{$cnum.'_'.$queue})) {
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.634 loncom/interface/lonprintout.pm:1.635
--- loncom/interface/lonprintout.pm:1.634 Mon Jul 22 18:06:51 2013
+++ loncom/interface/lonprintout.pm Wed Jul 24 18:21:39 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Printout
#
-# $Id: lonprintout.pm,v 1.634 2013/07/22 18:06:51 bisitz Exp $
+# $Id: lonprintout.pm,v 1.635 2013/07/24 18:21:39 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4306,7 +4306,7 @@
ALL_PROBLEMS
&Apache::lonxml::xmlparse($r, 'helper',
&generate_resource_chooser('ALL_PROBLEMS',
- 'SelectProblem(s) to print',
+ 'Select Problem(s) to print',
'multichoice="1" suppressEmptySequences="0" addstatus="1" closeallpages="1"',
'RESOURCES',
'PAGESIZE',
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.318 loncom/homework/inputtags.pm:1.319
--- loncom/homework/inputtags.pm:1.318 Fri Jun 7 20:31:50 2013
+++ loncom/homework/inputtags.pm Wed Jul 24 18:21:42 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.318 2013/06/07 20:31:50 raeburn Exp $
+# $Id: inputtags.pm,v 1.319 2013/07/24 18:21:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -647,7 +647,7 @@
&mt('Allowed filetypes: [_1]','<b>'.$uploadedfiletypes.'</b>').'<br />';
}
if ($maxfilesize) {
- $constraints .= &mt('Combined size of all files not to exceed: [_1] MB[_2].',
+ $constraints .= &mt('Combined size of all files not to exceed: [_1] MB.',
'<b>'.$maxfilesize.'</b>').'<br />';
}
if ($constraints) {
Index: loncom/html/adm/helper/newslot.helper
diff -u loncom/html/adm/helper/newslot.helper:1.29 loncom/html/adm/helper/newslot.helper:1.30
--- loncom/html/adm/helper/newslot.helper:1.29 Tue Dec 20 22:47:56 2011
+++ loncom/html/adm/helper/newslot.helper Wed Jul 24 18:21:46 2013
@@ -314,7 +314,7 @@
</state>
- <state name="FINISH" title="Creating/Modfying Slot">
+ <state name="FINISH" title="Creating/Modifying Slot">
<message> Created Slot </message>
<final>
<finalcode>
Index: loncom/enrollment/Enrollment.pm
diff -u loncom/enrollment/Enrollment.pm:1.44 loncom/enrollment/Enrollment.pm:1.45
--- loncom/enrollment/Enrollment.pm:1.44 Fri Mar 1 05:20:01 2013
+++ loncom/enrollment/Enrollment.pm Wed Jul 24 18:21:49 2013
@@ -1,5 +1,5 @@
# Automated Enrollment manager
-# $Id: Enrollment.pm,v 1.44 2013/03/01 05:20:01 raeburn Exp $
+# $Id: Enrollment.pm,v 1.45 2013/07/24 18:21:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -613,7 +613,11 @@
if ($start > 0) {
$access_start = localtime($start)
}
- $body = &mt('You have been enrolled in the LON-CAPA system at your institution, because you are a registered student in a class which is using the LON-CAPA couse management and online homework system.')."\n\n".&mt("You should log-in to the system using the following credentials:\nusername: [_1]\npassword: [_2]",$uname,$authparam)."\n\n".&mt('The URL you should use to access the LON-CAPA system at your institution is: ').$portalurl."\n\n".&mt('When you log-in you will be able to access the LON-CAPA course for [_1] - [_2] starting [_3].',$$courseinfo{'description'},$$courseinfo{'inst_code'},$access_start)."\n";
+ $body =
+ &mt('You have been enrolled in the LON-CAPA system at your institution, because you are a registered student in a class which is using the LON-CAPA course management and online homework system.')."\n\n"
+ .&mt("You should log-in to the system using the following credentials:\nusername: [_1]\npassword: [_2]",$uname,$authparam)."\n\n"
+ .&mt('The URL you should use to access the LON-CAPA system at your institution is: ').$portalurl."\n\n"
+ .&mt('When you log-in you will be able to access the LON-CAPA course for [_1] - [_2] starting [_3].',$$courseinfo{'description'},$$courseinfo{'inst_code'},$access_start)."\n";
}
&Apache::lonmsg::sendemail($emailaddr,$subject,$body);
}
Index: loncom/Lond.pm
diff -u loncom/Lond.pm:1.4 loncom/Lond.pm:1.5
--- loncom/Lond.pm:1.4 Tue Jul 17 14:49:39 2012
+++ loncom/Lond.pm Wed Jul 24 18:21:52 2013
@@ -1,6 +1,6 @@
# The LearningOnline Network
#
-# $Id: Lond.pm,v 1.4 2012/07/17 14:49:39 droeschl Exp $
+# $Id: Lond.pm,v 1.5 2013/07/24 18:21:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -776,7 +776,7 @@
Side effects: response is written to $client.
-=item dump_couse_id_handler
+=item dump_course_id_handler
#TODO copy from lond
More information about the LON-CAPA-cvs
mailing list