From a38c978d5388294503ca948ae29df850d9234f19 Mon Sep 17 00:00:00 2001 From: Johannes Burk Date: Thu, 10 Jul 2014 20:34:04 +0200 Subject: [PATCH] Revert "Revert "Merge branch 'dev-lang' into develop"" Another mistake -.- , everything was fine :) ! This reverts commit 7486272bd76a50b6d974c6f49604a8f71f16c311. --- lang/de/enrol_apply.php | 42 +++++++++++++++++++++++--------------- lang/es/enrol_apply.php | 17 ++++++++------- lang/pt_br/enrol_apply.php | 13 ++++++------ 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/lang/de/enrol_apply.php b/lang/de/enrol_apply.php index 389e3db..ee98f69 100644 --- a/lang/de/enrol_apply.php +++ b/lang/de/enrol_apply.php @@ -1,18 +1,25 @@ {Vorname}:Registrierungsname; {Inhalt}:Kursname'; -$string['cancelmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{Vorname}:Registrierungsname; {Inhalt}:Kursname'; +$string['confirmmailsubject'] = 'E-Mail-Betreff für Bestätigung der Einschreibung'; +$string['confirmmailcontent'] = 'E-Mail für Bestätigung der Einschreibung'; +$string['cancelmailsubject'] = 'Mail-Betreff für Verwerfen der Einschreibung'; +$string['cancelmailcontent'] = 'Mail für Verwerfen der Einschreibung'; +$string['confirmmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{firstname}:Registrierungsname; {content}:Kursname'; +$string['cancelmailcontent_desc'] = 'Bitte benutzen Sie die Spezialmarkierungen, um den gewünschten Mailinhalt zu ersetzen.
{firstname}:Registrierungsname; {content}:Kursname'; $string['confirmusers'] = 'Einschreibung bestätigen'; @@ -22,19 +29,22 @@ $string['applyusermail'] = 'Email'; $string['applydate'] = 'Einschreibungsdatum'; $string['btnconfirm'] = 'Bestätigen'; $string['btncancel'] = 'Abbruch'; -$string['enrolusers'] = 'Benutzer einschreiben'; +$string['enrolusers'] = 'Benutzer manuell einschreiben'; $string['status'] = 'Bestätigung der Kurseinschreibung erlauben'; -$string['confirmenrol'] = 'Anwendung verwalten'; +$string['confirmenrol'] = 'Einschreibeanfragen bearbeiten'; $string['apply:config'] = 'Einschreibungsbelegstellen anlegen'; $string['apply:manage'] = 'Einschreibungsanfragen verwalten'; $string['apply:unenrol'] = 'Benutzer aus dem Kurs entfernen'; $string['apply:unenrolapply'] = 'Sich selbst aus dem Kurs entfernen'; -// Description of your plugin. Shown on the plugin's configuration screen. -$string['description'] = ''; -$string['notification'] = 'Einschreibungsantrag wurde erfolgreich gesendet..

Sie werden via Mail informiert, sobald Ihre Einschreibung bestätigt wurde. Wenn Sie sich in andere Kurse einschreiben wollen, klicken Sie bitte den "Kurskatalog" im Hauptmenu an.'; - +$string['notification'] = 'Einschreibungsantrag wurde erfolgreich gesendet..

