[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Prefs_Messages.tex Prefs_Notification.tex /interface lonpreferences.pm /localize/localize de.pm es.pm zh.pm
bisitz
bisitz@source.lon-capa.org
Fri, 23 Oct 2009 15:03:54 -0000
This is a MIME encoded message
--bisitz1256310234
Content-Type: text/plain
bisitz Fri Oct 23 15:03:54 2009 EDT
Modified files:
/loncom/localize/localize de.pm es.pm zh.pm
/loncom/interface lonpreferences.pm
/loncom/html/adm/help/tex Prefs_Messages.tex Prefs_Notification.tex
Log:
Consistent Wording related to Messages, Notifications, Upload embedded images...
--bisitz1256310234
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20091023150354.txt"
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.330 loncom/localize/localize/de.pm:1.331
--- loncom/localize/localize/de.pm:1.330 Fri Oct 2 12:15:07 2009
+++ loncom/localize/localize/de.pm Fri Oct 23 15:03:43 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.330 2009/10/02 12:15:07 bisitz Exp $
+# $Id: de.pm,v 1.331 2009/10/23 15:03:43 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5408,9 +5408,6 @@
'Change Language Preferences'
=> 'Sprache',
- 'Change Message Forwarding and Notification E-mail Addresses'
-=> 'Nachrichtenweiterleitung und Benachrichtigung',
-
'Change Password'
=> 'Passwort ändern',
@@ -5597,8 +5594,8 @@
'Create subdirectory in current directory'
=> 'Im aktuellen Verzeichnis neues Unterverzeichnis erzeugen',
- 'If HTML file, upload embedded images/multimedia/css/linked files'
-=> 'Bei HTML-Dateien:<br />Eingebettete Bilder/Multimedia-Dateien/CSS/verlinkte Dateien mit hochladen',
+ 'Upload embedded images/multimedia/css/linked files if HTML file'
+=> 'Bei HTML-Dateien: eingebettete Bilder/Multimedia-Dateien/CSS/verlinkte Dateien mit hochladen',
'Delete Selected'
=> 'Ausgewählte löschen',
@@ -5615,8 +5612,8 @@
'INBOX'
=> 'POSTEINGANG',
- 'If HTML file, upload embedded images/multimedia files'
-=> 'Bei HTML-Dateien:<br />Eingebettete Bilder und Multimedia-Dateien mit hochladen', # 'Wenn HTML-Datei, eingebettete Bilder-/Multimedia-Dateien hochladen',
+ 'Upload embedded images/multimedia files if HTML file'
+=> 'Bei HTML-Dateien: eingebettete Bilder und Multimedia-Dateien mit hochladen',
'IMS Import'
=> 'IMS-Import',
@@ -7141,16 +7138,19 @@
'Back to preferences menu'
=> 'Zurück',
- 'Forwarding Address(es)'
-=> 'LON-CAPA-Weiterleitungsadresse(n)',
+ 'Forward messages to other account(s) in LON-CAPA'
+=> 'Nachrichtenweiterleitung an andere LON-CAPA-Accounts',
+
+ 'Forward to account(s)'
+=> 'Weiterleitung an Account(s)',
'e.g. <tt>userA:domain1,userB:domain2,...</tt>'
=> 'z.B. <tt>BenutzerA:Domäne1,BenutzerB:Domäne2,...</tt>',
- 'Notification E-mail Address(es)'
-=> 'Benachrichtigungs-E-Mail-Adressen',
+ 'E-mail notification of LON-CAPA messages'
+=> 'E-Mail-Benachrichtigung über LON-CAPA-Nachrichten',
- 'E-mail Address(es) which should be notified about new LON-CAPA messages'
+ 'E-mail address(es) which should be notified about new LON-CAPA messages'
=> 'E-Mail-Adresse(n) zur Benachrichtigung über neue LON-CAPA-Nachrichten',
'e.g. <tt>joe@doe.com</tt>'
@@ -8345,7 +8345,7 @@
'Results [_1] to [_2] out of [_3]'
=> 'Treffer [_1] bis [_2] von insgesamt [_3]',
- 'Unactionable Search Queary'
+ 'Unactionable Search Query'
=> 'Suchanfrage zurückgewiesen',
'Revise Search Request'
@@ -11171,9 +11171,6 @@
'Upload and Send'
=> 'Hochladen und Absenden',
- 'Select courses'
-=> 'Kursauswahl',
-
'Choose which course(s) to list.'
=> 'Auswahl der Kurse, die angezeigt werden sollen',
@@ -15672,7 +15669,7 @@
=> 'endet: ',
'If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.'
-=> 'Falls der/die Student/in gerade an LON-CAPA angemeldet ist, wird die Rolle nach dem nächsten Anmelden des/der Studenten/in verfügbar sein.',
+=> 'Falls der/die Student/in gerade in LON-CAPA angemeldet ist, wird die Rolle nach dem nächsten Anmelden des/der Studenten/in verfügbar sein.',
'(default)'
=> '(Standard)',
@@ -16129,9 +16126,6 @@
'Messages & Notifications'
=> 'Nachrichten und Benachrichtigungen',
- 'Message Management'
-=> 'Nachrichtenverwaltung',
-
'Discussion Display'
=> 'Darstellung der Diskussionsbeiträge',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.30 loncom/localize/localize/es.pm:1.31
--- loncom/localize/localize/es.pm:1.30 Fri Oct 2 12:15:07 2009
+++ loncom/localize/localize/es.pm Fri Oct 23 15:03:43 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Spanish Localization Lexicon
#
-# $Id: es.pm,v 1.30 2009/10/02 12:15:07 bisitz Exp $
+# $Id: es.pm,v 1.31 2009/10/23 15:03:43 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5474,9 +5474,6 @@
'Change Language Preferences'
=> 'Cambiar Preferencias de Idioma',
- 'Change Message Forwarding and Notification E-mail Addresses'
-=> 'Cambiar dirección de E-mail para Transmisión y Notificación',
-
'Change Password'
=> 'Cambiar Contraseña',
@@ -5663,8 +5660,8 @@
'Create subdirectory in current directory'
=> 'Crear subdirectorio en directorio actual',
- 'If HTML file, upload embedded images/multimedia/css/linked files'
-=> 'Si es archivo HTML:<br /> cargar archivos de imagenes/multimedia/css/enlaces contenidos dentro',
+ 'Upload embedded images/multimedia/css/linked files if HTML file'
+=> 'Si es archivo HTML: cargar archivos de imagenes/multimedia/css/enlaces contenidos dentro',
'Delete Selected'
=> 'Borrar Seleccionado',
@@ -5681,7 +5678,7 @@
'INBOX'
=> 'BANDEJA de ENTRADA',
- 'If HTML file, upload embedded images/multimedia files'
+ 'Upload embedded images/multimedia files if HTML file'
=> 'Si es archivo HTML:<br /> cargar archivos de imagenes/multimedia contenidos dentro',
'IMS Import'
@@ -7242,16 +7239,19 @@
'Back to preferences menu'
=> 'Volver al menú de preferencias',
- 'Forwarding Address(es)'
-=> 'Direccion(es) de Reenvío',
+ 'Forward messages to other account(s) in LON-CAPA'
+=> 'Forward messages to other account(s) in LON-CAPA',
+
+ 'Forward to account(s)'
+=> 'Forward to account(s)', # 'Direccion(es) de Reenvío',
'e.g. <tt>userA:domain1,userB:domain2,...</tt>'
=> 'p.e. <tt>usuarioA:dominio1,usuarioB:Dominio2,...</tt>',
- 'Notification E-mail Address(es)'
-=> 'Notificación de dirección de E-mail',
+ 'E-mail notification of LON-CAPA messages'
+=> 'E-mail notification of LON-CAPA messages', # 'Notificación de dirección de E-mail',
- 'E-mail Address(es) which should be notified about new LON-CAPA messages'
+ 'E-mail address(es) which should be notified about new LON-CAPA messages'
=> 'Direccion(es) de E-mail que deben ser notificados acerca de nuevos mensajes LON-CAPA',
'e.g. <tt>joe@doe.com</tt>'
@@ -8446,7 +8446,7 @@
'Results [_1] to [_2] out of [_3]'
=> 'Resultados [_1] al [_2] de [_3]',
- 'Unactionable Search Queary'
+ 'Unactionable Search Query'
=> 'Busqueda fallida',
'Revise Search Request'
@@ -11275,9 +11275,6 @@
'Upload and Send'
=> 'Cargar y Enviar',
- 'Select courses'
-=> 'Selecionar cursos',
-
'Choose which course(s) to list.'
=> 'Escoger que curso(s) listar.',
@@ -16257,9 +16254,6 @@
'Messages & Notifications'
=> 'Mensajes y Notificaciones',
- 'Message Management'
-=> 'Mensajes de Administración',
-
'Discussion Display'
=> 'Visualización de Discusión',
@@ -16303,7 +16297,7 @@
=> 'Activar o desactivar el Editor WYSIWYG.',
'Configure the roles hotlist.'
-=> 'Configurar la lista de funciones más usadas.',#n.t.
+=> 'Configurar la lista de funciones más usadas.',
'Change how Scientific Equations are displayed.'
=> 'Cambiar como las Ecuaciones Científcas son vistas.',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.79 loncom/localize/localize/zh.pm:1.80
--- loncom/localize/localize/zh.pm:1.79 Fri Oct 2 16:34:32 2009
+++ loncom/localize/localize/zh.pm Fri Oct 23 15:03:43 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.79 2009/10/02 16:34:32 bisitz Exp $
+# $Id: zh.pm,v 1.80 2009/10/23 15:03:43 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5641,8 +5641,8 @@
'Create subdirectory in current directory'
=> '在当前目录下，创建一个新的子目录',
- 'If HTML file, upload embedded images/multimedia/css/linked files'
-=> '对于HTML文件:<br />上传嵌入式图像/多媒体文件/CSS/链接文件',
+ 'Upload embedded images/multimedia/css/linked files if HTML file'
+=> '对于HTML文件: 上传嵌入式图像/多媒体文件/CSS/链接文件',
'Delete Selected'
=> '删除所选',
@@ -5659,8 +5659,8 @@
'INBOX'
=> '收件箱',
- 'If HTML file, upload embedded images/multimedia files'
-=> '对于HTML文件:<br />上传嵌入式图像/多媒体文件',
+ 'Upload embedded images/multimedia files if HTML file'
+=> '对于HTML文件: 上传嵌入式图像/多媒体文件',
'IMS Import'
=> 'IMS-Import',
@@ -7175,16 +7175,19 @@
'Back to preferences menu'
=> '后退',
- 'Forwarding Address(es)'
-=> '转发地址',
+ 'Forward messages to other account(s) in LON-CAPA'
+=> 'Nachrichtenweiterleitung an andere LON-CAPA-Accounts',
+
+ 'Forward to account(s)'
+=> 'Weiterleitung an Account(s)', # '转发地址',
'e.g. <tt>userA:domain1,userB:domain2,...</tt>'
=> '例如 <tt>用户A:领域1,用户B:领域2,...</tt>',
'Notification E-mail Address(es)'
-=> '通知 E-mail 地址',
+=> 'E-Mail-Benachrichtigung über LON-CAPA-Nachrichten', # '通知 E-mail 地址',
- 'E-mail Address(es) which should be notified about new LON-CAPA messages'
+ 'E-mail address(es) which should be notified about new LON-CAPA messages'
=> '关于 LON-CAPA 新消息被通知的 E-Mail 地址',
'e.g. <tt>joe@doe.com</tt>'
@@ -8353,7 +8356,7 @@
'Results [_1] to [_2] out of [_3]'
=> '结果 [_1] 至 [_2] 的 [_3]',
- 'Unactionable Search Queary'
+ 'Unactionable Search Query'
=> '查询被否决',
'Revise Search Request'
@@ -11183,9 +11186,6 @@
'Upload and Send'
=> '上传和发送',
- 'Select courses'
-=> '选择课程',
-
'Choose which course(s) to list.'
=> 'Auswahl der Kurse, die angezeigt werden sollen',
@@ -16184,9 +16184,6 @@
'Messages & Notifications'
=> '邮件＆公告',
- 'Message Management'
-=> '邮件管理',
-
'Discussion Display'
=> '讨论显示',
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.177 loncom/interface/lonpreferences.pm:1.178
--- loncom/interface/lonpreferences.pm:1.177 Sat Oct 17 00:04:01 2009
+++ loncom/interface/lonpreferences.pm Fri Oct 23 15:03:48 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Preferences
#
-# $Id: lonpreferences.pm,v 1.177 2009/10/17 00:04:01 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.178 2009/10/23 15:03:48 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -794,8 +794,8 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changemsgforward',
text => 'Messages & Notifications'});
- $r->print(Apache::loncommon::start_page('Message Management'));
- $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Message Forwarding/Notification'));
+ $r->print(Apache::loncommon::start_page('Messages & Notifications'));
+ $r->print(Apache::lonhtmlcommon::breadcrumbs('Messages & Notifications'));
my $forwardingHelp = &Apache::loncommon::help_open_topic("Prefs_Forwarding");
my $notificationHelp = &Apache::loncommon::help_open_topic("Prefs_Notification");
my $criticalMessageHelp = &Apache::loncommon::help_open_topic("Course_Critical_Message");
@@ -1603,7 +1603,7 @@
Apache::lonhtmlcommon::add_breadcrumb(
{ href => '/adm/preferences?action=changediscussions',
text => 'Change Discussion Preferences'});
- $r->print(Apache::loncommon::start_page('Message Management'));
+ $r->print(Apache::loncommon::start_page('Change Discussion Preferences'));
$r->print(Apache::lonhtmlcommon::breadcrumbs('Change Discussion Preferences'));
my $user = $env{'user.name'};
my $domain = $env{'user.domain'};
@@ -1907,7 +1907,7 @@
},
]
},
- { categorytitle=>'Message Management',
+ { categorytitle=>'Messages & Notifications',
items =>[
{ linktext => 'Messages & Notifications',
url => '/adm/preferences?action=changemsgforward',
Index: loncom/html/adm/help/tex/Prefs_Messages.tex
diff -u loncom/html/adm/help/tex/Prefs_Messages.tex:1.4 loncom/html/adm/help/tex/Prefs_Messages.tex:1.5
--- loncom/html/adm/help/tex/Prefs_Messages.tex:1.4 Thu Feb 12 21:15:59 2009
+++ loncom/html/adm/help/tex/Prefs_Messages.tex Fri Oct 23 15:03:53 2009
@@ -10,7 +10,7 @@
\textbf{PREF}) on the Main Menu, or the remote control (if used).
\item At the \textbf{Change Preferences} screen, click the
\underbar{Change Message Forwarding and Notification Addresses} link.
-\item In the \textbf{Forwarding Address(es)} section, type your desired forward address in the text field labeled ``Forwarding Address(es)''.
+\item In the \textbf{Forward messages to other account(s) in LON-CAPA} section, type your desired forward address in the text field labeled ``Forward to account(s)''.
This should be one or more LON-CAPA addresses, in the form: ``user:domain'', separated by commas.
\item Click the \fbox{Change} button.
@@ -36,7 +36,7 @@
\item At the \textbf{Change Preferences} screen, click the
\underbar{Change Message Forwarding and Notification Addresses} link.
-\item In the ``Notification E-mail Address(es)'' section, check the checkbox labeled \textbf{Add new address}
+\item In the ``E-mail notification of LON-CAPA messages'' section, check the checkbox labeled \textbf{Add new address}
\item Type a notification address into the text field
labeled \textbf{Notification address}. This should be an Internet email
address like ``user@example.com''.
Index: loncom/html/adm/help/tex/Prefs_Notification.tex
diff -u loncom/html/adm/help/tex/Prefs_Notification.tex:1.3 loncom/html/adm/help/tex/Prefs_Notification.tex:1.4
--- loncom/html/adm/help/tex/Prefs_Notification.tex:1.3 Thu Feb 12 21:15:59 2009
+++ loncom/html/adm/help/tex/Prefs_Notification.tex Fri Oct 23 15:03:53 2009
@@ -18,7 +18,7 @@
\item At the \textbf{Change Preferences} screen, click the
\underbar{Change Message Forwarding and Notification Addresses} link.
-\item In the ``Notification E-mail Address(es)'' section, check the checkbox labeled \textbf{Add new address}
+\item In the ``E-mail notification of LON-CAPA messages'' section, check the checkbox labeled \textbf{Add new address}
\item Type a notification address into the text field
labeled \textbf{Notification address}. This should be an Internet email
address like ``user@example.com''.
--bisitz1256310234--