[LON-CAPA-cvs] cvs: loncom /interface domainprefs.pm longroup.pm lonmeta.pm lonparmset.pm lonsupportreq.pm lonuserutils.pm /localize/localize de.pm
schafran
schafran@source.lon-capa.org
Tue, 27 Jan 2009 15:59:31 -0000
This is a MIME encoded message
--schafran1233071971
Content-Type: text/plain
schafran Tue Jan 27 15:59:31 2009 EDT
Modified files:
/loncom/localize/localize de.pm
/loncom/interface lonmeta.pm domainprefs.pm lonsupportreq.pm
lonuserutils.pm lonparmset.pm longroup.pm
Log:
consistent wording of e-mail, message, metadata
--schafran1233071971
Content-Type: text/plain
Content-Disposition: attachment; filename="schafran-20090127155931.txt"
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.191 loncom/localize/localize/de.pm:1.192
--- loncom/localize/localize/de.pm:1.191 Tue Jan 20 17:46:39 2009
+++ loncom/localize/localize/de.pm Tue Jan 27 15:59:26 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.191 2009/01/20 17:46:39 bisitz Exp $
+# $Id: de.pm,v 1.192 2009/01/27 15:59:26 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1025,7 +1025,7 @@
'Search the database of published resources and accessible portfolio files'
=> 'Datenbank veröffentlichter Ressourcen und Portfolio-Dateien',
- 'Send broadcast and receipt-required email'
+ 'Send broadcast and receipt-required e-mail'
=> 'Sende Broadcast-E-Mail mit Empfangsbestätigung',
'Show Problem Completeness'
@@ -1449,8 +1449,8 @@
'Distribute Messages from Uploaded File to Course'
=> 'Aus Datei Nachrichten erzeugen', # 'Verteile Nachrichten der hochgeladenen Datei an den Kurs',
- 'Edit Catalog Information'
-=> 'Katalogisierungsdaten bearbeiten',
+ 'Edit Metadata'
+=> 'Metadaten bearbeiten',
'Edit Content of a Map'
=> 'Inhalt der Inhaltszusammenstellung bearbeiten',
@@ -1683,9 +1683,6 @@
'Discard Selected'
=> 'Verwerfe ausgewählte',
- 'EMail and Messages'
-=> 'E-Mail und Nachrichten',
-
'Edit this resource'
=> 'Bearbeiten', # long version: 'Bearbeite diese Ressource',
@@ -2187,7 +2184,7 @@
'Select Parameter Level'
=> 'Parameter-Ebene',
- 'Send internal email'
+ 'Send internal e-mail'
=> 'Verschicke interne Nachrichten',
'Set Course Environment Parameters'
@@ -8198,9 +8195,6 @@
'User Data for'
=> 'Benutzerdaten von',
- 'Email Address'
-=> 'E-Mail-Adresse',
-
'Enroll Student'
=> 'Studenten Kurs belegen lassen',
@@ -9210,9 +9204,6 @@
'Warning: It can take up to 1 hour for rights changes to fully propagate.'
=> 'Achtung: Es kann bis zu einer Stunde dauern, bis alle Rechte-Änderungen vollständig wirken.',
- 'email address'
-=> 'E-Mail-Adresse',
-
'Updated'
=> 'Geändert',
@@ -11046,9 +11037,6 @@
'discussion'
=> 'Diskussion',
- 'email files'
-=> 'E-Mail-Dateien',
-
'homepage'
=> 'Homepage',
@@ -11277,8 +11265,8 @@
'Active?'
=> 'Aktiv?',
- 'Send group mail'
-=> 'Gruppen-E-Mail senden', # .n.t.
+ 'Send group message'
+=> 'Gruppennachricht senden', # .n.t. group ist eine variable
'Create boards'
=> 'Erstellen von Foren', # n.t.
@@ -11310,7 +11298,7 @@
'email'
=> 'E-Mail',
- 'Broadcast mail'
+ 'Broadcast message'
=> 'Broadcast-Nachricht',
'files'
@@ -13284,11 +13272,11 @@
'Delete [_1]?'
=> '[_1] löschen?',
- 'Edit Portfolio File Catalog Information'
-=> 'Katalogisierungsdaten der Portfoliodateien',
+ 'Edit Portfolio File Metadata'
+=> 'Metadaten der Portfoliodateien bearbeiten',
- 'Edit Group Portfolio File Catalog Information'
-=> 'Katalogisierungsdaten der Gruppen-Portfoliodateien',
+ 'Edit Group Portfolio File Metadata'
+=> 'Metadaten der Gruppen-Portfoliodateien bearbeiten',
'Update'
=> 'Aktualisieren',
@@ -14392,19 +14380,19 @@
'The recipient addresses may need to be corrected'
=> 'Die Empfängeradressesn mussen korrigiert werden',
- 'Mail folder "[_1]" created.'
+ 'Folder "[_1]" created.'
=> 'Das Nachrichtenverzeichnis "[_1]" wurde angelegt.',
'Creation failed.'
=> 'Anlegen fehlgeschlagen.',
- 'Mail folder "[_1]" deleted.'
+ 'Folder "[_1]" deleted.'
=> 'Das Nachrichtenverzeichnis "[_1]" wurde gelöscht.',
'Deletion failed.'
=> 'Löschen fehlgeschlagen.',
- 'Mail folder "[_1]" renamed "[_2]".'
+ 'Folder "[_1]" renamed to "[_2]".'
=> 'Das Nachrichtenverzeichnis "[_1]" wurde umbenannt in "[_2]".',
'Renaming failed.'
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.224 loncom/interface/lonmeta.pm:1.225
--- loncom/interface/lonmeta.pm:1.224 Thu Jan 15 18:31:11 2009
+++ loncom/interface/lonmeta.pm Tue Jan 27 15:59:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.224 2009/01/15 18:31:11 bisitz Exp $
+# $Id: lonmeta.pm,v 1.225 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -762,7 +762,7 @@
} elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
($resdomain,$resuser)=
(&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|);
- $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
+ $r->print(&Apache::loncommon::start_page('Edit Portfolio File Metadata',
undef,
{'domain' => $resdomain,}));
if ($env{'form.store'}) {
@@ -781,13 +781,13 @@
}
}
} elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
- $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
+ $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata',
undef,
{'domain' => $resdomain,}));
&present_editable_metadata($r,$uri,'groups');
} elsif ($uri=~m|^/~|) {
# Construction space
- $r->print(&Apache::loncommon::start_page('Edit Catalog Information',
+ $r->print(&Apache::loncommon::start_page('Edit Metadata',
"\n".'<script type="text/javascript">'."\n".
&Apache::loncommon::browser_and_searcher_javascript().
"\n".'</script>',
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.84 loncom/interface/domainprefs.pm:1.85
--- loncom/interface/domainprefs.pm:1.84 Fri Dec 26 22:24:43 2008
+++ loncom/interface/domainprefs.pm Tue Jan 27 15:59:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.84 2008/12/26 22:24:43 raeburn Exp $
+# $Id: domainprefs.pm,v 1.85 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1894,7 +1894,7 @@
any => 'Any',
official => 'Institutional only ',
unofficial => 'Non-institutional only',
- email => 'Email address',
+ email => 'E-mail address',
login => 'Institutional Login',
sso => 'SSO',
none => 'None',
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.51 loncom/interface/lonsupportreq.pm:1.52
--- loncom/interface/lonsupportreq.pm:1.51 Thu Jan 15 18:31:11 2009
+++ loncom/interface/lonsupportreq.pm Tue Jan 27 15:59:30 2009
@@ -1,5 +1,5 @@
#
-# $Id: lonsupportreq.pm,v 1.51 2009/01/15 18:31:11 bisitz Exp $
+# $Id: lonsupportreq.pm,v 1.52 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -495,7 +495,7 @@
}
my %lt = &Apache::lonlocal::texthash (
username => 'Name',
- email => 'Email',
+ email => 'E-mail',
cc => 'Cc',
user => 'Username/domain',
phone => 'Phone',
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.78 loncom/interface/lonuserutils.pm:1.79
--- loncom/interface/lonuserutils.pm:1.78 Mon Jan 5 05:31:03 2009
+++ loncom/interface/lonuserutils.pm Tue Jan 27 15:59:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.78 2009/01/05 05:31:03 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.79 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2056,7 +2056,7 @@
'status' => "status",
'role' => "role",
'type' => "enroll type/action",
- 'email' => "email address",
+ 'email' => "e-mail address",
'photo' => "photo",
'extent' => "extent",
'pr' => "Proceed",
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.424 loncom/interface/lonparmset.pm:1.425
--- loncom/interface/lonparmset.pm:1.424 Tue Jan 20 18:37:30 2009
+++ loncom/interface/lonparmset.pm Tue Jan 27 15:59:30 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.424 2009/01/20 18:37:30 bisitz Exp $
+# $Id: lonparmset.pm,v 1.425 2009/01/27 15:59:30 schafran Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2294,12 +2294,12 @@
my ($name,$domain) = split(':',$user);
if (!defined($user) || !defined($domain)) {
$setoutput.= '<br /> <span class="LC_error">'.
- &mt("Invalid email address specified, address must be of the form username:domain what was specified was ([_1])",$user).
+ &mt("Invalid e-mail address specified, address must be of the form username:domain what was specified was ([_1])",$user).
'</span>';
undef($value);
} elsif (&Apache::lonnet::homeserver($user,$domain) eq 'no_host') {
$setoutput.= '<br /> <span class="LC_error">'.
- &mt("Invalid email address specified, user [_1] is unknown.",$name).
+ &mt("Invalid e-mail address specified, user [_1] is unknown.",$name).
'</span>';
undef($value);
}
Index: loncom/interface/longroup.pm
diff -u loncom/interface/longroup.pm:1.17 loncom/interface/longroup.pm:1.18
--- loncom/interface/longroup.pm:1.17 Fri Dec 19 20:10:11 2008
+++ loncom/interface/longroup.pm Tue Jan 27 15:59:30 2009
@@ -453,8 +453,8 @@
my ($gpterm) = @_;
my $toolprivs = {
email => {
- sgm => 'Send '.$gpterm.' mail',
- sgb => 'Broadcast mail',
+ sgm => 'Send '.$gpterm.' message',
+ sgb => 'Broadcast message',
},
discussion => {
cgb => 'Create boards',
--schafran1233071971--