Sie werden via Mail informiert, sobald Ihre Einschreibung bestätigt wurde.'; + +$string['sendmailtoteacher'] = 'Sende eine Hinweis-E-Mail an den Trainer'; +$string['mailtoteacher_suject'] = 'Neue Anfrage zur Einschreibung'; +$string['editdescription'] = 'Beschreibung anpassen'; +$string['applymanage'] = 'Manage enrolment applications'; + $string['status_desc'] = 'Kurszugriff für intern eingeschriebene Nutzer/innen erlauben.'; ?> \ No newline at end of file diff --git a/lang/es/enrol_apply.php b/lang/es/enrol_apply.php index 7943e31..d583548 100644 --- a/lang/es/enrol_apply.php +++ b/lang/es/enrol_apply.php @@ -12,14 +12,12 @@ // The name of your plugin. Displayed on admin menus. $string['enrolname'] = 'Matrículas solicitadas'; $string['pluginname'] = 'Matrículas solicitadas'; +$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // needs to be translated $string['confirmmailsubject'] = 'Asunto del correo de confirmación'; $string['confirmmailcontent'] = 'Contenido del correo de confirmación'; $string['cancelmailsubject'] = 'Asunto del correo de cancelación'; $string['cancelmailcontent'] = 'Contenido del correo de cancelación'; -$string['mailaddress'] = 'Send mail address'; // Those configuration parameters -$string['mailusername'] = 'Send mail username'; // are commented out in code -$string['mailpassword'] = 'Send mail password'; // Couldn't make an accurate translation without seen those in action $string['confirmmailcontent_desc'] = 'Por favor, use marcas especiales que se substituirán en el contenido del correo.
{firstname}:Nombre registrado por el usuario; {content}:Nombre del curso'; $string['cancelmailcontent_desc'] = 'Por favor, use marcas especiales que se substituirán en el contenido del correo.
{firstname}:Nombre registrado por el usuario; {content}:Nombre del curso'; @@ -41,8 +39,13 @@ $string['apply:manage'] = 'Gestionar matrículas solicitadas'; // Needs more ins $string['apply:unenrol'] = 'Cancelar usuarios del curso'; // Needs more insight $string['apply:unenrolapply'] = 'Cancelarse a si mismo del curso'; // Needs more insight. Very ugly translation! -// Description of your plugin. Shown on the plugin's configuration screen. -$string['description'] = ''; $string['notification'] = 'Solicitud de matriculación enviada correctamente.

Será notificado por correo electrónico en cuanto se confirme su matriculación.'; - -?> + +$string['sendmailtoteacher'] = 'Send email notification to teachers'; // needs to be translated +$string['mailtoteacher_suject'] = 'New Enrollment request!'; // needs to be translated +$string['editdescription'] = 'Textarea description'; // needs to be translated +$string['applymanage'] = 'Manage enrolment applications'; // needs to be translated + +$string['status_desc'] = 'Allow course access of internally enrolled users.'; // needs to be translated + +?> \ No newline at end of file diff --git a/lang/pt_br/enrol_apply.php b/lang/pt_br/enrol_apply.php index 0fa1cc9..145394c 100644 --- a/lang/pt_br/enrol_apply.php +++ b/lang/pt_br/enrol_apply.php @@ -12,14 +12,12 @@ // The name of your plugin. Displayed on admin menus. $string['enrolname'] = 'Matrículas solicitadas'; $string['pluginname'] = 'Matrículas solicitadas'; +$string['pluginname_desc'] = 'With this plugin users can apply to a course and a teacher have to comfirm before the user gets enroled.'; // needs to be translated $string['confirmmailsubject'] = 'Assunto do e-mail de confirmação'; $string['confirmmailcontent'] = 'Conteúdo do e-mail de confirmação'; $string['cancelmailsubject'] = 'Assunto do e-mail de cancelamento'; $string['cancelmailcontent'] = 'Conteúdo do e-mail de cancelamento'; -$string['mailaddress'] = 'Endereço do e-mail de envio'; // Those configuration parameters -$string['mailusername'] = 'Usuário do e-mail de envio'; // are commented out in code -$string['mailpassword'] = 'Senha do e-mail de envio'; // Couldn't make an accurate translation without seen those in action $string['confirmmailcontent_desc'] = 'Por favor, use marcas especiais que substituirão o conteúdo do e-mail.
{firstname}:Nome registrado pelo usuário; {content}:Nome do curso'; $string['cancelmailcontent_desc'] = 'Por favor, use marcas especiais que substituirão o conteúdo do e-mail.
{firstname}:Nome registrado pelo usuário {content}:Nome do curso'; @@ -41,12 +39,13 @@ $string['apply:manage'] = 'Gerenciar matrículas solicitadas'; // Needs more ins $string['apply:unenrol'] = 'Cancelar usuários do curso'; // Needs more insight $string['apply:unenrolapply'] = 'Cancelar minha matrícula do curso'; // Needs more insight. Very ugly translation! -// Description of your plugin. Shown on the plugin's configuration screen. -$string['description'] = ''; $string['notification'] = 'Solicitação de matrícula enviada com sucesso.

Você será notificado por e-mail quando a sua matrícula for confirmada.'; $string['sendmailtoteacher'] = 'Enviar e-mail de notificação para professores'; $string['mailtoteacher_suject'] = 'Nova solicitação de inscrição!'; -$string['setting_edit'] = 'Editar'; $string['editdescription'] = 'Descrição'; -?> +$string['applymanage'] = 'Manage enrolment applications'; // needs to be translated + +$string['status_desc'] = 'Allow course access of internally enrolled users.'; // needs to be translated + +?> \ No newline at end of file