[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Prefs_Messages.tex Prefs_Notification.tex /html/adm/helper course.initialization.helper /interface lonaboutme.pm lonerrorhandler.pm resetpw.pm /localize/localize de.pm /publisher lonpubdir.pm
schafran
schafran@source.lon-capa.org
Thu, 12 Feb 2009 21:16:00 -0000
This is a MIME encoded message
--schafran1234473360
Content-Type: text/plain
schafran Thu Feb 12 21:16:00 2009 EDT
Modified files:
/loncom/interface lonerrorhandler.pm resetpw.pm lonaboutme.pm
/loncom/localize/localize de.pm
/loncom/html/adm/helper course.initialization.helper
/loncom/publisher lonpubdir.pm
/loncom/html/adm/help/tex Prefs_Messages.tex Prefs_Notification.tex
Log:
consistent wording, email -> e-mail, catalog information -> metadata, e-mail vs. message
--schafran1234473360
Content-Type: text/plain
Content-Disposition: attachment; filename="schafran-20090212211600.txt"
Index: loncom/interface/lonerrorhandler.pm
diff -u loncom/interface/lonerrorhandler.pm:1.22 loncom/interface/lonerrorhandler.pm:1.23
--- loncom/interface/lonerrorhandler.pm:1.22 Sun Jan 4 19:49:19 2009
+++ loncom/interface/lonerrorhandler.pm Thu Feb 12 21:15:47 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Internal Server Error Handler
#
-# $Id: lonerrorhandler.pm,v 1.22 2009/01/04 19:49:19 raeburn Exp $
+# $Id: lonerrorhandler.pm,v 1.23 2009/02/12 21:15:47 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -138,7 +138,7 @@
.'<p>'.&mt('Please help us to find out what.').'</p>'
.'<p>'.&mt('Please take a moment to fill out the form below.').' '
.&mt('Your information, together with internal debugging information, '
- .'will be emailed to the system and server administrators.')
+ .'will be e-mailed to the system and server administrators.')
.'</p>
<form action="/adm/errorhandler" method="post">
<h3>'.&mt('Please describe what you did just before this screen came up').'</h3>
Index: loncom/interface/resetpw.pm
diff -u loncom/interface/resetpw.pm:1.12 loncom/interface/resetpw.pm:1.13
--- loncom/interface/resetpw.pm:1.12 Sat Dec 6 20:35:15 2008
+++ loncom/interface/resetpw.pm Thu Feb 12 21:15:47 2009
@@ -171,7 +171,7 @@
my $result = &send_mail($domdesc,$email,$mailmsg,$contact_name,
$contact_email);
if ($result eq 'ok') {
- $msg .= &mt("An e-mail message sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");
+ $msg .= &mt("An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.");
} else {
$msg .= &mt("An error occurred when sending a message to the e-mail address associated with your LON-CAPA account. Please contact the [_1] ([_2]) for assistance.",$contact_name,$contact_email);
}
@@ -264,7 +264,7 @@
$msg .= &mt('A problem occurred when attempting to reset the password for your account. Please contact the [_1] - (<a href="mailto:[_2]">[_2]</a>) for assistance.',$contact_name,$contact_email);
}
} else {
- $r->print(&mt('The token included in an email sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br /><br />');
+ $r->print(&mt('The token included in an e-mail sent to you [_1] has been verified, so you may now proceed to reset the password for your LON-CAPA account.',$reqtime).'<br /><br />');
$r->print(&mt('Please enter the username and domain of the LON-CAPA account, and the associated e-mail address, for which you are setting a password. The new password must contain at least 7 characters.').' '.&mt('Your new password will be sent to the LON-CAPA server in an encrypted form.').'<br />');
&Apache::lonpreferences::passwordchanger($r,'','reset_by_email',$token);
}
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.91 loncom/interface/lonaboutme.pm:1.92
--- loncom/interface/lonaboutme.pm:1.91 Thu Feb 5 14:56:49 2009
+++ loncom/interface/lonaboutme.pm Thu Feb 12 21:15:47 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# "About Me" Personal Information
#
-# $Id: lonaboutme.pm,v 1.91 2009/02/05 14:56:49 neumanie Exp $
+# $Id: lonaboutme.pm,v 1.92 2009/02/12 21:15:47 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -771,7 +771,7 @@
' '.$showname.'</a>';
$output.='</td><td>';
if ($have_meta) {
- $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Catalog Information').'" src="'.
+ $output.= '<a href="'.$url.'.meta"><img alt="'.&mt('Metadata').'" src="'.
&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').
'" class="LC_icon" /></a>';
}
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.214 loncom/localize/localize/de.pm:1.215
--- loncom/localize/localize/de.pm:1.214 Wed Feb 11 18:42:43 2009
+++ loncom/localize/localize/de.pm Thu Feb 12 21:15:50 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.214 2009/02/11 18:42:43 bisitz Exp $
+# $Id: de.pm,v 1.215 2009/02/12 21:15:50 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1083,9 +1083,6 @@
'Browse Resources'
=> 'Ressourcen durchsehen',
- 'Catalog Information'
-=> 'Katalogisierungsdaten',
-
'Collapse Remote Control'
=> 'Fernbedienung deaktivieren',
@@ -1374,9 +1371,6 @@
'Error Messages'
=> 'Fehlermeldungen',
- 'Save Catalog Information'
-=> 'Katalogisierungsdaten speichern',
-
'Update Display'
=> 'Neu anzeigen',
@@ -1461,8 +1455,8 @@
'Edit Content of a Map'
=> 'Inhalt der Inhaltszusammenstellung bearbeiten',
- 'Edit Directory Catalog Information'
-=> 'Verzeichnis der Katalogisierungsdaten bearbeiten',
+ 'Edit Directory Metadata'
+=> 'Metadaten des Verzeichnisses bearbeiten',
'Evaluate Resource'
=> 'Ressource evaluieren',
@@ -4970,7 +4964,7 @@
'Course default for all problems'
=> 'Voreinstellungen des Kurses für alle Aufgaben',
- 'Course members can provide feedback about the course. You can choose who will receive the feedback, such as a different instructor or a TA. Please enter their LON-CAPA address below, in the form user:domain, where "user" and "domain" are both the LON-CAPA username and LON-CAPA domain, not an email address.'
+ 'Course members can provide feedback about the course. You can choose who will receive the feedback, such as a different instructor or a TA. Please enter their LON-CAPA address below, in the form user:domain, where "user" and "domain" are both the LON-CAPA username and LON-CAPA domain, not an e-mail address.'
=> 'Kursmitglieder können Feedback zum Kurs geben. Sie können hier auswählen, wer das Feedback empfangen soll, wie z.B. ein anderer Dozent oder Tutor. Bitte geben Sie deren LON-CAPA-Benutzer unten in der Form benutzer:domäne ein, wobei "benutzer" und "domäne" LON-CAPA-Benutzerkennung und LON-CAPA-Domäne sind. Verwenden Sie keine E-Mail-Adresse!',
'Courses'
@@ -5886,8 +5880,8 @@
'Display Preference'
=> 'Darstellungs-Präferenz',
- 'Edit catalog information'
-=> 'Katalogisierungsdaten editieren',
+ 'Edit Metadata'
+=> 'Metadaten editieren',
'Grade 1'
=> '1. Klasse',
@@ -11281,9 +11275,6 @@
'Modify page'
=> 'Seite ändern', # .n.t.
- 'email'
-=> 'E-Mail',
-
'communication'
=> 'Kommunikation',
@@ -11949,7 +11940,7 @@
'Please take a moment to fill out the form below.'
=> 'Bitte nehmen Sie sich einen Moment Zeit, um das folgende Formular auszufüllen.',
- 'Your information, together with internal debugging information, will be emailed to the system and server administrators.'
+ 'Your information, together with internal debugging information, will be e-mailed to the system and server administrators.'
=> 'Ihre Informationen, zusammen mit internen Debugging-Daten, werden an die System- und Server-Administratoren per E-Mail weitergeleitet.',
'Send Information'
@@ -14570,9 +14561,6 @@
'Broadcast e-mail to Domain'
=> 'Broadcast-E-Mail an Domäne',
- 'Send a new e-mail message to selected users from this domain'
-=> 'Senden einer neuen E-Mail an ausgewählte Benutzer dieser Domäne',
-
'Send a new e-mail to selected users from this domain'
=> 'Senden einer neuen E-Mail an ausgewählte Benutzer dieser Domäne',
@@ -15632,6 +15620,10 @@
'The link included in the message will be valid for the next [_1]two[_2] hours.'
=> 'Der in die Nachricht eingebundene Link ist für die nächsten [_1]zwei Stunden gültig[_2].',
+ 'An e-mail sent to the e-mail address associated with your LON-CAPA account includes the web address for the link you should use to complete the reset process.<br /><br />The link included in the message will be valid for the next <b>two</b> hours.'
+=> 'Die E-Mail, die an Ihre mit dem LON-CAPA-Account verknüpfte E-Mail-Adresse geschickt wurde, enthält den Link, den Sie zum Abschließen des Vorgangs benötigen.<br /><br />Der Link wird für die nächsten <b>zwei<b> Stunden gültig sein.',
+
+
'An error occurred when sending a message to the e-mail address you provided.'
=> 'Beim Verschicken Ihrer Nachricht an die von Ihnen angegebene E-Mail-Adresse ist ein Fehler aufgetreten.',
Index: loncom/html/adm/helper/course.initialization.helper
diff -u loncom/html/adm/helper/course.initialization.helper:1.22 loncom/html/adm/helper/course.initialization.helper:1.23
--- loncom/html/adm/helper/course.initialization.helper:1.22 Mon Feb 9 13:41:04 2009
+++ loncom/html/adm/helper/course.initialization.helper Thu Feb 12 21:15:53 2009
@@ -197,7 +197,7 @@
who will receive the feedback, such as a different instructor or a
TA. Please enter their LON-CAPA address below, in the
form <b>user:domain</b>, where "user" and "domain"
- are both the LON-CAPA username and LON-CAPA domain, not an email
+ are both the LON-CAPA username and LON-CAPA domain, not an e-mail
address.</p>
</message>
<eval>return &mt('<p>Your current LON-CAPA domain is "<b>[_1]</b>".</p>',"$helper->{DATA}->{DOM}");
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.118 loncom/publisher/lonpubdir.pm:1.119
--- loncom/publisher/lonpubdir.pm:1.118 Fri Dec 19 03:54:19 2008
+++ loncom/publisher/lonpubdir.pm Thu Feb 12 21:15:56 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.118 2008/12/19 03:54:19 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.119 2009/02/12 21:15:56 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -456,7 +456,7 @@
'<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
'<input type="button" onclick="window.location='."'/~".
$uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+&mt('Edit Directory Metadata').'" /></td></tr></table></form>');
}
sub resourceactions {
Index: loncom/html/adm/help/tex/Prefs_Messages.tex
diff -u loncom/html/adm/help/tex/Prefs_Messages.tex:1.3 loncom/html/adm/help/tex/Prefs_Messages.tex:1.4
--- loncom/html/adm/help/tex/Prefs_Messages.tex:1.3 Tue Jan 22 07:16:29 2008
+++ loncom/html/adm/help/tex/Prefs_Messages.tex Thu Feb 12 21:15:59 2009
@@ -16,7 +16,7 @@
\end{enumerate}
-\textbf{Receive an e-mail message notifying you when a LON-CAPA message is sent to you}
+\textbf{Receive an e-mail notifying you when a LON-CAPA message is sent to you}
LON-CAPA can also send new message notifications to your conventional
Index: loncom/html/adm/help/tex/Prefs_Notification.tex
diff -u loncom/html/adm/help/tex/Prefs_Notification.tex:1.2 loncom/html/adm/help/tex/Prefs_Notification.tex:1.3
--- loncom/html/adm/help/tex/Prefs_Notification.tex:1.2 Tue Jan 22 07:19:25 2008
+++ loncom/html/adm/help/tex/Prefs_Notification.tex Thu Feb 12 21:15:59 2009
@@ -1,5 +1,5 @@
\label{Prefs_Notification}
-\textbf{Receive an e-mail message notifying you when a LON-CAPA message is sent to you}
+\textbf{Receive an e-mail notifying you when a LON-CAPA message is sent to you}
LON-CAPA can send new message notifications to your conventional
email accounts. You can choose the specific types of messages
--schafran1234473360--